diff options
| author |  Avishay Lavie <avishay.lavie@gmail.com> | 2012-05-15 11:45:50 +0300 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2012-05-16 19:21:43 -0700 |
| commit | b64e1f58158d1d1a8eafabbbf002a1a3c1d72929 (patch) | |
| tree | 3a1b5df536bec31ef7393c5ace1afce5a21efb1f /Documentation | |
| parent | Update draft release notes for 12th batch (diff) | |
| download | tgif-b64e1f58158d1d1a8eafabbbf002a1a3c1d72929.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 34ee785064..0d52997b8d 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -572,6 +572,8 @@ config key: svn.repackflags --merge:: -s<strategy>:: --strategy=<strategy>:: +-p:: +--preserve-merges:: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a |