Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- Documentation/git-pull.txt | 8 ++++++-- git-pull.sh | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 9a91b9f..767bca3 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -127,8 +127,12 @@ It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully. ---no-rebase:: - Override earlier --rebase. +-m:: +--merge:: + Force a merge. ++ +See `pull.mode`, `branch.<name>.pullmode` in linkgit:git-config[1] if you want +to make `git pull` always use `--merge`. Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/git-pull.sh b/git-pull.sh index 3dfd856..26e4e55 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -151,8 +151,12 @@ do -r|--r|--re|--reb|--reba|--rebas|--rebase) mode=rebase ;; + -m|--m|--me|--mer|--merg|--merge) + mode=merge + ;; --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase) - mode= + mode=merge + warn "$(gettext "--no-rebase is deprecated, please use --merge instead")" ;; --recurse-submodules) recurse_submodules=--recurse-submodules -- 1.9.2+fc1.3.gade8541 -- 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