combine-diff: better hunk splitting.

diff --git a/git-commit.sh b/git-commit.sh
index 82d743bd037db74f4233a620b001fb3002f346cc..193feeb5e42f1a486a3aae42935cb98696a2baac 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -165,6 +165,7 @@ then
        then
                pick_author_script='
                /^author /{
+                       s/'\''/'\''\\'\'\''/g
                        h
                        s/^author \([^<]*\) <[^>]*> .*$/\1/
                        s/'\''/'\''\'\'\''/g