diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:24 -0700 |
| commit | 6f89c2714a557ad3630ed005f4680193a638ce3f (patch) | |
| tree | fd9e60eff18d9502c3ec10b301dd46822f46cfd4 | |
| parent | ddeaf7ef0d23519cb810542978da54dd89d6fb73 (diff) | |
| parent | 7bca7afeff6f17309545cd2c8431b7228d1151ab (diff) | |
| download | git-6f89c2714a557ad3630ed005f4680193a638ce3f.tar.gz | |
Merge branch 'es/rebase-i-respect-core-commentchar' into maint
* es/rebase-i-respect-core-commentchar:
rebase -i: fix cases ignoring core.commentchar
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 83d6d4676b..9dfeb53953 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -671,7 +671,7 @@ skip_unnecessary_picks () { ;; esac ;; - 3,#*|3,) + 3,"$comment_char"*|3,) # copy comments ;; *) |