Junio C Hamano b51a0fdc38 Merge branch 'pw/clean-sequencer-state-upon-final-commit' ...

"git chery-pick" (and "revert" that shares the same runtime engine)
that deals with multiple commits got confused when the final step
gets stopped with a conflict and the user concluded the sequence
with "git commit".  Attempt to fix it by cleaning up the state
files used by these commands in such a situation.

* pw/clean-sequencer-state-upon-final-commit:
  fix cherry-pick/revert status after commit
  commit/reset: try to clean up sequencer state

2019-05-13 23:50:35 +09:00

..

add.c

add: error appropriately on repository with no commits

2019-04-10 12:52:50 +09:00

am.c

Merge branch 'bc/hash-transition-16'

2019-04-25 16:41:17 +09:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'sg/blame-in-bare-start-at-head'

2019-04-25 16:41:21 +09:00

branch.c

parse_opt_ref_sorting: always use with NONEG flag

2019-03-21 12:03:35 +09:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'nd/checkout-m'

2019-04-25 16:41:14 +09:00

clean.c

…

clone.c

Merge branch 'js/partial-clone-connectivity-check'

2019-05-13 23:50:32 +09:00

column.c

…

commit-graph.c

commit-graph verify: detect inability to read the graph

2019-04-01 12:14:50 +09:00

commit-tree.c

commit-tree: utilize parse-options api

2019-03-08 10:31:24 +09:00

commit.c

Merge branch 'pw/clean-sequencer-state-upon-final-commit'

2019-05-13 23:50:35 +09:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'en/combined-all-paths'

2019-03-07 09:59:54 +09:00

diff.c

Merge branch 'nd/diff-parseopt-4'

2019-04-25 16:41:12 +09:00

difftool.c

Merge branch 'bc/hash-transition-16'

2019-04-25 16:41:17 +09:00

fast-export.c

…

fetch-pack.c

fetch_pack(): drop unused parameters

2019-03-20 18:34:09 +09:00

fetch.c

Merge branch 'jk/no-sigpipe-during-network-transport'

2019-03-20 15:16:06 +09:00

fmt-merge-msg.c

…

for-each-ref.c

parse_opt_ref_sorting: always use with NONEG flag

2019-03-21 12:03:35 +09:00

fsck.c

Merge branch 'jk/fsck-doc'

2019-03-20 15:16:06 +09:00

gc.c

gc: handle & check gc.reflogExpire config

2019-04-01 12:51:51 +09:00

get-tar-commit-id.c

builtin/get-tar-commit-id: make hash size independent

2019-04-01 11:57:39 +09:00

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

index-pack: show progress while checking objects

2019-04-01 18:08:05 +09:00

init-db.c

Merge branch 'js/init-db-update-for-mingw'

2019-04-16 19:28:05 +09:00

interpret-trailers.c

…

log.c

Merge branch 'jk/unused-params-even-more'

2019-04-25 16:41:12 +09:00

ls-files.c

Merge branch 'tg/ls-files-debug-format-fix'

2019-04-25 16:41:20 +09:00

ls-remote.c

parse_opt_ref_sorting: always use with NONEG flag

2019-03-21 12:03:35 +09:00

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

cherry-pick/revert: add scissors line on merge conflict

2019-04-19 12:05:36 +09:00

mktag.c

…

mktree.c

…

multi-pack-index.c

trace2:data: add trace2 data to midx

2019-03-22 14:31:11 +09:00

mv.c

…

name-rev.c

builtin/name-rev: make hash-size independent

2019-04-01 11:57:38 +09:00

notes.c

…

pack-objects.c

Merge branch 'ew/repack-with-bitmaps-by-default'

2019-05-13 23:50:32 +09:00

pack-redundant.c

object-store: rename and expand packed_git's sha1 member

2019-04-01 11:57:38 +09:00

pack-refs.c

…

patch-id.c

…

prune-packed.c

Merge branch 'rj/prune-packed-excess-args'

2019-03-07 09:59:55 +09:00

prune.c

…

pull.c

Merge branch 'dl/merge-cleanup-scissors-fix'

2019-05-09 00:37:24 +09:00

push.c

…

range-diff.c

range-diff: use parse_options() instead of diff_opt_parse()

2019-03-24 22:21:24 +09:00

read-tree.c

read-tree: add --quiet

2019-03-24 21:35:34 +09:00

rebase.c

Merge branch 'pw/rebase-i-internal'

2019-05-13 23:50:34 +09:00

receive-pack.c

Merge branch 'ab/receive-pack-use-after-free-fix'

2019-03-07 09:59:57 +09:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

repack: enable bitmaps by default on bare repos

2019-03-18 14:09:54 +09:00

replace.c

Merge branch 'cc/replace-graft-peel-tags'

2019-05-09 00:37:24 +09:00

rerere.c

…

reset.c

Merge branch 'bp/post-index-change-hook'

2019-04-25 16:41:11 +09:00

rev-list.c

Merge branch 'tb/unexpected'

2019-05-09 00:37:25 +09:00

rev-parse.c

…

revert.c

cherry-pick/revert: add scissors line on merge conflict

2019-04-19 12:05:36 +09:00

rm.c

Use 'unsigned short' for mode, like diff_filespec does

2019-04-08 16:02:07 +09:00

send-pack.c

…

shortlog.c

…

show-branch.c

refs.c: remove the_repo from read_ref_at()

2019-04-08 17:26:33 +09:00

show-index.c

…

show-ref.c

…

stash.c

Merge branch 'jk/unused-params-even-more'

2019-04-25 16:41:12 +09:00

stripspace.c

…

submodule--helper.c

Merge branch 'nd/submodule-foreach-quiet'

2019-04-25 16:41:24 +09:00

symbolic-ref.c

…

tag.c

Merge branch 'dl/merge-cleanup-scissors-fix'

2019-05-09 00:37:24 +09:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'en/merge-directory-renames'

2019-05-09 00:37:22 +09:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'ms/worktree-add-atomic-mkdir'

2019-04-10 02:14:24 +09:00

write-tree.c

…