summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorTechlive Zheng <techlivezheng@gmail.com>2013-02-04 22:06:02 -0600
committerJunio C Hamano <gitster@pobox.com>2013-02-05 15:22:12 -0800
commita5b8e28e4eb5762c9da68b56efdf45d6c885bd56 (patch)
tree6a89d6b83b8a3a45f4fe99ef667373f147ac6655 /contrib/subtree/git-subtree.sh
parent144797d7209565f1d377aaf1f157ea30eff5e04c (diff)
downloadgit-a5b8e28e4eb5762c9da68b56efdf45d6c885bd56.tar.gz
contrib/subtree: use %B for split subject/body
Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng <techlivezheng@gmail.com> Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 920c664bb7..559821092d 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -296,7 +296,7 @@ copy_commit()
# We're going to set some environment vars here, so
# do it in a subshell to get rid of them safely later
debug copy_commit "{$1}" "{$2}" "{$3}"
- git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%s%n%n%b' "$1" |
+ git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" |
(
read GIT_AUTHOR_NAME
read GIT_AUTHOR_EMAIL