From: Eric Sunshine Date: Sun, 18 Aug 2013 17:12:49 GMT Subject: [PATCH v2 1/2] rebase -i: fix skip_unnecessary_picks() to respect core.commentchar Message-ID: <1376845970-31204-2-git-send-email-sunshine@sunshineco.com> In-Reply-To: <1376845970-31204-1-git-send-email-sunshine@sunshineco.com> eff80a9fd990de36 (Allow custom "comment char", 2013-01-16) added general core.commentchar support but forgot to update git-rebase--interactive to respect it. 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11) addressed this oversight but missed one instance of hard-coded '#' comment character in skip_unnecessary_picks(). Fix this. Signed-off-by: Eric Sunshine --- Suitable for 'maint'. git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ea11e62..3733312 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 ;; *) -- 1.8.4.rc3.500.gc3113b0