Browse Source

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 16 years ago committed by Junio C Hamano
parent
commit
3021faf656
  1. 3
      Documentation/gitk.txt

3
Documentation/gitk.txt

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


After an attempt to merge stops with conflicts, show the commits on 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) 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>:: --argscmd=<command>::
Command to be run each time gitk has to determine the list of Command to be run each time gitk has to determine the list of

Loading…
Cancel
Save