Junio C Hamano 7a35a9f65e Merge branch 'master' into next ...

* master:
  do not let git_path clobber errno when reporting errors

Conflicts:
	builtin/merge.c

2011-11-17 23:16:47 -08:00

..

add.c

…

annotate.c

…

apply.c

Merge branch 'ab/clang-lints' into next

2011-11-13 19:37:37 -08:00

archive.c

Revert "upload-archive: use start_command instead of fork"

2011-11-15 15:39:33 -08:00

bisect--helper.c

…

blame.c

Merge branch 'ss/blame-textconv-fake-working-tree'

2011-11-07 16:43:19 -08:00

branch.c

Merge branch 'master' into next

2011-11-03 14:34:12 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

Merge branch 'bc/attr-ignore-case'

2011-10-17 21:37:14 -07:00

check-ref-format.c

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

checkout-index.c

…

checkout.c

Merge branch 'jk/argv-array' into maint

2011-10-26 16:13:31 -07:00

clean.c

…

clone.c

clone: Quote user supplied path in a single quote pair

2011-10-27 12:02:02 -07:00

commit-tree.c

commit-tree: teach -m/-F options to read logs from elsewhere

2011-11-12 22:25:07 -08:00

commit.c

commit: teach --amend to carry forward extra headers

2011-11-09 22:27:11 -08:00

config.c

Merge branch 'mm/maint-config-explicit-bool-display' into maint

2011-10-21 10:49:24 -07:00

count-objects.c

…

describe.c

describe: Refresh the index when run with --dirty

2011-09-23 14:28:17 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

cast variable in call to free() in builtin/diff.c and submodule.c

2011-11-06 10:43:18 -08:00

fast-export.c

…

fetch-pack.c

Merge branch 'mh/check-ref-format-3'

2011-10-10 15:56:18 -07:00

fetch.c

Merge branch 'jc/pull-signed-tag' into next

2011-11-14 16:14:15 -08:00

fmt-merge-msg.c

Merge branch 'jc/pull-signed-tag' into next

2011-11-14 16:14:15 -08:00

for-each-ref.c

…

fsck.c

fsck: print progress

2011-11-06 20:31:28 -08:00

gc.c

prune: handle --progress/no-progress

2011-11-07 22:12:19 -08:00

grep.c

Merge branch 'nd/misc-cleanups' into next

2011-10-28 09:53:18 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

builtin/log.c: Fix an "Using plain integer as NULL pointer" warning

2011-10-09 12:53:04 -07:00

ls-files.c

Merge branch 'cb/common-prefix-unification'

2011-10-10 15:56:17 -07:00

ls-remote.c

Merge branch 'jc/ls-remote-short-help'

2011-10-05 12:36:26 -07:00

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 'master' into next

2011-11-17 23:16:47 -08:00

mktag.c

…

mktree.c

Merge "Move 'builtin-*' into a 'builtin/' subdirectory"

2011-11-10 09:10:51 -08:00

mv.c

builtin/mv.c: plug miniscule memory leak

2011-10-06 13:54:32 -07:00

name-rev.c

name-rev: split usage string

2011-10-03 11:55:57 -07:00

notes.c

…

pack-objects.c

Merge branch 'dm/pack-objects-update'

2011-11-01 15:20:07 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

prune: handle --progress/no-progress

2011-11-07 22:12:19 -08:00

push.c

…

read-tree.c

…

receive-pack.c

receive-pack: do not expect object 0{40} to exist

2011-11-03 14:27:04 -07:00

reflog.c

prune: show progress while marking reachable objects

2011-11-07 22:12:19 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'jc/remote-setbranches-usage-fix'

2011-11-08 16:40:31 -08:00

replace.c

Change check_ref_format() to take a flags argument

2011-10-05 13:45:29 -07:00

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'master' into next

2011-11-17 23:16:47 -08:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

Change check_ref_format() to take a flags argument

2011-10-05 13:45:29 -07:00

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'jc/signed-commit' into next

2011-11-08 16:16:36 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

Revert "upload-archive: use start_command instead of fork"

2011-11-15 15:39:33 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

Revert the previous "signed commit" attempt

2011-11-08 16:05:43 -08:00

write-tree.c

…