diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-10-23 11:34:05 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 10:55:46 (GMT) |
| commit | a6d3bde5afc5d742af0d7b1f2725b760dca165cb (patch) | |
| tree | b7b298f48299514b6008b431dd132263f0b14135 /Documentation/merge-config.txt | |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
| download | git-a6d3bde5afc5d742af0d7b1f2725b760dca165cb.zip git-a6d3bde5afc5d742af0d7b1f2725b760dca165cb.tar.gz git-a6d3bde5afc5d742af0d7b1f2725b760dca165cb.tar.bz2 | |
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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 861bd6f..9bb4956 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -9,11 +9,11 @@ merge.conflictstyle:: merge.defaultToUpstream:: If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last - observed values stored in their remote tracking branches. + observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` - to their corresponding remote tracking branches, and the tips of + to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. merge.ff:: |