* [PATCH] gitk: Heed the lines of context in merge commits.
@ 2008-02-13 16:27 Johannes Sixt
2008-02-13 23:50 ` Paul Mackerras
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Sixt @ 2008-02-13 16:27 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Git Mailing List
From: Johannes Sixt <johannes.sixt@telecom.at>
There is an edit box where the number of context lines can be chosen.
But it was only used when regular diffs were displayed, not for
merge commits. Fix this.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
gitk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index 7a97cc8..b20fa81 100644
--- a/gitk
+++ b/gitk
@@ -5028,13 +5028,14 @@ proc getblobline {bf id} {
proc mergediff {id l} {
global diffmergeid mdifffd
global diffids
+ global diffcontext
global parentlist
global limitdiffs viewfiles curview
set diffmergeid $id
set diffids $id
# 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 {}} {
set cmd [concat $cmd -- $viewfiles($curview)]
}
--
1.5.4.43.gbd39-dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gitk: Heed the lines of context in merge commits.
2008-02-13 16:27 [PATCH] gitk: Heed the lines of context in merge commits Johannes Sixt
@ 2008-02-13 23:50 ` Paul Mackerras
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mackerras @ 2008-02-13 23:50 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Git Mailing List
Johannes Sixt writes:
> There is an edit box where the number of context lines can be chosen.
> But it was only used when regular diffs were displayed, not for
> merge commits. Fix this.
Thanks, applied.
Paul.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-14 0:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-13 16:27 [PATCH] gitk: Heed the lines of context in merge commits Johannes Sixt
2008-02-13 23:50 ` Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).