Skip to content

Commit 5c9c990

Browse files
Santi Béjargitster
authored andcommitted
Documentation: branch.*.merge can also affect 'git-push'
Signed-off-by: Santi Béjar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1d1876e commit 5c9c990

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ branch.<name>.remote::
480480
branch.<name>.merge::
481481
Defines, together with branch.<name>.remote, the upstream branch
482482
for the given branch. It tells 'git-fetch'/'git-pull' which
483-
branch to merge from.
483+
branch to merge and can also affect 'git-push' (see push.default).
484484
When in branch <name>, it tells 'git-fetch' the default
485485
refspec to be marked for merging in FETCH_HEAD. The value is
486486
handled like the remote part of a refspec, and must match a

0 commit comments

Comments
 (0)