OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9aad6cb
)
Documentation: clarify commits affected by gitk --merge
author
Sitaram Chamarty
<sitaramc@gmail.com>
Fri, 6 Feb 2009 04:40:53 +0000
(10:10 +0530)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Feb 2009 05:21:28 +0000
(21:21 -0800)
Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitk.txt
patch
|
blob
|
history
diff --git
a/Documentation/gitk.txt
b/Documentation/gitk.txt
index
4673a75
..
bd005bc
100644
(file)
--- 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