diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-04 22:03:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-04 22:03:42 -0800 |
| commit | 144126abf99f2eac48e63b7ea85a8f3f99f814db (patch) | |
| tree | cde92eb4fca39d059a0a370ed7790af53bd9a839 /git-gui/git-gui.sh | |
| parent | cf9d58e4f388dc173b86143fbfe0eac114e3ed2f (diff) | |
| parent | a6d5888fa1bb24ef34ce36f0e684d13a58eba908 (diff) | |
| download | git-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.gz git-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Make commit log messages end with a newline
Added Swedish translation.
git-gui: Unconditionally use absolute paths with Cygwin
git-gui: Handle file mode changes (644->755) in diff viewer
git-gui: Move frequently used commands to the top of the context menu.
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 1fca11f27..fcb2ab2fb 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2542,6 +2542,27 @@ $ui_diff tag raise sel set ctxm .vpane.lower.diff.body.ctxm menu $ctxm -tearoff 0 $ctxm add command \ + -label [mc "Apply/Reverse Hunk"] \ + -command {apply_hunk $cursorX $cursorY} +set ui_diff_applyhunk [$ctxm index last] +lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] +$ctxm add separator +$ctxm add command \ + -label [mc "Show Less Context"] \ + -command {if {$repo_config(gui.diffcontext) >= 1} { + incr repo_config(gui.diffcontext) -1 + reshow_diff + }} +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] +$ctxm add command \ + -label [mc "Show More Context"] \ + -command {if {$repo_config(gui.diffcontext) < 99} { + incr repo_config(gui.diffcontext) + reshow_diff + }} +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] +$ctxm add separator +$ctxm add command \ -label [mc Refresh] \ -command reshow_diff lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] @@ -2563,12 +2584,6 @@ $ctxm add command \ lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add separator $ctxm add command \ - -label [mc "Apply/Reverse Hunk"] \ - -command {apply_hunk $cursorX $cursorY} -set ui_diff_applyhunk [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] -$ctxm add separator -$ctxm add command \ -label [mc "Decrease Font Size"] \ -command {incr_font_size font_diff -1} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] @@ -2577,21 +2592,6 @@ $ctxm add command \ -command {incr_font_size font_diff 1} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add separator -$ctxm add command \ - -label [mc "Show Less Context"] \ - -command {if {$repo_config(gui.diffcontext) >= 1} { - incr repo_config(gui.diffcontext) -1 - reshow_diff - }} -lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] -$ctxm add command \ - -label [mc "Show More Context"] \ - -command {if {$repo_config(gui.diffcontext) < 99} { - incr repo_config(gui.diffcontext) - reshow_diff - }} -lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] -$ctxm add separator $ctxm add command -label [mc "Options..."] \ -command do_options proc popup_diff_menu {ctxm x y X Y} { |