threads / patch / 20099

patch, 2 partsDocument 'git (rev-list|log) --merges'

Subject: [PATCH 1/2] Document 'git (rev-list|log) --merges'

## tl;dr

2 messages between Jul 13, 2009 and Jul 13, 2009. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

SZEDER Gábor· Jul 13, 2009, 15:11 UTC · lore

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 Documentation/git-rev-list.txt     |    1 +
 Documentation/rev-list-options.txt |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

Show changes to 2 files +5 −0

Documentation/git-rev-list.txt, Documentation/rev-list-options.txt

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 1c9cc28..a765cfa 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -14,6 +14,7 @@ SYNOPSIS
 	     [ \--max-age=timestamp ]
 	     [ \--min-age=timestamp ]
 	     [ \--sparse ]
+	     [ \--merges ]
 	     [ \--no-merges ]
 	     [ \--first-parent ]
 	     [ \--remove-empty ]
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 11eec94..bf66116 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -201,6 +201,10 @@ endif::git-rev-list[]
 
 	Stop when a given path disappears from the tree.
 
+--merges::
+
+	Print only merge commits.
+
 --no-merges::
 
 	Do not print commits with more than one parent.

-- 
1.6.4.rc0.78.g75597

SZEDER Gábor· Jul 13, 2009, 15:11 UTC · re: SZEDER Gábor · lore

[PATCH 2/2] bash: add '--merges' to common 'git log' options

... so it's available for git log, shortlog and gitk.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to contrib/completion/git-completion.bash +1 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 90edc8c..bc2d8b4 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1114,7 +1114,7 @@ _git_ls_tree ()
 __git_log_common_options="
 	--not --all
 	--branches --tags --remotes
-	--first-parent --no-merges
+	--first-parent --merges --no-merges
 	--max-count=
 	--max-age= --since= --after=
 	--min-age= --until= --before=

-- 
1.6.4.rc0.78.g75597