summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-11-04 04:29:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-04 04:29:38 (GMT)
commitab6b50e4c8339167c0b048c778055526226c45ca (patch)
treef378953158b99acafc700cff190ee31b0f964593 /git-gui/git-gui.sh
parent93bf7423dd21c9d7bf2fd99c97cbfcb74740eac3 (diff)
parentb524f6b399c77b40c8bf2b6217585fde4731472a (diff)
downloadgit-ab6b50e4c8339167c0b048c778055526226c45ca.zip
git-ab6b50e4c8339167c0b048c778055526226c45ca.tar.gz
git-ab6b50e4c8339167c0b048c778055526226c45ca.tar.bz2
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui: git-gui: improve Japanese translation git-gui: add a readme git-gui: support for diff3 conflict style git-gui: use existing interface to query a path's attribute git-gui (Windows): use git-bash.exe if it is available treewide: correct several "up-to-date" to "up to date" Fix build with core.autocrlf=true
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index fd476b6..0d21f56 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -2736,10 +2736,18 @@ if {![is_bare]} {
}
if {[is_Windows]} {
+ # Use /git-bash.exe if available
+ set normalized [file normalize $::argv0]
+ regsub "/mingw../libexec/git-core/git-gui$" \
+ $normalized "/git-bash.exe" cmdLine
+ if {$cmdLine != $normalized && [file exists $cmdLine]} {
+ set cmdLine [list "Git Bash" $cmdLine &]
+ } else {
+ set cmdLine [list "Git Bash" bash --login -l &]
+ }
.mbar.repository add command \
-label [mc "Git Bash"] \
- -command {eval exec [auto_execok start] \
- [list "Git Bash" bash --login -l &]}
+ -command {eval exec [auto_execok start] $cmdLine}
}
if {[is_Windows] || ![is_bare]} {
@@ -3581,6 +3589,9 @@ $ui_diff tag conf d_s- \
$ui_diff tag conf d< \
-foreground orange \
-font font_diffbold
+$ui_diff tag conf d| \
+ -foreground orange \
+ -font font_diffbold
$ui_diff tag conf d= \
-foreground orange \
-font font_diffbold