From: Junio C Hamano <junkio@cox.net>
Date: Sat, 25 Feb 2006 03:01:02 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d55e0fff1fadf5fcbaa71dccd03e44f3ab610b66?hp=-c

Merge branch 'master' into next

* master:
Merge branches 'jc/rev-list' and 'jc/pack-thin'
gitview: Code cleanup
Add missing programs to ignore list
git ls files recursively show ignored files
Build and install git-mailinfo.
gitview: Bump the rev
gitview: Fix DeprecationWarning
---

d55e0fff1fadf5fcbaa71dccd03e44f3ab610b66
diff --combined Makefile
index 8e6bbcecbf,6c59cee414..26fd9dc132
--- a/Makefile
+++ b/Makefile
@@@ -153,8 -153,8 +153,8 @@@ PROGRAMS = 
  	git-convert-objects$X git-diff-files$X \
  	git-diff-index$X git-diff-stages$X \
  	git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
- 	git-hash-object$X git-index-pack$X git-init-db$X \
- 	git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$X \
+ 	git-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
+ 	git-ls-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
  	git-peek-remote$X git-prune-packed$X git-read-tree$X \
  	git-receive-pack$X git-rev-list$X git-rev-parse$X \
@@@ -165,7 -165,7 +165,7 @@@
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -	git-describe$X git-merge-tree$X
 +	git-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)