summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2012-10-23 13:34:05 +0200
committerJeff King <peff@peff.net>2012-10-25 06:55:46 -0400
commita6d3bde5afc5d742af0d7b1f2725b760dca165cb (patch)
treeb7b298f48299514b6008b431dd132263f0b14135 /Documentation/git-merge.txt
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-a6d3bde5afc5d742af0d7b1f2725b760dca165cb.tar.gz
Documentation: remote tracking branch -> remote-tracking branch
This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2 2010, Replace "remote tracking" with "remote-tracking"), but new instances of remote tracking (without dash) were introduced in the meantime. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 20f9228511..d34ea3c50b 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
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
+configuration variable is set, 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.