projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glossary: explain "master" and "origin"
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
7e39c10
..
193feeb
100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-148,7
+148,7
@@
esac
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
echo "#"
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
echo "#"
- echo "# It looks like you
r
may be committing a MERGE."
+ echo "# It looks like you may be committing a MERGE."
echo "# If this is not correct, please remove the file"
echo "# $GIT_DIR/MERGE_HEAD"
echo "# and try again"
echo "# If this is not correct, please remove the file"
echo "# $GIT_DIR/MERGE_HEAD"
echo "# and try again"
@@
-165,6
+165,7
@@
then
then
pick_author_script='
/^author /{
then
pick_author_script='
/^author /{
+ s/'\''/'\''\\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g