Junio C Hamano 9d1eff66d2 Merge branch 'bw/union-merge-refactor' (early part) into next ...

* 'bw/union-merge-refactor' (early part):
  refactor merge flags into xmparam_t
  make union merge an xdl merge favor

2010-03-07 12:50:11 -08:00

..

add.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

clean.c

…

clone.c

Merge branch 'tc/transport-verbosity' into next

2010-03-07 12:50:10 -08:00

commit-tree.c

…

commit.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08: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

…

fetch.c

Merge branch 'tc/transport-verbosity' into next

2010-03-07 12:50:10 -08:00

fmt-merge-msg.c

…

for-each-ref.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

fsck.c

…

gc.c

…

grep.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

hash-object.c

Merge branch 'master' into next

2010-03-07 00:02:24 -08:00

help.c

…

index-pack.c

…

init-db.c

Merge branch 'sd/init-template' into next

2010-03-02 13:21:48 -08:00

log.c

Merge branch 'sd/format-patch-to' into next

2010-03-07 12:50:10 -08:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

mailsplit.c

Merge branch 'sh/am-keep-cr' into next

2010-03-02 13:21:48 -08:00

merge-base.c

…

merge-file.c

Merge branch 'bw/union-merge-refactor' (early part) into next

2010-03-07 12:50:11 -08:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

pack-objects.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'as/maint-expire' into next

2010-03-02 13:21:48 -08:00

push.c

Merge branch 'tc/transport-verbosity' into next

2010-03-07 12:50:10 -08:00

read-tree.c

…

receive-pack.c

…

reflog.c

Merge branch 'as/maint-expire' into next

2010-03-02 13:21:48 -08:00

remote.c

…

replace.c

…

rerere.c

…

reset.c

Merge branch 'cc/reset-keep' into next

2010-03-07 12:50:09 -08:00

rev-list.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

rev-parse.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

revert.c

…

rm.c

…

send-pack.c

Merge branch 'ld/push-porcelain' into next

2010-03-02 13:21:47 -08:00

shortlog.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

show-branch.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

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

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

verify-pack.c

…

verify-tag.c

…

write-tree.c

…