aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-11 14:58:52 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-11 14:58:52 -0700
commit42e5fb2bf1cc6e805c703a921aeb804993283320 (patch)
tree7a0ccedd761428ad54b9048d91946b3a871adb8e /git-rebase--interactive.sh
parent09a373068afdb749f5a84f0c698d69776c257780 (diff)
parent7bca7afeff6f17309545cd2c8431b7228d1151ab (diff)
downloadgit-42e5fb2bf1cc6e805c703a921aeb804993283320.tar.gz
git-42e5fb2bf1cc6e805c703a921aeb804993283320.tar.xz
Merge branch 'es/rebase-i-respect-core-commentchar'
"rebase -i" forgot that the comment character can be configurable while reading its insn sheet. * es/rebase-i-respect-core-commentchar: rebase -i: fix cases ignoring core.commentchar
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 83d6d4676..9dfeb5395 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
;;
*)