[PATCH v4 3/7] pull: add --merge option
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
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 991352f..e09f004 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -119,8 +119,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 f53d193..fbb8a9b 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -127,8 +127,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
+ echo "--no-rebase is deprecated, please use --merge instead"
;;
--recurse-submodules)
recurse_submodules=--recurse-submodules
--
1.8.4-fc
Felipe Contreras <felipe.contreras@gmail.com>