diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-12 23:13:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-12 23:13:01 -0700 |
| commit | 9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4 (patch) | |
| tree | a1139d87abbf7d1ac72f7b68378b849dea890b33 /Makefile | |
| parent | f8a066581d0d3b0044e885f5d76170313db35d6c (diff) | |
| parent | 65d61e5f512f15b8384a2b6bfe818713fe5bebcb (diff) | |
| download | git-9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4.tar.gz git-9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4.tar.xz | |
Merge branch 'maint'
* maint:
Don't package the git-gui credits file anymore
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -931,8 +931,7 @@ dist: git.spec git-archive $(TAR) rf $(GIT_TARNAME).tar \ $(GIT_TARNAME)/git.spec \ $(GIT_TARNAME)/version \ - $(GIT_TARNAME)/git-gui/version \ - $(GIT_TARNAME)/git-gui/credits + $(GIT_TARNAME)/git-gui/version @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar |