Junio C Hamano a95750c4e8 Merge branch 'jk/maint-tag-show-fixes' into maint ...

* jk/maint-tag-show-fixes:
  tag: do not show non-tag contents with "-n"
  tag: die when listing missing or corrupt objects
  tag: fix output of "tag -n" when errors occur

Conflicts:
	t/t7004-tag.sh

2012-02-13 23:31:27 -08:00

..

add.c

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

2012-02-13 11:42:18 -08:00

annotate.c

…

apply.c

Merge branch 'bc/maint-apply-check-no-patch' into maint

2011-12-21 11:42:45 -08:00

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

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

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

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jc/checkout-m-twoway' into maint

2011-12-28 11:44:54 -08:00

clean.c

…

clone.c

clone: the -o option has nothing to do with <branch>

2011-12-21 11:26:30 -08:00

commit-tree.c

Merge branch 'jc/show-sig'

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

commit.c

Merge branch 'jc/parse-date-raw' into maint

2012-02-13 11:42:15 -08:00

config.c

Merge branch 'jv/maint-config-set' into maint

2011-12-28 12:03:19 -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

write first for-merge ref to FETCH_HEAD first

2012-01-03 16:13:14 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

grep: fix -l/-L interaction with decoration lines

2012-01-23 10:49:34 -08:00

hash-object.c

…

help.c

…

index-pack.c

Appease Sun Studio by renaming "tmpfile"

2011-12-21 10:21:04 -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

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

merge: do not launch an editor on "--no-edit $tag"

2012-02-09 13:30: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

Merge branch 'maint'

2012-01-12 23:33:39 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

…

receive-pack.c

Merge branch 'cb/push-quiet' into maint

2012-02-05 23:58:42 -08:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'rr/revert-cherry-pick'

2011-12-22 15:30:22 -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 'jk/maint-tag-show-fixes' into maint

2012-02-13 23:31:27 -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

…