diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-08-17 01:44:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-19 00:33:01 +0400 |
| commit | 7bca7afeff6f17309545cd2c8431b7228d1151ab (patch) | |
| tree | 5181e2ab198bd8f9350df12be9e580425ebb4794 /git-rebase--interactive.sh | |
| parent | a3bc3d070cacf07dbe11b4bfec57554c8bbf1957 (diff) | |
rebase -i: fix cases ignoring core.commentchar
180bad3d (rebase -i: respect core.commentchar, 2013-02-11) updated
"rebase -i" to honor core.commentchar but missed one instance of
hard-coded '#' comment character in skip_unnecessary_picks().
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -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 5822b2c592..1e3097ed24 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -661,7 +661,7 @@ skip_unnecessary_picks () { ;; esac ;; - 3,#*|3,) + 3,"$comment_char"*|3,) # copy comments ;; *) |