diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-04 21:31:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-04 21:31:38 (GMT) |
| commit | 064e0b2d4ca76b0c438545a4d2170e589327e31f (patch) | |
| tree | 2d751fd827c3d62a08b4cd40d9acc5a55ccee553 /merge-recursive.h | |
| parent | 2f743933341f276111103550fbf383a34dfcfd38 (diff) | |
| parent | 4aa5ff9409aece369bf443bcb967db3832b0222c (diff) | |
| download | git-064e0b2d4ca76b0c438545a4d2170e589327e31f.zip git-064e0b2d4ca76b0c438545a4d2170e589327e31f.tar.gz git-064e0b2d4ca76b0c438545a4d2170e589327e31f.tar.bz2 | |
Merge branch 'pw/rebase-i-author-script-fix'
Recent "git rebase -i" update started to write bogusly formatted
author-script, with a matching broken reading code. These are
fixed.
* pw/rebase-i-author-script-fix:
sequencer: fix quoting in write_author_script
sequencer: handle errors from read_author_ident()
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions