diff options
| author | Sitaram Chamarty <sitaramc@gmail.com> | 2009-02-06 10:10:53 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-08 21:21:28 -0800 |
| commit | 3021faf6562690658d0b9f9fdd7cbe8c9dd61628 (patch) | |
| tree | 5b04376ecea356c1041d81b6ec0821d70c924a9e /Documentation/gitk.txt | |
| parent | 9aad6cbaef3c459ff4953f5a22bbbc7abfc72800 (diff) | |
| download | git-3021faf6562690658d0b9f9fdd7cbe8c9dd61628.tar.gz | |
Documentation: clarify commits affected by gitk --merge
Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitk.txt')
| -rw-r--r-- | Documentation/gitk.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 4673a75a98..bd005bc5c8 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -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 |