Junio C Hamano 6b2a52431b 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()

2018-11-13 22:37:23 +09:00

..

add.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

am.c

Merge branch 'pw/am-rebase-read-author-script'

2018-11-13 22:37:23 +09:00

annotate.c

…

apply.c

…

archive.c

archive: initialize archivers earlier

2018-10-26 10:17:59 +09:00

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'tq/branch-style-fix'

2018-10-30 15:43:43 +09:00

bundle.c

…

cat-file.c

Merge branch 'jk/detect-truncated-zlib-input'

2018-11-13 22:37:17 +09:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

clean.c

…

clone.c

…

column.c

…

commit-graph.c

Merge branch 'ds/commit-graph-leakfix'

2018-10-19 13:34:07 +09:00

commit-tree.c

…

commit.c

Merge branch 'nd/status-refresh-progress'

2018-10-19 13:34:03 +09:00

config.c

worktree: add per-worktree config files

2018-10-22 13:17:04 +09:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

difftool.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

fast-export.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

fetch-pack.c

builtin/fetch-pack: remove constants with parse_oid_hex

2018-10-15 12:53:15 +09:00

fetch.c

Merge branch 'jc/war-on-string-list'

2018-11-13 22:37:23 +09:00

fmt-merge-msg.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

for-each-ref.c

…

fsck.c

…

gc.c

Merge branch 'jn/gc-auto'

2018-10-16 16:16:02 +09:00

get-tar-commit-id.c

…

grep.c

Merge branch 'ao/submodule-wo-gitmodules-checked-out'

2018-11-13 22:37:22 +09:00

hash-object.c

…

help.c

Merge branch 'rv/alias-help'

2018-10-26 14:22:13 +09:00

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

ls-files.c

…

ls-remote.c

Merge branch 'jk/proto-v2-ref-prefix-fix'

2018-11-13 22:37:17 +09:00

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

Merge branch 'pk/rebase-in-c-4-opts'

2018-11-02 11:04:55 +09:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

merge.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

mktag.c

…

mktree.c

builtin/mktree: remove hard-coded constant

2018-10-15 12:53:15 +09:00

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

Merge branch 'md/exclude-promisor-objects-fix'

2018-11-06 15:50:21 +09:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'md/exclude-promisor-objects-fix'

2018-11-06 15:50:21 +09:00

pull.c

submodule.c: remove some of the_repository references

2018-10-22 11:55:33 +09:00

push.c

…

range-diff.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

read-tree.c

…

rebase--interactive.c

rebase -i: move rebase--helper modes to rebase--interactive

2018-10-09 10:44:10 +09:00

rebase.c

rebase: apply cocci patch

2018-11-02 11:04:59 +09:00

receive-pack.c

Merge branch 'jc/receive-deny-current-branch-fix'

2018-10-30 15:43:46 +09:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

Merge branch 'ds/test-multi-pack-index'

2018-11-13 22:37:19 +09:00

replace.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

rerere.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

reset.c

reset: warn when refresh_index() takes more than 2 seconds

2018-10-24 11:57:08 +09:00

rev-list.c

Merge branch 'md/exclude-promisor-objects-fix'

2018-11-06 15:50:21 +09:00

rev-parse.c

Merge branch 'ag/rev-parse-all-exclude-fix'

2018-11-13 22:37:23 +09:00

revert.c

…

rm.c

…

send-pack.c

…

serve.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

Merge branch 'ao/submodule-wo-gitmodules-checked-out'

2018-11-13 22:37:22 +09:00

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'nd/the-index'

2018-10-19 13:34:02 +09:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

archive: initialize archivers earlier

2018-10-26 10:17:59 +09:00

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

worktree: rename is_worktree_locked to worktree_lock_reason

2018-10-31 11:41:47 +09:00

write-tree.c

…