[PATCH] Documentation gitk: Describe what --merge does
From: Richard Quirk <hidden>
Date: 2016-06-15 22:44:32
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Richard Quirk <redacted> --- Documentation/gitk.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83..edd6547 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt@@ -41,6 +41,11 @@ frequently used options. Show all branches. +--merge:: + + Show the differences between HEAD and MERGE_HEAD for files with + conflicts after a merge. + <revs>:: Limit the revisions to show. This can be either a single revision
--
1.5.5.1.79.g57cf