kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Documentation: clarify commits affected by gitk --merge 

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sitaram Chamarty 2009-02-06 10:10:53 +05:30 committed by Junio C Hamano
parent 9aad6cbaef
commit 3021faf656
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/gitk.txt
View File

@ -47,7 +47,8 @@ frequently used options.

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.
that modify the conflicted files and do not exist on all the heads
being merged.

--argscmd=<command>::
Command to be run each time gitk has to determine the list of