diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
| commit | 5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch) | |
| tree | 92fff315690007bbbdaa9116570a8a49b01f5420 /git-commit.sh | |
| parent | Merge fixes up to GIT 1.0.6 (diff) | |
| parent | GIT 1.0.7 (diff) | |
| download | git-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.gz git-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.zip | |
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 |