git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'

From
SBSanti Béjar <santi@agolina.net>
Date
Mar 30, 2009, 10:11 UTC
Message-ID
<1238407903-28020-4-git-send-email-santi@agolina.net>
In-Reply-To
<1238407903-28020-1-git-send-email-santi@agolina.net>
Signed-off-by: Santi Béjar <santi@agolina.net>
---
 Documentation/config.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7ae584f..38ab785 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
 branch.<name>.merge::
 	It defines, together with branch.<name>.remote, the upstream branch
 	for the given branch. It tells 'git-fetch'/'git-pull' which
-	branch to merge.
+	branch to merge and can also afect '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

-- 
1.6.1.258.g7ff14
Previous: Santi BéjarNext: Michael J Gruber
Message 4 of 17 in “[PATCHv2 0/4] push.default and branch.<name>.{remote,merge} changes”
  1. Santi BéjarMar 30, 2009
  2. 1/4 Documentation: enhance branch.<name>.{remote,merge}Santi Béjar, Mar 30, 2009
  3. 2/4 Documentation: push.default applies to all remotesSanti Béjar, Mar 30, 2009
  4. 3/4 Documentation: branch.*.merge can also afect 'git-push'Santi Béjar, Mar 30, 2009
  5. Michael J GruberMar 30, 2009
  6. Junio C HamanoMar 30, 2009
  7. Santi BéjarMar 30, 2009
  8. Junio C HamanoApr 2, 2009
  9. 4/4 Rename push.default to push.modeSanti Béjar, Mar 30, 2009
  10. Michael J GruberMar 30, 2009
  11. Santi BéjarMar 30, 2009
  12. Michael J GruberMar 30, 2009
  13. Jeff KingMar 30, 2009
  14. Michael J GruberMar 30, 2009
  15. Jeff KingMar 30, 2009
  16. Michael J GruberMar 31, 2009
  17. Jeff KingMar 31, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.