diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-23 08:27:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-23 08:27:37 +0300 |
| commit | e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1 (patch) | |
| tree | b0974609d67763a8580bba07839a528c6fab7042 /Makefile | |
| parent | 2470653196fa8461ff5895c521519e947482eae1 (diff) | |
| parent | 75b62b489af7b62a5518c3f199d2a2776205e088 (diff) | |
Merge branch 'maint'
* maint:
git-diff: fix combined diff
Fix 'git commit -a' in a newly initialized repository
Include git-gui credits file in dist.
Document the new core.bare configuration option.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -895,7 +895,8 @@ 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/version \ + $(GIT_TARNAME)/git-gui/credits @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar |