summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2014-04-21 00:17:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-22 19:53:59 (GMT)
commita01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d (patch)
tree85511431579f68ce408f37e6cc35a6e1fe154876 /Documentation/git-merge.txt
parent779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff)
downloadgit-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.zip
git-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.tar.gz
git-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.tar.bz2
merge: enable defaulttoupstream by default
There's no point in this: % git merge fatal: No commit specified and merge.defaultToUpstream not set. We know the most likely scenario is that the user wants to merge the upstream, and if not, he can set merge.defaultToUpstream to false. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a3c1fa3..cf2c374 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -101,9 +101,8 @@ commit or stash your changes before running 'git merge'.
Specifying more than one commit will create a merge with
more than two parents (affectionately called an Octopus merge).
+
-If no commit is given from the command line, and if `merge.defaultToUpstream`
-configuration variable is set, merge the remote-tracking branches
-that the current branch is configured to use as its upstream.
+If no commit is given from the command line, merge the remote-tracking
+branches that the current branch is configured to use as its upstream.
See also the configuration section of this manual page.