Merge branch 'ci/commit--interactive-atomic'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:10 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:10 +0000 (16:47 -0700)
* ci/commit--interactive-atomic:
  Test atomic git-commit --interactive
  Add commit to list of config.singlekey commands
  Add support for -p/--patch to git-commit
  Allow git commit --interactive with paths
  t7501.8: feed a meaningful command
  Use a temporary index for git commit --interactive

1  2 
Documentation/config.txt
builtin/add.c
builtin/commit.c
commit.h
t/t7501-commit.sh

Simple merge
diff --cc builtin/add.c
Simple merge
Simple merge
diff --cc commit.h
Simple merge
Simple merge