Hi,
On Fri, 15 Feb 2008, Jay Soffian wrote:
> Second, git-pull completely ignores -s/--strategy if also give --rebase,
> but I wonder if it shouldn't just pass the strategy along to git-rebase.
That is just an oversight. Could you test if this works for you
(completely untested by me...)?
-- snip --
[PATCH] pull --rebase: respect merge strategy options
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
---
git-pull.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 46da0f4..e0bf582 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
-- snap --
Ciao,
Dscho
-
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
