Junio C Hamano 39e415cfd1 Merge branch 'nd/cherry-pick-quit-fix' ...

"git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even
though we won't be in a cherry-pick session after it returns, which
has been corrected.

* nd/cherry-pick-quit-fix:
  cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

2018-08-20 12:41:34 -07:00

..

add.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

am.c

apply.c: make init_apply_state() take a struct repository

2018-08-13 14:14:44 -07:00

annotate.c

…

apply.c

apply.c: make init_apply_state() take a struct repository

2018-08-13 14:14:44 -07:00

archive.c

archive.c: avoid access to the_index

2018-08-13 14:14:43 -07:00

bisect--helper.c

…

blame.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

branch.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

bundle.c

…

cat-file.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

check-attr.c

attr: remove index from git_attr_set_direction()

2018-08-13 14:14:43 -07:00

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

entry.c: use the right index instead of the_index

2018-08-13 14:14:43 -07:00

checkout.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

clean.c

dir.c: remove an implicit dependency on the_index in pathspec code

2018-08-13 14:14:42 -07:00

clone.c

Merge branch 'jt/connectivity-check-after-unshallow'

2018-08-15 15:08:28 -07:00

column.c

…

commit-graph.c

commit-graph: add free_commit_graph

2018-07-17 15:47:48 -07:00

commit-tree.c

…

commit.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

config.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

diff.c: move read_index() code back to the caller

2018-08-13 14:14:42 -07:00

diff.c

…

difftool.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

fast-export.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'jt/connectivity-check-after-unshallow'

2018-08-15 15:08:28 -07:00

fmt-merge-msg.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

for-each-ref.c

…

fsck.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

gc.c

Merge branch 'kg/gc-auto-windows-workaround'

2018-08-02 15:30:43 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

hash-object.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

help.c

…

index-pack.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

init-db.c

pass st.st_size as hint for strbuf_readlink()

2018-07-24 10:19:29 -07:00

interpret-trailers.c

…

log.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

ls-files.c

ls-files: correct index argument to get_convert_attr_ascii()

2018-08-13 14:14:43 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

builtin/merge-recursive: make hash independent

2018-07-16 14:27:39 -07:00

merge-tree.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

merge.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

pack-objects.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

for_each_*_object: move declarations to object-store.h

2018-08-14 12:29:57 -07:00

prune.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

pull.c

Merge branch 'js/pull-rebase-type-shorthand'

2018-08-17 13:09:59 -07:00

push.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

range-diff.c

range-diff: make --dual-color the default mode

2018-08-13 10:44:52 -07:00

read-tree.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

rebase--helper.c

…

receive-pack.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

reflog.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'rs/remote-mv-leakfix'

2018-08-15 15:08:28 -07:00

repack.c

Merge branch 'jt/repack-promisor-packs'

2018-08-20 12:40:31 -07:00

replace.c

Merge branch 'nd/i18n'

2018-08-15 15:08:23 -07:00

rerere.c

…

reset.c

Merge branch 'jm/cache-entry-from-mem-pool'

2018-08-02 15:30:43 -07:00

rev-list.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

rev-parse.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

revert.c

Merge branch 'nd/cherry-pick-quit-fix'

2018-08-20 12:41:34 -07:00

rm.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

send-pack.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

serve.c

…

shortlog.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

show-branch.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00

show-index.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

Merge branch 'sb/submodule-cleanup'

2018-08-20 12:41:33 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

unpack-file.c

…

unpack-objects.c

Merge branch 'jk/core-use-replace-refs'

2018-08-15 15:08:23 -07:00

update-index.c

Merge branch 'nd/no-the-index'

2018-08-20 11:33:53 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

archive.c: avoid access to the_index

2018-08-13 14:14:43 -07:00

upload-pack.c

check_replace_refs: rename to read_replace_refs

2018-07-18 15:45:14 -07:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

Merge branch 'rs/parse-opt-lithelp'

2018-08-17 13:09:56 -07:00