Remove SourceTree: it's free but not opensource

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

diff --git a/pep-git.txt b/pep-git.txt
index 0dbd13cffbfd6a506eec947da62abaa9f16ede40..d7bfc7a4835642d7301dd51b15b7abd682f88453 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,9 +85,6 @@ MacOS X: use git installed with `XCode
 <http://sourceforge.net/projects/git-osx-installer/files/>`_ or
 install git with `Homebrew <http://brew.sh/>`_: ``brew install git``.
 
-`Atlassins's SourceTree <https://www.sourcetreeapp.com/>`_ is a free
-Git and Mercurial GUI client for Windows or Mac.
-
 Initial configuration
 ---------------------
 
@@ -226,6 +223,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