Merge branch 'jc/git-add--interactive'

* jc/git-add--interactive:
  git-add --interactive: add documentation
  git-add --interactive: hunk splitting
  git-add --interactive

diff --cc Makefile
index 8827dee59ccee9365b19113e28034ef822776026,354f66b23335ba08f13813e64f8360015871867a..475047f100ef1a2a9cf73557eba3b300e74cac9d
--- 1/Makefile
--- 2/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