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

Revert "upload-archive: use start_command instead of fork"

2011-11-15 15:39:33 -08:00

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

Teach progress eye-candy to fetch_refs_from_bundle()

2011-09-19 11:07:21 -07:00

cat-file.c

…

check-attr.c

Merge branch 'bc/attr-ignore-case'

2011-10-17 21:37:14 -07:00

check-ref-format.c

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

checkout-index.c

…

checkout.c

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

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

clean.c

…

clone.c

clone: Quote user supplied path in a single quote pair

2011-10-27 12:02:02 -07:00

commit-tree.c

commit-tree: teach -m/-F options to read logs from elsewhere

2011-11-12 22:25:07 -08:00

commit.c

Merge branch 'nd/resolve-ref'

2011-12-09 13:37:14 -08:00

config.c

Merge branch 'mm/maint-config-explicit-bool-display' into maint

2011-10-21 10:49:24 -07:00

count-objects.c

…

describe.c

describe: Refresh the index when run with --dirty

2011-09-23 14:28:17 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

cast variable in call to free() in builtin/diff.c and submodule.c

2011-11-06 10:43:18 -08:00

fast-export.c

…

fetch-pack.c

Merge branch 'mh/check-ref-format-3'

2011-10-10 15:56:18 -07:00

fetch.c

Merge branch 'maint'

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

fmt-merge-msg.c

Merge branch 'nd/resolve-ref'

2011-12-09 13:37:14 -08:00

for-each-ref.c

…

fsck.c

fsck: print progress

2011-11-06 20:31:28 -08:00

gc.c

prune: handle --progress/no-progress

2011-11-07 22:12:19 -08:00

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

receive-pack, fetch-pack: reject bogus pack that records objects twice

2011-11-16 22:05:21 -08:00

init-db.c

…

log.c

builtin/log.c: Fix an "Using plain integer as NULL pointer" warning

2011-10-09 12:53:04 -07:00

ls-files.c

Merge branch 'cb/common-prefix-unification'

2011-10-10 15:56:17 -07:00

ls-remote.c

Merge branch 'jc/ls-remote-short-help'

2011-10-05 12:36:26 -07:00

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

Merge "Move 'builtin-*' into a 'builtin/' subdirectory"

2011-11-10 09:10:51 -08:00

mv.c

builtin/mv.c: plug miniscule memory leak

2011-10-06 13:54:32 -07:00

name-rev.c

Merge branch 'jc/maint-name-rev-all' into maint-1.7.6

2011-12-13 21:12:34 -08:00

notes.c

Copy resolve_ref() return value for longer use

2011-12-05 16:21:06 -08:00

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

patch-id.c: use strbuf instead of a fixed buffer

2011-09-22 09:35:07 -07:00

prune-packed.c

…

prune.c

prune: handle --progress/no-progress

2011-11-07 22:12:19 -08:00

push.c

…

read-tree.c

…

receive-pack.c

Copy resolve_ref() return value for longer use

2011-12-05 16:21:06 -08:00

reflog.c

prune: show progress while marking reachable objects

2011-11-07 22:12:19 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Convert many resolve_ref() calls to read_ref*() and ref_exists()

2011-11-13 12:21:06 -08:00

replace.c

Convert many resolve_ref() calls to read_ref*() and ref_exists()

2011-11-13 12:21:06 -08:00

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

revert --abort: do not leave behind useless sequencer-old directory

2011-11-23 10:56:29 -08:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

Convert many resolve_ref() calls to read_ref*() and ref_exists()

2011-11-13 12:21:06 -08:00

stripspace.c

stripspace: fix outdated comment

2011-12-05 15:04:38 -08:00

symbolic-ref.c

…

tag.c

Merge branch 'nd/resolve-ref'

2011-12-09 13:37:14 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

Revert "upload-archive: use start_command instead of fork"

2011-11-15 15:39:33 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

Split GPG interface into its own helper library

2011-11-04 21:40:25 -07:00

write-tree.c

…