development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation gitk: Describe what --merge does

Browse source 
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Richard Quirk 2008-04-28 22:58:35 +02:00 committed by Junio C Hamano
parent 97ad535b01
commit 9f1915d393
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/gitk.txt
View file

@ -41,6 +41,12 @@ frequently used options.
Show all branches.
--merge::
After an attempt to merge stops with conflicts, show the commits on
the history between two branches (i.e. the HEAD and the MERGE_HEAD)
that modify the conflicted files.
<revs>::
Limit the revisions to show. This can be either a single revision