From a72749137108e797903e9362b0f7a12355feea56 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 6 Jun 2015 13:48:09 +0300 Subject: [PATCH 1/1] Add an example of rebasing v1 before merging --- pep-git.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pep-git.txt b/pep-git.txt index 0dbd13c..7964869 100644 --- 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 -- 2.39.2