| commit | 93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac | |
| author | Mike Lundy <mike@fluffypenguin.org> | |
| Wed, 28 Jul 2010 22:04:29 +0000 (29 00:04 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Aug 2010 22:14:20 +0000 (3 15:14 -0700) | ||
| tree | 93b79d635019465eaf5c774ac3d4ae6fc1ee666c | treesnapshot (tar.gz zip) |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 | commitdiff |
rebase: support -X to pass through strategy options
git-rebase calls out to merge strategies, but did not support merge
strategy options so far. Add this, in the same style used in
git-merge.
Sadly we have to do the full quoting/eval dance here, since
merge-recursive supports the --subtree=<path> option which potentially
contains whitespace.
This patch does not cover git rebase -i, which does not call any merge
strategy directly except in --preserve-merges, and even then only for
merges.
[jc: with a trivial fix-up for 'expr']
Signed-off-by: Mike Lundy <mike@fluffypenguin.org>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase calls out to merge strategies, but did not support merge
strategy options so far. Add this, in the same style used in
git-merge.
Sadly we have to do the full quoting/eval dance here, since
merge-recursive supports the --subtree=<path> option which potentially
contains whitespace.
This patch does not cover git rebase -i, which does not call any merge
strategy directly except in --preserve-merges, and even then only for
merges.
[jc: with a trivial fix-up for 'expr']
Signed-off-by: Mike Lundy <mike@fluffypenguin.org>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory | |
| git-rebase.sh | diffblobblamehistory | |
| t/t3402-rebase-merge.sh | diffblobblamehistory |