提交 5c9c9903 编写于 作者: S Santi Béjar 提交者: Junio C Hamano

Documentation: branch.*.merge can also affect 'git-push'

Signed-off-by: NSanti Béjar <santi@agolina.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 1d1876e9
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册