diff options
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh index 7e39c107cf..193feeb5e4 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -148,7 +148,7 @@ esac if [ -f "$GIT_DIR/MERGE_HEAD" ]; then echo "#" - echo "# It looks like your 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" @@ -165,6 +165,7 @@ then then pick_author_script=' /^author /{ + s/'\''/'\''\\'\'\''/g h s/^author \([^<]*\) <[^>]*> .*$/\1/ s/'\''/'\''\'\'\''/g |