projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d32fa3c 13a5a9f)
Merge branch 'js/rebase-reflog-action-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2018 12:41:42 +0000 (21:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2018 12:41:42 +0000 (21:41 +0900)
commit945f6bd1ce99b3c3576d52778055086caaed1fb8
tree3e94d96072c62c1110877e5260333c0f02d43eeatree | snapshot
parentd32fa3c6f7f441c7c9f16d0661ce041e6f9a3439commit | diff
parent13a5a9f0fdcf36270dcc2dcb7752c281bbea06f1commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.