Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: branch.*.merge can also affect 'git-push'
author
Santi Béjar
<santi@agolina.net>
Mon, 30 Mar 2009 10:11:42 +0000
(12:11 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Apr 2009 07:14:55 +0000
(
00:14
-0700)
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
1d1876e
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index 27cb7f14080210fac4dc9b0966dee326aeeaf394..3afd124749fc6301069a0832071000a769e5053b 100644
(file)
--- 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