diff options
| author | Richard Quirk <richard.quirk@gmail.com> | 2008-04-28 22:58:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-29 23:11:57 -0700 |
| commit | 9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f (patch) | |
| tree | 83d80e5b926327534beec19c482ef6691a24c792 /Documentation/gitk.txt | |
| parent | 97ad535b01f7c4e960298aabe16979ad92f26d4f (diff) | |
| download | git-9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f.tar.gz | |
Documentation gitk: Describe what --merge does
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitk.txt')
| -rw-r--r-- | Documentation/gitk.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index ed3ba83c53..50d12da89f 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -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 |