Junio C Hamano 91b3c7ce8e Merge branch 'jc/maint-fetch-alt' ...

* jc/maint-fetch-alt:
  fetch-pack: objects in our alternates are available to us
  refs_from_alternate: helper to use refs from alternates

Conflicts:
	builtin/receive-pack.c

2011-03-22 21:37:53 -07:00

..

add.c

Merge branch 'maint'

2011-03-16 16:59:30 -07:00

annotate.c

…

apply.c

Merge branch 'jc/maint-apply-report-offset'

2011-03-15 14:22:02 -07:00

archive.c

…

bisect--helper.c

…

blame.c

standardize brace placement in struct definitions

2011-03-16 12:49:02 -07:00

branch.c

branch: split off function that writes tracking info and commit subject

2011-03-16 12:52:15 -07:00

bundle.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

cat-file.c

blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

2010-09-29 16:53:25 -07:00

check-attr.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

checkout.c

Merge branch 'jc/checkout-orphan-warning'

2011-03-15 14:22:16 -07:00

clean.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

clone.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

commit-tree.c

Sync with 1.7.3.2

2010-10-21 17:16:10 -07:00

commit.c

Merge branch 'jn/status-translatable'

2011-03-19 23:24:19 -07:00

config.c

Merge branch 'lp/config-vername-check'

2011-02-27 21:58:31 -08:00

count-objects.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

describe.c

for_each_hash: allow passing a 'void *data' pointer to callback

2011-02-18 22:25:51 -08:00

diff-files.c

Convert struct diff_options to use struct pathspec

2011-02-03 12:28:15 -08:00

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'nd/struct-pathspec'

2011-02-27 21:17:36 -08:00

fast-export.c

Merge branch 'mg/placeholders-are-lowercase'

2011-02-27 21:58:30 -08:00

fetch-pack.c

Merge branch 'jc/maint-fetch-alt'

2011-03-22 21:37:53 -07:00

fetch.c

Merge branch 'jk/trace-sifter'

2011-03-19 23:24:12 -07:00

fmt-merge-msg.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

for-each-ref.c

for-each-ref: fix objectname:short bug

2010-08-26 16:42:25 -07:00

fsck.c

fsck: do not give up too early in fsck_dir()

2011-01-27 12:58:15 -08:00

gc.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

grep.c

grep: read patterns from stdin with -f -

2011-03-19 21:46:52 -07:00

hash-object.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

help.c

…

index-pack.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

init-db.c

Name make_*_path functions more accurately

2011-03-17 16:08:30 -07:00

log.c

Merge branch 'mm/maint-log-n-with-diff-filtering'

2011-03-19 23:25:38 -07:00

ls-files.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

ls-remote.c

get_remote_url(): use the same data source as ls-remote to get remote urls

2011-03-02 12:26:53 -08:00

ls-tree.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

mailinfo.c

commit: helper methods to reduce redundant blocks of code

2010-11-04 13:53:34 -07:00

mailsplit.c

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

merge-base.c

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

merge-file.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

merge-index.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-ours.c

…

merge-recursive.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-tree.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge.c

Merge branch 'jk/merge-rename-ux'

2011-03-19 23:23:56 -07:00

mktag.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

mktree.c

…

mv.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

name-rev.c

object.h: Add OBJECT_ARRAY_INIT macro and make use of it.

2010-08-29 22:42:49 -07:00

notes.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

pack-objects.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08:00

pack-redundant.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

pack-refs.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

patch-id.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

prune-packed.c

…

prune.c

add description parameter to OPT__DRY_RUN

2010-11-15 09:57:37 -08:00

push.c

Merge branch 'jk/trace-sifter'

2011-03-19 23:24:12 -07:00

read-tree.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

receive-pack.c

Merge branch 'jc/maint-fetch-alt'

2011-03-22 21:37:53 -07:00

reflog.c

…

remote-ext.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

remote-fd.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

remote.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

replace.c

…

rerere.c

rerere forget: deprecate invocation without pathspec

2011-03-02 12:26:18 -08:00

reset.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

rev-list.c

Merge branch 'jk/maint-rev-list-nul' into maint

2010-11-24 12:46:32 -08:00

rev-parse.c

…

revert.c

Merge branch 'js/cherry-pick-usability'

2011-03-09 15:56:17 -08:00

rm.c

builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

2010-12-19 10:44:06 -08:00

send-pack.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

shortlog.c

parse-options: Don't call parse_options_check() so much

2010-12-06 16:51:36 -08:00

show-branch.c

commit: Add commit_list prefix in two function names.

2010-11-29 14:01:52 -08:00

show-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

stripspace.c

…

symbolic-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

tag.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

tar-tree.c

…

unpack-file.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

unpack-objects.c

do not depend on signed integer overflow

2010-10-06 11:10:07 -07:00

update-index.c

Convert ce_path_match() to use struct pathspec

2011-02-03 14:08:30 -08:00

update-ref.c

…

update-server-info.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

upload-archive.c

…

var.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

2010-12-08 11:24:13 -08:00

write-tree.c

…