Junio C Hamano 843d94b3cd Merge branch 'ew/empty-merge-with-dirty-index' ...

"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge

2018-01-05 13:28:09 -08:00

..

add.c

…

am.c

Merge branch 'ew/empty-merge-with-dirty-index'

2018-01-05 13:28:09 -08:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

…

column.c

…

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

…

difftool.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

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

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

…

push.c

…

read-tree.c

…

rebase--helper.c

…

receive-pack.c

…

reflog.c

…

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-ref.c

…

stripspace.c

…

submodule--helper.c

…

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

…