diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-02-09 18:05:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-02-09 18:05:49 +0000 |
| commit | 61169124a250790e1310b11635d25e7e25253f9b (patch) | |
| tree | 193c1f55de9eafcad5daf9153869efa90975b59a /gitk.txt | |
| parent | e5bf6c1297898d9fd6102bdf7e5cc637b1bbdbb8 (diff) | |
| download | git-htmldocs-61169124a250790e1310b11635d25e7e25253f9b.tar.gz | |
Autogenerated HTML docs for v1.6.2-rc0-10-gf6b9
Diffstat (limited to 'gitk.txt')
| -rw-r--r-- | gitk.txt | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |