diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 11:18:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 11:18:05 -0800 |
| commit | 01ddb1ff41cdbd98e257aa4c119a7d51a21f80be (patch) | |
| tree | ae19f1b3672bac33ef724ffceb83a873f219c6bf /git-gui/lib/diff.tcl | |
| parent | 767f8b31cb3becbe303eb50a3faf3b4753fbaddd (diff) | |
| parent | b30ccd757354ea09b41e4359b0a5ab429d12f02e (diff) | |
| download | git-01ddb1ff41cdbd98e257aa4c119a7d51a21f80be.tar.gz git-01ddb1ff41cdbd98e257aa4c119a7d51a21f80be.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: work from the .git dir
git-gui: Fix applying a line when all following lines are deletions
git-gui: Correct file_states when unstaging partly staged entry
git-gui: Fix gitk for branch whose name matches local file
git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
git-gui: handle really long error messages in updateindex.
git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
git-gui: Makefile: consolidate .FORCE-* targets
Diffstat (limited to 'git-gui/lib/diff.tcl')
| -rw-r--r-- | git-gui/lib/diff.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index bd5d189ed..066755b86 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -664,6 +664,7 @@ proc apply_line {x y} { } set i_l $next_l } + set patch "$patch$pre_context" set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch" if {[catch { |