Junio C Hamano 00723b0291 Merge branch 'nm/grep-object-sha1-lock' ...

* nm/grep-object-sha1-lock:
  grep: Fix race condition in delta_base_cache

Conflicts:
	builtin/grep.c

2011-10-05 12:35:53 -07:00

..

add.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'ci/forbid-unwanted-current-branch-update'

2011-09-16 21:48:10 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'ci/forbid-unwanted-current-branch-update'

2011-09-16 21:48:10 -07:00

clean.c

Documentation: clarify "git clean -e <pattern>"

2011-08-28 23:47:55 -07:00

clone.c

Merge branch 'nd/maint-clone-gitdir'

2011-08-28 21:20:28 -07:00

commit-tree.c

…

commit.c

Merge branch 'jk/color-and-pager'

2011-08-28 21:19:16 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

Merge branch 'nd/decorate-grafts'

2011-08-28 21:22:58 -07:00

fetch.c

fetch: skip on-demand checking when no submodules are configured

2011-09-09 13:59:20 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'nm/grep-object-sha1-lock'

2011-10-05 12:35:53 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

format-patch: ignore ui.color

2011-09-12 11:43:58 -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 'jk/color-and-pager'

2011-08-28 21:19:16 -07:00

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

…

push.c

…

read-tree.c

…

receive-pack.c

Sync with 1.7.6.2

2011-09-06 11:42:12 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

replace.c

…

rerere.c

…

reset.c

Merge branch 'jk/reset-reflog-message-fix' into maint

2011-09-11 22:33:20 -07:00

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'jn/plug-empty-tree-leak'

2011-08-25 16:00:29 -07:00

rm.c

…

send-pack.c

Revert "Merge branch 'cb/maint-quiet-push' into maint"

2011-09-06 11:10:41 -07:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'jk/tag-contains-ab' (early part) into maint

2011-09-11 21:54:32 -07:00

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

…