projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Escape asciidoc's built-in em-dash replacement
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
741444a
..
d8bfc3c
100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-158,7
+158,7
@@
if [ ! -r "$GIT_DIR/HEAD" ]; then
PARENTS=""
else
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
- PARENTS="-p HEAD
-p MERGE_HEAD"
+ PARENTS="-p HEAD
"`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
fi
if test "$use_commit" != ""
then