diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 11:16:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 11:16:26 -0800 |
| commit | b30ccd757354ea09b41e4359b0a5ab429d12f02e (patch) | |
| tree | 171cf9a99a9fe390a98a2d6a500e2ff37b9f19eb /git-gui/Makefile | |
| parent | 288123f01cb1b835edbf6e2e188159c2ff858aca (diff) | |
| parent | 87cd09f43e56de5235d09aef3ff5d840419fef49 (diff) | |
| download | git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.gz git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.xz | |
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
* 'maint' of git://git.spearce.org/git-gui:
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/Makefile')
| -rw-r--r-- | git-gui/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index b3580e9e4..197b55edf 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -7,7 +7,7 @@ all:: # TCL_PATH must be vaild for this to work. # -GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE +GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN -include GIT-VERSION-FILE @@ -270,7 +270,7 @@ TRACK_VARS = \ GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \ #end TRACK_VARS -GIT-GUI-VARS: .FORCE-GIT-GUI-VARS +GIT-GUI-VARS: FORCE @VARS='$(TRACK_VARS)'; \ if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ echo 1>&2 " * new locations or Tcl/Tk interpreter"; \ @@ -340,5 +340,4 @@ ifdef GITGUI_WINDOWS_WRAPPER endif .PHONY: all install uninstall dist-version clean -.PHONY: .FORCE-GIT-VERSION-FILE -.PHONY: .FORCE-GIT-GUI-VARS +.PHONY: FORCE |