diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-27 00:36:38 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-27 00:36:38 -0400 |
| commit | 03d25622a5c0f8d0fc4030f3114974d86f20fd61 (patch) | |
| tree | 4fbe35cd50e671e27635843e3474e3b1e4da2706 /Makefile | |
| parent | fe813d4e80426971ce17f6ea03f97bc1e26383a1 (diff) | |
| parent | 7e508eb1a2efce72be1651a35ab3150bfa3c88d6 (diff) | |
| download | git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.gz git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
git-gui: Don't nice git blame on MSYS as nice is not supported
git-gui: Don't require $DISPLAY just to get --version
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -92,7 +92,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh fi; \ fi && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \ + -e 's|^ exec wish "$$0"| exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \ -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ -e 's|@@GITGUI_RELATIVE@@|'$$GITGUI_RELATIVE'|' \ -e $$GITGUI_RELATIVE's|@@GITGUI_LIBDIR@@|$(libdir_SQ)|' \ |