Merge branch 'jc/git-add--interactive'
authorJunio C Hamano <junkio@cox.net>
Mon, 25 Dec 2006 09:31:17 +0000 (01:31 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 25 Dec 2006 09:31:17 +0000 (01:31 -0800)
* jc/git-add--interactive:
  git-add --interactive: add documentation
  git-add --interactive: hunk splitting
  git-add --interactive

1  2 
Makefile
builtin-add.c

diff --cc Makefile
+++ b/Makefile
@@@ -170,7 -177,9 +170,8 @@@ SCRIPT_SH = 
        git-lost-found.sh git-quiltimport.sh
  
  SCRIPT_PERL = \
+       git-add--interactive.perl \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
 -      git-rerere.perl \
        git-cvsserver.perl \
        git-svnimport.perl git-cvsexportcommit.perl \
        git-send-email.perl git-svn.perl
diff --cc builtin-add.c
Simple merge