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

[PATCH 6/9] Documentation: branch: update --merged description

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Oct 9, 2009, 10:18 UTC
Message-ID
<20091009101858.GF16558@progeny.tock>
In-Reply-To
<20091009101400.GA16549@progeny.tock>

Update the documentation for --merged and --no-merged to explain the meaning of the optional parameter introduced in commit 049716b (branch --merged/--no-merged: allow specifying arbitrary commit, 2008-07-08).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Documentation/git-branch.txt |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index aad71dc..e8b32a2 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -134,11 +134,13 @@ start-point is either a local or remote branch.
 --contains <commit>::
 	Only list branches which contain the specified commit.
 
---merged::
-	Only list branches which are fully contained by HEAD.
+--merged [<commit>]::
+	Only list branches whose tips are reachable from the
+	specified commit (HEAD if not specified).
 
---no-merged::
-	Do not list branches which are fully contained by HEAD.
+--no-merged [<commit>]::
+	Do not list branches whose tips are reachable from the
+	specified commit (HEAD if not specified).
 
 <branchname>::
 	The name of the branch to create or delete.

-- 
1.6.5.rc1.199.g596ec
Previous: Jonathan NiederNext: Junio C Hamano
Message 10 of 19 in “Documentation tweaks”
  1. 0/9 Documentation tweaksJonathan Nieder, Oct 9, 2009
  2. 1/9 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in MakefileJonathan Nieder, Oct 9, 2009
  3. 2/9 Documentation: git fmt-merge-message is not a scriptJonathan Nieder, Oct 9, 2009
  4. 3/9 Documentation: fix singular/plural mismatchJonathan Nieder, Oct 9, 2009
  5. 4/9 Documentation: say "the same" instead of "equal"Jonathan Nieder, Oct 9, 2009
  6. 4/9 Documentation: clarify mergeoptions descriptionJonathan Nieder, Oct 9, 2009
  7. 5/9 Documentation: clone: clarify discussion of initial branchJonathan Nieder, Oct 9, 2009
  8. Junio C HamanoOct 9, 2009
  9. 5/9 Documentation: clone: clarify discussion of initial branchJonathan Nieder, Oct 9, 2009
  10. 6/9 Documentation: branch: update --merged descriptionJonathan Nieder, Oct 9, 2009
  11. Junio C HamanoOct 10, 2009
  12. 7/9 Documentation: clarify branch creationJonathan Nieder, Oct 9, 2009
  13. Sean EstabrooksOct 9, 2009
  14. Jonathan NiederOct 9, 2009
  15. Junio C HamanoOct 10, 2009
  16. 8/9 Documentation: clarify "working tree" definitionJonathan Nieder, Oct 9, 2009
  17. 9/9 racy-git.txt: explain nsec problem in more detailJonathan Nieder, Oct 9, 2009
  18. Junio C HamanoOct 10, 2009
  19. Junio C HamanoOct 10, 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.