From: Junio C Hamano Date: Thu, 6 Dec 2007 01:49:13 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.5.4-rc0~71 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/27ee189163070f53a87e033171a45520f70b242e?ds=inline;hp=-c Merge branch 'maint' * maint: git-am -i: report rewritten title git grep shows the same hit repeatedly for unmerged paths Do check_repository_format() early (re-fix) Do check_repository_format() early Add missing inside_work_tree setting in setup_git_directory_gently --- 27ee189163070f53a87e033171a45520f70b242e diff --combined git-am.sh index 76c1c844a9,44c558c940..65c634f77a --- a/git-am.sh +++ b/git-am.sh @@@ -2,26 -2,11 +2,26 @@@ # # Copyright (c) 2005, 2006 Junio C Hamano -USAGE='[--signoff] [--dotest=] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] - [--whitespace=