From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Dec 2018 12:41:42 +0000 (+0900)
Subject: Merge branch 'js/rebase-reflog-action-fix'
X-Git-Tag: v2.20.0-rc2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=945f6bd1ce99b3c3576d52778055086caaed1fb8;p=git

Merge branch 'js/rebase-reflog-action-fix'

"git rebase" reimplemented recently in C accidentally changed the
way reflog entries are recorded (earlier "rebase -i" identified the
entries it leaves with "rebase -i", but the new version always
marks them with "rebase").  This has been corrected.

* js/rebase-reflog-action-fix:
  rebase: fix GIT_REFLOG_ACTION regression
---

945f6bd1ce99b3c3576d52778055086caaed1fb8