From: Junio C Hamano <junkio@cox.net>
Date: Fri, 26 May 2006 23:36:20 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a0a1398ff3db6762076ebd071559c36b9414217?hp=-c

Merge branch 'master' into next

* master:
Call builtin ls-tree in git-cat-file -p
built-in format-patch: various fixups.
Add instructions to commit template.
---

2a0a1398ff3db6762076ebd071559c36b9414217
diff --combined git-commit.sh
index 0a01a0b96a,1983d45828..91f28f9a23
--- a/git-commit.sh
+++ b/git-commit.sh
@@@ -626,6 -626,9 +626,9 @@@ f
  if test -z "$no_edit"
  then
  	{
+ 		echo ""
+ 		echo "# Please enter the commit message for your changes."
+ 		echo "# (Comment lines starting with '#' will not be included)"
  		test -z "$only_include_assumed" || echo "$only_include_assumed"
  		run_status
  	} >>"$GIT_DIR"/COMMIT_EDITMSG
@@@ -687,8 -690,7 +690,8 @@@ the
  		rm -f "$TMP_INDEX"
  	fi &&
  	commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
 -	git-update-ref HEAD $commit $current &&
 +	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
 +	git-update-ref -m "commit: $rlogm" HEAD $commit $current &&
  	rm -f -- "$GIT_DIR/MERGE_HEAD" &&
  	if test -f "$NEXT_INDEX"
  	then