]> Pileus Git - ~andy/git/commitdiff
Merge branch 'js/lsfix'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:35:13 +0000 (10:35 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:35:13 +0000 (10:35 -0700)
* 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

1  2 
Makefile

diff --cc Makefile
index 69b5500f3fd5b42d92e981e0add0dae2264fdf16,99c9ec2054a54fea5abc3a584d808b0944a5db58..a5b67849b3375127cb7bfd1ec68719c747338d89
+++ 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 \