Junio C Hamano 56bfacef79 Merge branch 'tr/receive-pack-aliased-update-fix' into maint ...

* tr/receive-pack-aliased-update-fix:
  check_aliased_update: strcpy() instead of strcat() to copy
  receive-pack: detect aliased updates which can occur with symrefs
  receive-pack: switch global variable 'commands' to a parameter

Conflicts:
	t/t5516-fetch-push.sh

2010-07-07 10:25:15 -07:00

..

add.c

…

annotate.c

…

apply.c

Merge branch 'pc/remove-warn' into maint

2010-06-22 08:30:38 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21 05:38:50 -07:00

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

checkout -m --conflict=diff3: add a label for ancestor

2010-03-20 20:36:11 -07:00

clean.c

…

clone.c

clone: reword messages to match the end-user perception

2010-05-09 15:18:10 -07:00

commit-tree.c

…

commit.c

Merge branch 'cc/maint-commit-reflog-msg' into maint

2010-06-22 09:31:48 -07:00

config.c

…

count-objects.c

…

describe.c

Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint

2010-06-16 16:21:15 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'pb/log-first-parent-p-m'

2010-03-24 16:25:39 -07:00

diff.c

…

fast-export.c

Merge branch 'maint'

2010-03-28 17:42:58 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'maint'

2010-04-09 22:43:18 -07:00

fmt-merge-msg.c

merge: --log appends shortlog to message if specified

2010-05-10 12:02:20 -07:00

for-each-ref.c

Change C99 comments to old-style C comments

2010-06-07 15:50:21 -07:00

fsck.c

…

gc.c

…

grep.c

Merge branch 'np/malloc-threading' into maint

2010-06-16 16:21:06 -07:00

hash-object.c

…

help.c

…

index-pack.c

Merge branch 'np/index-pack-memsave' into maint

2010-06-16 16:22:23 -07:00

init-db.c

handle "git --bare init <dir>" properly

2010-05-10 11:25:37 -07:00

log.c

pretty: Initialize notes if %N is used

2010-04-13 18:15:08 -07:00

ls-files.c

ls-files: allow relative pathspec

2010-06-05 09:14:31 -07:00

ls-remote.c

…

ls-tree.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

mailinfo.c

Teach mailinfo %< as an alternative scissors mark

2010-04-04 10:17:55 -07:00

mailsplit.c

…

merge-base.c

…

merge-file.c

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21 05:38:50 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21 05:38:50 -07:00

merge.c

merge: --log appends shortlog to message if specified

2010-05-10 12:02:20 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

notes: check number of parameters to "git notes copy"

2010-06-28 09:15:15 -07:00

pack-objects.c

Merge branch 'np/malloc-threading' into maint

2010-06-16 16:21:06 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

Merge branch 'maint'

2010-04-09 22:43:18 -07:00

read-tree.c

…

receive-pack.c

Merge branch 'tr/receive-pack-aliased-update-fix' into maint

2010-07-07 10:25:15 -07:00

reflog.c

Merge branch 'maint'

2010-04-19 22:41:30 -07:00

remote.c

…

replace.c

…

rerere.c

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21 05:38:50 -07:00

reset.c

Sync with 1.7.0.4

2010-03-31 15:14:27 -07:00

rev-list.c

Merge branch 'ef/maint-empty-commit-log'

2010-04-06 14:50:46 -07:00

rev-parse.c

…

revert.c

cherry-pick: do not dump core when iconv fails

2010-05-08 16:56:21 -07:00

rm.c

…

send-pack.c

…

shortlog.c

Merge branch 'jn/shortlog' into maint

2010-06-16 16:22:51 -07:00

show-branch.c

show-branch: use DEFAULT_ABBREV instead of 7

2010-05-25 09:48:49 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

tag -v: use RUN_GIT_CMD to run verify-tag

2010-04-17 12:40:19 -07: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

…