[PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Junio C Hamano <gitster@xxxxxxxxx>

[kk: added documentation in git-log.txt]

Signed-off-by: Koosha Khajehmoogahi <koosha@xxxxxxxxx>
---
 Documentation/git-log.txt          |  3 +++
 Documentation/rev-list-options.txt | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 18bc716..e16f0f8 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -190,6 +190,9 @@ log.showRoot::
 	`git log -p` output would be shown without a diff attached.
 	The default is `true`.
 
+log.merges::
+    Default for `--merges=` option. Defaults to `show`.
+
 mailmap.*::
 	See linkgit:git-shortlog[1].
 
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index f620ee4..88f152f 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -96,6 +96,23 @@ if it is part of the log message.
 --remove-empty::
 	Stop when a given path disappears from the tree.
 
+--merges={show|hide|only}::
+
+	Limit the output by type of commits.
+
+	`hide`;;
+		Hide merge commits from the output.
+
+	`only`;;
+		Hide non-merge commits from the output (i.e showing
+		only merge commits).
+
+	`show`;;
+		Do not hide either merge or non-merge commits. This
+		is primarily useful when the user has non-standard
+		setting of `log.merges` configuration variable that
+		needs to be overriden from the command line.
+
 --merges::
 	Print only merge commits. This is exactly the same as `--min-parents=2`.
 
-- 
2.3.3.263.g095251d.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]