From: Junio C Hamano <junkio@cox.net>
Date: Mon, 25 Dec 2006 09:31:17 +0000 (-0800)
Subject: Merge branch 'jc/git-add--interactive'
X-Git-Tag: v1.5.0-rc0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6f38e0372266b5d674972e7039f8bd4156589558;p=git.git

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

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

6f38e0372266b5d674972e7039f8bd4156589558
diff --cc Makefile
index 8827dee59,354f66b23..475047f10
--- a/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