summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:23 +0900
commit6b2a52431b238fc3c25ea931def6e5b1cf9e78fb (patch)
treebda721edc23a6a3cd7bfb960aecc5dabfafeb7f2 /apply.c
parentMerge branch 'jc/war-on-string-list' (diff)
parentsequencer: use read_author_script() (diff)
downloadtgif-6b2a52431b238fc3c25ea931def6e5b1cf9e78fb.tar.xz
Merge branch 'pw/am-rebase-read-author-script'
Unify code to read the author-script used in "git am" and the commands that use the sequencer machinery, e.g. "git rebase -i". * pw/am-rebase-read-author-script: sequencer: use read_author_script() add read_author_script() to libgit am: rename read_author_script() am: improve author-script error reporting am: don't die in read_author_script()
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions