Junio C Hamano 57f75f3131 Merge branch 'cn/maint-branch-with-bad' into maint ...

* cn/maint-branch-with-bad:
  branch: don't assume the merge filter ref exists

Conflicts:
	t/t3200-branch.sh

2012-03-04 22:17:52 -08:00

..

add.c

Merge branch 'js/add-e-submodule-fix' into maint

2012-02-13 11:42:18 -08:00

annotate.c

…

apply.c

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'cn/maint-branch-with-bad' into maint

2012-03-04 22:17:52 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jc/checkout-out-of-unborn' into maint

2012-02-16 14:18:06 -08:00

clean.c

…

clone.c

Merge branch 'cb/transfer-no-progress' into maint

2012-02-21 15:14:37 -08:00

commit-tree.c

Merge branch 'jc/show-sig'

2012-01-06 12:44:07 -08:00

commit.c

Merge branch 'jx/i18n-more-marking' into maint

2012-02-16 13:59:53 -08:00

config.c

Merge branch 'jv/maint-config-set' into maint

2011-12-28 12:03:19 -08:00

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

push/fetch/clone --no-progress suppresses progress output

2012-02-13 13:06:53 -08:00

fetch.c

push/fetch/clone --no-progress suppresses progress output

2012-02-13 13:06:53 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'jk/grep-binary-attribute' into maint

2012-02-21 14:57:05 -08:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

Sync with v1.7.8.1

2011-12-21 12:02:44 -08: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 'tr/merge-edit-guidance' into maint

2012-02-27 15:31:50 -08:00

mktag.c

…

mktree.c

…

mv.c

Merge branch 'jk/maint-mv' into maint

2011-12-28 11:32:36 -08:00

name-rev.c

…

notes.c

Merge branch 'nd/war-on-nul-in-commit'

2011-12-22 11:27:26 -08:00

pack-objects.c

Merge branch 'maint'

2012-01-12 23:33:39 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

push/fetch/clone --no-progress suppresses progress output

2012-02-13 13:06:53 -08:00

read-tree.c

…

receive-pack.c

Merge branch 'cb/receive-pack-keep-errors' into maint

2012-02-21 15:14:41 -08:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'pj/remote-set-branches-usage-fix' into maint

2012-02-27 15:33:33 -08:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

rev-list: fix --verify-objects --quiet becoming --objects

2012-02-28 10:47:30 -08:00

rev-parse.c

…

revert.c

Merge branch 'rr/revert-cherry-pick'

2011-12-22 15:30:22 -08:00

rm.c

…

send-pack.c

push/fetch/clone --no-progress suppresses progress output

2012-02-13 13:06:53 -08:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'jk/maint-tag-show-fixes' into maint

2012-02-13 23:31:27 -08: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

…