Junio C Hamano be2dab9c80 Merge branch 'ct/mv-unmerged-path-error' into master ...

"git mv src dst", when src is an unmerged path, errored out
correctly but with an incorrect error message to claim that src is
not tracked, which has been clarified.

* ct/mv-unmerged-path-error:
  git-mv: improve error message for conflicted file

2020-07-30 13:20:35 -07:00

..

add.c

…

am.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

bisect: treat BISECT_HEAD as a pseudo ref

2020-07-10 13:53:37 -07:00

blame.c

…

branch.c

Merge branch 'es/get-worktrees-unsort'

2020-07-06 22:09:15 -07:00

bundle.c

…

cat-file.c

Merge branch 'cc/cat-file-usage-update' into master

2020-07-09 14:00:41 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

Merge branch 'bw/fail-cloning-into-non-empty' into master

2020-07-30 13:20:32 -07:00

column.c

…

commit-graph.c

Merge branch 'ds/commit-graph-bloom-updates' into master

2020-07-30 13:20:31 -07:00

commit-tree.c

…

commit.c

…

config.c

…

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'ct/diff-with-merge-base-clarification' into master

2020-07-09 14:00:43 -07:00

difftool.c

…

env--helper.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

Merge branch 'es/get-worktrees-unsort'

2020-07-06 22:09:15 -07:00

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

…

ls-files.c

…

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

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

git-mv: improve error message for conflicted file

2020-07-20 14:35:43 -07:00

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'cb/is-descendant-of'

2020-07-06 22:09:16 -07:00

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

…

receive-pack.c

Merge branch 'bc/sha-256-part-2'

2020-07-06 22:09:13 -07:00

reflog.c

Merge branch 'es/get-worktrees-unsort'

2020-07-06 22:09:15 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

sparse-checkout.c

…

stash.c

…

stripspace.c

…

submodule--helper.c

Merge branch 'js/default-branch-name'

2020-07-06 22:09:17 -07:00

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

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 'es/get-worktrees-unsort'

2020-07-06 22:09:15 -07:00

write-tree.c

…