Add an example of rebasing v1 before merging

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 40bdeb44e379a615aa152db905691fcef8b83f46..79648690905e3a5221b5723b4a4f87b7f68bacaa 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -226,6 +226,20 @@ that non-current branch and then merge::
                                   # rebase instead of merge
     $ git merge v1
 
+If you have not yet pushed commits on ``v1``, though, the scenario has
+to become a bit more complex. Git refuses to update
+non-fast-forwardable branch, and you don't want to do force-pull
+because that would remove your non-pushed commits and you would need
+to recover. So you want to rebase ``v1`` but you cannot rebase
+non-current branch. Hence, checkout ``v1`` and rebase it before
+merging::
+
+    $ git checkout v1
+    $ git pull --rebase origin v1
+    $ git checkout v2
+    $ git pull --rebase origin v2
+    $ git merge v1
+
 It is possible to configure git to make it fetch/pull a few branches
 or all branches at once, so you can simply run
 
@@ -423,6 +437,12 @@ TODO: sticky options; example: git grep -O.
 TODO: bash/zsh completion, bash/zsh prompt.
 
 
+git on server
+=============
+
+TODO: anonymous access; git over ssh; gitolite; gitweb; cgit; gitlab.
+
+
 From Mercurial to git
 =====================