Merge branch 'jh/commit-status'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 00:00:07 +0000 (16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 00:00:07 +0000 (16:00 -0800)
commitf8eb50f60b5c8efda3529fcf89517080c686ce0b
treebc320ad67d4c6278f41c1beeff7d4884688133ff
parenta4c3616b19700cc60e06096f59c4aae0e6635cfe
parentf9c01817bb7a0a7b61652ec8e3ac12c900526f0e
Merge branch 'jh/commit-status'

* jh/commit-status:
  t7502: test commit.status, --status and --no-status
  commit: support commit.status, --status, and --no-status

Conflicts:
Documentation/git-commit.txt
builtin-commit.c
Documentation/config.txt
Documentation/git-commit.txt
builtin-commit.c