Junio C Hamano 307ddf6cbb Merge branch 'jk/config-include' into next ...

* jk/config-include:
  config: add include directive
  docs: add a basic description of the config API

2012-02-13 11:53:24 -08:00

..

add.c

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

2012-02-08 20:45:57 -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

drop odd return value semantics from userdiff_config

2012-02-07 10:44:54 -08:00

branch.c

branch --edit-description: protect against mistyped branch name

2012-02-05 17:28:03 -08:00

bundle.c

…

cat-file.c

drop odd return value semantics from userdiff_config

2012-02-07 10:44:54 -08:00

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

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

2012-02-07 13:05:15 -08:00

clean.c

…

clone.c

Merge branch 'jk/git-dir-lookup' into next

2012-02-05 18:16:11 -08:00

commit-tree.c

Merge branch 'jc/show-sig'

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

commit.c

Merge branch 'nd/cache-tree-api-refactor' into next

2012-02-08 20:05:06 -08:00

config.c

config: add include directive

2012-02-06 14:39:48 -08:00

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 'nd/maint-refname-in-hierarchy-check'

2012-01-29 13:18:51 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'jk/userdiff-config-simplify' into next

2012-02-10 14:23:52 -08:00

hash-object.c

…

help.c

…

index-pack.c

index-pack: eliminate unlimited recursion in get_base_data()

2012-01-16 14:34:33 -08:00

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

mailinfo: with -b, keep space after [foo]

2012-01-16 16:06:57 -08:00

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'jn/merge-no-edit-fix' into next

2012-02-10 14:23:52 -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

pack-objects: convert to use parse_options()

2012-02-01 13:05:00 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

clone: fix up delay cloning conditions

2012-01-24 10:05:15 -08:00

read-tree.c

…

receive-pack.c

Merge branch 'cb/push-quiet'

2012-01-29 13:18:50 -08:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'nd/maint-refname-in-hierarchy-check'

2012-01-29 13:18:51 -08:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'jc/advise-i18n'

2012-01-31 22:01:14 -08:00

rm.c

…

send-pack.c

fix push --quiet: add 'quiet' capability to receive-pack

2012-01-08 14:27:28 -08:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'tg/tag-points-at' into next

2012-02-13 11:53:23 -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

…