Merge branch 'np/addcommit'
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:08:20 +0000 (11:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:08:20 +0000 (11:08 -0800)
* np/addcommit:
  git-commit: allow --only to lose what was staged earlier.
  Documentation/git-commit: rewrite to make it more end-user friendly.
  make 'git add' a first class user friendly interface to the index

1  2 
git-commit.sh
wt-status.c

diff --cc git-commit.sh
Simple merge
diff --cc wt-status.c
Simple merge