{"thread":{"id":"12124","subject":"Git rebase/pull questions","startedAt":"2008-02-16T04:10:03Z","lastAt":"2008-02-16T11:50:30Z","messageCount":2,"participants":["Jay Soffian","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"68862","messageId":"76718490802152010udd11567v25ae456db0a59f3b@mail.gmail.com","threadId":"12124","inReplyTo":null,"subject":"Git rebase/pull questions","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2008-02-16T04:10:03Z","receivedAt":"2008-02-16T04:10:03Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"First, I notice that git-rebase supports a --s/--strategy option (which\nimplies -m/--merge). I wonder whether it should respect\nbranch.<name>.mergeoptions as the default for this setting?\n\n(BTW, git-rebase's USAGE/LONG_USAGE doesn't match its man page. Also,\nthe man page synopsis doesn't include all the options the man page\ndocuments later on.)\n\nSecond, git-pull completely ignores -s/--strategy if also give --rebase,\nbut I wonder if it shouldn't just pass the strategy along to git-rebase.\n\nThoughts?\n\nj.\n"},{"id":"68895","messageId":"alpine.LSU.1.00.0802161147470.30505@racer.site","threadId":"12124","inReplyTo":"76718490802152010udd11567v25ae456db0a59f3b@mail.gmail.com","subject":"Re: Git rebase/pull questions","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-16T11:50:30Z","receivedAt":"2008-02-16T11:50:30Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 15 Feb 2008, Jay Soffian wrote:\n\n> Second, git-pull completely ignores -s/--strategy if also give --rebase, \n> but I wonder if it shouldn't just pass the strategy along to git-rebase.\n\nThat is just an oversight.  Could you test if this works for you \n(completely untested by me...)?\n\n-- snip --\n[PATCH] pull --rebase: respect merge strategy options\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\n---\n\n git-pull.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 46da0f4..e0bf582 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -174,6 +174,7 @@ fi\n \n merge_name=$(git fmt-merge-msg <\"$GIT_DIR/FETCH_HEAD\") || exit\n test true = \"$rebase\" &&\n-\texec git-rebase --onto $merge_head ${oldremoteref:-$merge_head}\n+\texec git-rebase $strategy_args \\\n+\t\t--onto $merge_head ${oldremoteref:-$merge_head}\n exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \\\n \t\"$merge_name\" HEAD $merge_head\n-- snap --\n\nCiao,\nDscho\n"}]}