{subsubsection: You've made changes: fetch and rebase}
-If you have committed local changes, then git-pull will create a spurious "Merge" commit, which will pollute the change list when you later push upstream. To avoid this, do these two commands:
+If you have committed local changes, then =git-pull= will create a merge commit, which will pollute the change list when you later push upstream. You can avoid seeing these changes with a =git log --no-merges= command, or you can "rebase" your local changes.
{code}
git fetch
@@ -141,7 +141,7 @@
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=.
+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. You should also be sure your changes are *truly* local; i.e., you have not pushed *any* of your local changes to another repository, and that no one has pulled from you. 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=.
{section: Working on a single person project}
