Junio C Hamano 067fe64355 Merge branch 'dt/merge-recursive-case-insensitive' ...

On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.

* dt/merge-recursive-case-insensitive:
  mv: allow renaming to fix case on case insensitive filesystems
  merge-recursive.c: fix case-changing merge bug

2014-06-06 11:23:13 -07:00

..

add.c

Merge branch 'fr/add-interactive-argv-array'

2014-03-28 13:51:05 -07:00

annotate.c

…

apply.c

Merge branch 'jc/apply-ignore-whitespace'

2014-06-03 12:06:40 -07:00

archive.c

…

bisect--helper.c

…

blame.c

blame: dynamic blame_date_width for different locales

2014-04-23 00:02:15 -07:00

branch.c

…

bundle.c

…

cat-file.c

Merge branch 'jk/warn-on-object-refname-ambiguity'

2014-03-25 11:07:36 -07:00

check-attr.c

Merge branch 'jc/check-attr-honor-working-tree' into maint

2014-03-18 14:03:03 -07:00

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'rs/reflog-exists'

2014-06-06 11:23:04 -07:00

clean.c

Merge branch 'jl/nor-or-nand-and'

2014-04-08 12:00:28 -07:00

clone.c

refs.h: rename the action_on_err constants

2014-04-07 12:09:11 -07:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'

2014-06-06 11:21:47 -07:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

Merge branch 'nd/no-more-fnmatch'

2014-03-14 14:25:31 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

gc.c

Merge branch 'nd/gc-aggressive'

2014-04-03 12:38:47 -07:00

get-tar-commit-id.c

…

grep.c

grep: use run-command's "dir" option for --open-files-in-pager

2014-05-07 10:40:01 -07:00

hash-object.c

…

help.c

…

index-pack.c

Merge branch 'nd/index-pack-one-fd-per-thread'

2014-06-03 12:06:42 -07:00

init-db.c

i18n: only extract comments marked with "TRANSLATORS:"

2014-04-17 11:09:56 -07:00

log.c

comments: fix misuses of "nor"

2014-03-31 15:29:27 -07:00

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

Merge branch 'fc/merge-default-to-upstream'

2014-06-03 12:06:43 -07:00

mktag.c

…

mktree.c

…

mv.c

Merge branch 'dt/merge-recursive-case-insensitive'

2014-06-06 11:23:13 -07:00

name-rev.c

…

notes.c

Merge branch 'mh/ref-transaction'

2014-06-03 12:06:41 -07:00

pack-objects.c

Merge branch 'jk/pack-bitmap'

2014-04-08 12:00:33 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

push.c

…

read-tree.c

…

receive-pack.c

…

reflog.c

refs.c: add new functions reflog_exists and delete_reflog

2014-05-08 14:31:43 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

Merge branch 'jk/repack-pack-keep-objects'

2014-03-18 13:50:29 -07:00

replace.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

rerere.c

rerere: fix for merge.conflictstyle

2014-04-30 10:30:02 -07:00

reset.c

refs.h: rename the action_on_err constants

2014-04-07 12:09:11 -07:00

rev-list.c

…

rev-parse.c

rev-parse --parseopt: option argument name hints

2014-03-23 17:28:03 -07:00

revert.c

parse-options: multi-word argh should use dash to separate words

2014-03-24 10:43:34 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'tg/tag-state-tag-name-in-editor-hints'

2014-06-06 11:22:25 -07:00

unpack-file.c

…

unpack-objects.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

update-index.c

update-index: teach --cacheinfo a new syntax "mode,sha1,path"

2014-03-24 10:43:35 -07:00

update-ref.c

update-ref --stdin: reimplement using reference transactions

2014-04-07 12:09:14 -07:00

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…