diff options
| author | Santi Béjar <santi@agolina.net> | 2009-03-30 12:11:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:14:55 -0700 |
| commit | 5c9c990341bad6b4087c2dd99d28a6cb910749df (patch) | |
| tree | f598f5310231322c830c8028eae8f20045207f49 | |
| parent | 1d1876e9300c56f399ea2976c5831674cd9818b1 (diff) | |
| download | git-5c9c990341bad6b4087c2dd99d28a6cb910749df.tar.gz | |
Documentation: branch.*.merge can also affect 'git-push'
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 27cb7f1408..3afd124749 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -480,7 +480,7 @@ branch.<name>.remote:: branch.<name>.merge:: Defines, together with branch.<name>.remote, the upstream branch for the given branch. It tells 'git-fetch'/'git-pull' which - branch to merge from. + branch to merge and can also affect 'git-push' (see push.default). When in branch <name>, it tells 'git-fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a |