From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Jun 2006 17:35:13 +0000 (-0700)
Subject: Merge branch 'js/lsfix'
X-Git-Tag: v1.4.1-rc1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ab2c0a47574c92f92ea3709b23ca35d96319edd;p=git.git

Merge branch 'js/lsfix'

* js/lsfix:
  Initialize lock_file struct to all zero.
  Make git-update-ref a builtin
  Make git-update-index a builtin
  Make git-stripspace a builtin
  Make git-mailinfo a builtin
  Make git-mailsplit a builtin
  Make git-write-tree a builtin
---

5ab2c0a47574c92f92ea3709b23ca35d96319edd
diff --cc Makefile
index 69b5500f3,99c9ec205..a5b67849b
--- a/Makefile
+++ b/Makefile
@@@ -149,10 -148,10 +148,10 @@@ SIMPLE_PROGRAMS = 
  
  # ... and all the rest that could be moved out of bindir to gitexecdir
  PROGRAMS = \
 -	git-checkout-index$X git-clone-pack$X \
 +	git-checkout-index$X \
  	git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
- 	git-mailinfo$X git-merge-base$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-receive-pack$X \
  	git-send-pack$X git-shell$X \