HTCondorWiki: Managing Condor Source Trees With Git

 {code}
 git fetch
 git rebase origin/some_branch
+                 ^
+                 |
+                 |
+Absolutely do not replace this character with a space!
 {endcode}
 
 Instead of merging, this attempts to insert the changes you pull from the origin repository before your local changes, avoiding the merge message. You need to be sure to rebase on the proper branch. For instance, if you are on your =V7_0-branch= and want to rebase against changes in =origin/V7_0-branch= you issue =git rebase origin/V7_0-branch=.