rebase supports --strategy, so pull should pass the option along to it.
Signed-off-by: Jay Soffian <jaysoffian@xxxxxxxxx>
---
I noticed the other day that pull didn't pass --strategy along to rebase, but
forgot I'd noticed, even though Johannes replied w/a patch. Anyway, my next
patch documents pull's usage via its OPTIONS_SPEC and I noticed the problem
again. I fix it here so that I can document its use in the next patch. :-)
git-pull.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 46da0f4..3ce32b5 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -174,6 +174,7 @@ fi
merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" &&
- exec git-rebase --onto $merge_head ${oldremoteref:-$merge_head}
+ exec git-rebase $strategy_args --onto $merge_head \
+ ${oldremoteref:-$merge_head}
exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
"$merge_name" HEAD $merge_head
--
1.5.4.2.285.g1e9f
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
