kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge git://git.kernel.org/pub/scm/gitk/gitk 

* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: Heed the lines of context in merge commits
maint
Junio C Hamano 2008-02-16 17:41:38 -08:00
parent 413b90f0da 6675ea4240
commit f124e986cf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitk-git/gitk
View File

@ -5032,13 +5032,14 @@ proc getblobline {bf id} {
proc mergediff {id l} { proc mergediff {id l} {
global diffmergeid mdifffd global diffmergeid mdifffd
global diffids global diffids
global diffcontext
global parentlist global parentlist
global limitdiffs viewfiles curview global limitdiffs viewfiles curview


set diffmergeid $id set diffmergeid $id
set diffids $id set diffids $id
# this doesn't seem to actually affect anything... # this doesn't seem to actually affect anything...
set cmd [concat | git diff-tree --no-commit-id --cc $id] set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
if {$limitdiffs && $viewfiles($curview) ne {}} { if {$limitdiffs && $viewfiles($curview) ne {}} {
set cmd [concat $cmd -- $viewfiles($curview)] set cmd [concat $cmd -- $viewfiles($curview)]
} }