diff options
author | Mike Lundy <mike@fluffypenguin.org> | 2010-07-29 00:04:29 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:14:20 -0700 |
commit | 93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac (patch) | |
tree | 93b79d635019465eaf5c774ac3d4ae6fc1ee666c /git-archimport.perl | |
parent | Git 1.7.2 (diff) | |
download | tgif-93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac.tar.xz |
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>
Diffstat (limited to 'git-archimport.perl')
0 files changed, 0 insertions, 0 deletions