Merge branch 'jc/commit-amend-no-edit'
commita2add8570c90e14e8e0cedae935091f100c758dc
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:56 +0000 (16 22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:56 +0000 (16 22:33 -0800)
tree7284b2dba483b9443af76c5c2ad030b6b295a7eb
parent48b303675aa238c209e527feadcbb7ba1c025c97
parentbc8218999863a083d725f2011e5e0371df30aa1f
Merge branch 'jc/commit-amend-no-edit'

* jc/commit-amend-no-edit:
  test: commit --amend should honor --no-edit
  commit: honour --no-edit
  t7501 (commit): modernize style
  test: remove a porcelain test that hard-codes commit names
  test: add missing "&&" after echo command
builtin/commit.c