Minor changes since v3. Junio already sent a similar patch, but I think this is simpler.
It is very typical for Git newcomers to inadvertently create merges and worst: inadvertently pushing them. This is one of the reasons many experienced users prefer to avoid 'git pull', and recommend newcomers to avoid it as well. To avoid these problems and keep 'git pull' useful, it has been suggested that 'git pull' barfs by default if the merge is non-fast-forward, which unfortunately would break backwards compatibility. This patch series leaves everything in place to enable this new mode, but it only gets enabled if the user specifically configures it; pull.mode = merge-ff-only. Later on this mode can be enabled by default (e.g. in v2.0). To achieve that first some configurations are renamed: for example: pull.rebase => pull.mode = rebase, but the old ones remain functional, thus there are no functional changes. Then the new mode 'merge-ff-only' is added, but not enabled by default, and finally, a warning is added so the users will know what to do when the new mode is indeed enabled by default. Diff from last version: --- a/git-pull.sh +++ b/git-pull.sh @@ -293,12 +293,13 @@ case "$merge_head" in then case "$mode" in merge-ff-only) - die "The pull was not fast-forward, please either merge or rebase." + die "$(gettext "The pull was not fast-forward, please either merge or rebase. +If unsure, run 'git pull --merge'.")" ;; default) - say "The pull was not fast-forward, in the future you would have to choose + echo "$(gettext "warning: the pull was not fast-forward, in the future you would have to choose a merge or a rebase, falling back to old style for now (git pull --merge). -Read 'git pull --help' for more information." +Read 'git pull --help' for more information.")" >&2 ;; esac fi Felipe Contreras (7): pull: rename pull.rename to pull.mode pull: refactor $rebase variable into $mode pull: add --merge option pull: add merge-ff-only option pull: add warning on non-ff merges pull: cleanup documentation pull: add documentation about non-ff merges Documentation/config.txt | 24 +++++++++-------- Documentation/git-pull.txt | 32 +++++++++++++++++++---- branch.c | 4 +-- git-pull.sh | 64 +++++++++++++++++++++++++++++++++++++--------- t/t3200-branch.sh | 40 ++++++++++++++--------------- t/t5520-pull.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++ t/t5601-clone.sh | 4 +-- 7 files changed, 178 insertions(+), 52 deletions(-) -- 1.8.4-fc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html