Merge branch 'cc/find-commit-subject'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:46:55 +0000 (12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:46:55 +0000 (12:46 -0700)
* cc/find-commit-subject:
  blame: use find_commit_subject() instead of custom code
  merge-recursive: use find_commit_subject() instead of custom code
  bisect: use find_commit_subject() instead of custom code
  revert: rename variables related to subject in get_message()
  revert: refactor code to find commit subject in find_commit_subject()
  revert: fix off by one read when searching the end of a commit subject

1  2 
builtin/blame.c
builtin/revert.c
commit.c
commit.h
merge-recursive.c

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