projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8ca718 5522bba)
Merge branch 'es/rebase-i-author-script-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:54 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:54 +0000 (13:09 -0700)
commit1bc505b4768e9e48592bebfff35e18c5277412da
tree38f8e86ea0d2a9fab9fa4e65efdf032415d01d5ftree | snapshot
parentf8ca71870a4265320fbbecb4f676d0ad1d4bf176commit | diff
parent5522bbac2059283f7a91fa367fb1eb75faec2f3dcommit | diff
Merge branch 'es/rebase-i-author-script-fix'

The "author-script" file "git rebase -i" creates got broken when
we started to move the command away from shell script, which is
getting fixed now.

* es/rebase-i-author-script-fix:
  sequencer: don't die() on bogus user-edited timestamp
  sequencer: fix "rebase -i --root" corrupting author header timestamp
  sequencer: fix "rebase -i --root" corrupting author header timezone
  sequencer: fix "rebase -i --root" corrupting author header
sequencer.c diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.