summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf3e274)
raw | patch | inline | side by side (parent: bf3e274)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 29 Nov 2005 21:51:27 +0000 (13:51 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 29 Nov 2005 22:25:00 +0000 (14:25 -0800) |
The attempt to help 3-way fallback by recording the tree object
id for the entire pre-image was unnecessary, and we already have
an better alternative in the form of per-blob "index" lines.
Signed-off-by: Junio C Hamano <junkio@cox.net>
id for the entire pre-image was unnecessary, and we already have
an better alternative in the form of per-blob "index" lines.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-format-patch.sh | patch | blob | history |
diff --git a/git-format-patch.sh b/git-format-patch.sh
index 9b4088045a5d53ceb1b893e5f6bda575518d36c1..a26d46dba0b1f952beae2c528cc8ba18334cbcd9 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
echo
git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
echo
- git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q
git-diff-tree -p $diff_opts "$commit"
echo "---"
echo "@@GIT_VERSION@@"