Junio C Hamano 424f30a5ae Merge branch 'nd/ignore-might-be-precious' ...

* nd/ignore-might-be-precious:
  checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore

2011-12-13 22:55:07 -08:00

..

add.c

…

annotate.c

…

apply.c

Merge branch 'maint-1.7.7' into maint

2011-12-13 21:58:51 -08:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'maint-1.7.7' into maint

2011-12-13 21:58:51 -08:00

branch.c

Merge branch 'jn/branch-move-to-self'

2011-12-13 22:53:08 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'nd/ignore-might-be-precious'

2011-12-13 22:55:07 -08:00

clean.c

…

clone.c

…

commit-tree.c

…

commit.c

…

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

Merge branch 'maint'

2011-12-13 22:18:00 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'nd/misc-cleanups' into maint

2011-12-13 22:02:51 -08:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.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

Merge branch 'nd/ignore-might-be-precious'

2011-12-13 22:55:07 -08:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

Merge branch 'jc/maint-pack-object-cycle' into maint

2011-12-13 22:04:50 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.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

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…