diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-30 20:50:40 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-30 20:50:40 +1100 |
commit | 7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f (patch) | |
tree | 7ce0043c36c365181656bf835190a490bf217815 | |
parent | 16c1ff968ac9717c958129eb05aa089cc0ca51e7 (diff) | |
download | git-7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f.tar.gz git-7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f.tar.xz |
gitk: Show diffs for boundary commits
With this we run git-diff-tree on a commit even if we think it has
no parents, either because it really has no parents or because it
is a boundary commit. This means that gitk shows the diff for a
boundary commit when it is selected.
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-x | gitk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2386,9 +2386,9 @@ proc selectline {l isnew} { $cflist delete 0 end $cflist insert end "Comments" - if {$nparents($id) == 1} { + if {$nparents($id) <= 1} { startdiff $id - } elseif {$nparents($id) > 1} { + } else { mergediff $id } } |