diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-04-30 08:45:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-04-30 08:45:27 +0000 |
| commit | 7d575a5e95514414281eb8f7d33d12c1b396edd2 (patch) | |
| tree | 1e90272279f86a84a2555173a04bb793de6145d9 /gitk.txt | |
| parent | 9ab876720cbaa7bef5a4fd4e8b831d52e5b5cf04 (diff) | |
| download | git-htmldocs-7d575a5e95514414281eb8f7d33d12c1b396edd2.tar.gz | |
Autogenerated HTML docs for v1.5.5.1-114-g8d308
Diffstat (limited to 'gitk.txt')
| -rw-r--r-- | gitk.txt | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |