tree 3e94d96072c62c1110877e5260333c0f02d43eea
parent d32fa3c6f7f441c7c9f16d0661ce041e6f9a3439
parent 13a5a9f0fdcf36270dcc2dcb7752c281bbea06f1
author Junio C Hamano <gitster@pobox.com> 1543668102 +0900
committer Junio C Hamano <gitster@pobox.com> 1543668102 +0900

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