| commit | b64e1f58158d1d1a8eafabbbf002a1a3c1d72929 | |
| author | Avishay Lavie <avishay.lavie@gmail.com> | |
| Tue, 15 May 2012 08:45:50 +0000 (15 11:45 +0300) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Thu, 17 May 2012 02:21:43 +0000 (16 19:21 -0700) | ||
| tree | 3a1b5df536bec31ef7393c5ace1afce5a21efb1f | treesnapshot (tar.gz zip) |
| parent | 6a4a4822298866ec3386a46d9d8f933b80e3a359 | commitdiff |
git-svn: support rebase --preserve-merges
When git svn rebase is performed after an unpushed merge, the
rebase operation follows both parents and replays both the user's
local commits and those from the merged branch. This is usually
not the intended behavior.
This patch adds support for the --preserve-merges/-p flag which
allows for a better workflow by re-applying merge commits as merges.
[ew: fixed a minor syntax error]
Signed-off-by: Avishay Lavie <avishay.lavie@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
When git svn rebase is performed after an unpushed merge, the
rebase operation follows both parents and replays both the user's
local commits and those from the merged branch. This is usually
not the intended behavior.
This patch adds support for the --preserve-merges/-p flag which
allows for a better workflow by re-applying merge commits as merges.
[ew: fixed a minor syntax error]
Signed-off-by: Avishay Lavie <avishay.lavie@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
| Documentation/git-svn.txt | diffblobblamehistory | |
| git-svn.perl | diffblobblamehistory |