diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-06 00:16:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-06 00:16:05 -0700 |
| commit | 4b4a5dbb17e1136275665024689625ed5cc5a03d (patch) | |
| tree | 5962c8c82b5a8c492c42c90c9b959c39970d0124 /Makefile | |
| parent | b2d3476e15cefdbd94366d4cf46fd05c1623034f (diff) | |
| parent | b5c698d947c236559e338e45c6234ece7c819338 (diff) | |
| download | git-4b4a5dbb17e1136275665024689625ed5cc5a03d.tar.gz | |
Merge branch 'jc/blame' into jc/web-blame
* jc/blame:
git-blame --porcelain
blame.c: move code to output metainfo into a separate function.
git-blame: --show-number (and -n)
git-blame: --show-name (and -f)
blame.c: whitespace and formatting clean-up.
gitweb: Make the Git logo link target to point to the homepage
gitweb: blame: Minimize vertical table row padding
gitweb: Do not print "log" and "shortlog" redundantly in commit view
vc-git.el: Switch to using git-blame instead of git-annotate.
git.el: Fixed inverted "renamed from/to" message.
tar-tree deprecation: we eat our own dog food.
Add git-upload-archive to the main git man page
git-commit: cleanup unused function.
Fix usage string to match that given in the man page
Update the gitweb/README file to include setting the GITWEB_CONFIG environment
Conflicts:
gitweb/gitweb.perl
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -860,8 +860,9 @@ git.spec: git.spec.in mv $@+ $@ GIT_TARNAME=git-$(GIT_VERSION) -dist: git.spec git-tar-tree - ./git-tar-tree HEAD^{tree} $(GIT_TARNAME) > $(GIT_TARNAME).tar +dist: git.spec git-archive + ./git-archive --format=tar \ + --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) @cp git.spec $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version |