[PATCH v6 4/7] pull: add --merge option
From: Felipe Contreras <hidden>
Date: 2016-06-15 23:00:58
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras <redacted> --- Documentation/git-pull.txt | 8 ++++++-- git-pull.sh | 10 +++++++++- 2 files changed, 15 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 50c612f..e7e52ec 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -15,6 +15,10 @@ require_work_tree_exists cd_to_toplevel +warn () { + printf >&2 'warning: %s\n' "$*" +} + die_conflict () { git diff-index --cached --name-status -r --ignore-submodules HEAD -- if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
@@ -142,8 +146,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.19.g85b6256