Git rebase/pull questions

Jay Soffian· Feb 16, 2008, 04:10 UTC · lore

First, I notice that git-rebase supports a --s/--strategy option (which implies -m/--merge). I wonder whether it should respect branch.<name>.mergeoptions as the default for this setting?

(BTW, git-rebase's USAGE/LONG_USAGE doesn't match its man page. Also, the man page synopsis doesn't include all the options the man page documents later on.)

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.

Thoughts?

j.

Johannes Schindelin· Feb 16, 2008, 11:50 UTC · re: Jay Soffian · lore

Re: Git rebase/pull questions

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@gmx.de>

---

 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