Junio C Hamano 499231d9f1 Merge branch 'jc/merge-tag-object' into maint ...

"git merge $(git rev-parse v1.8.2)" behaved quite differently from
"git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did
not pay much attention to the annotated tag payload.  Make the code
notice the type of the tag object, in addition to the dwim_ref()
based classification the current code uses (i.e. the name appears in
refs/tags/) to decide when to special case merging of tags.

* jc/merge-tag-object:
  t6200: test message for merging of an annotated tag
  t6200: use test_config/test_unconfig
  merge: a random object may not necssarily be a commit

2013-04-24 16:14:06 -07:00

..

add.c

add: update pathless 'add [-u|-A]' warning to reflect change of plan

2013-03-11 07:57:35 -07:00

annotate.c

…

apply.c

Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint

2013-04-22 11:26:56 -07:00

archive.c

Reduce translations by using same terminologies

2012-08-22 12:02:28 -07:00

bisect--helper.c

i18n: bisect--helper: mark parseopt strings for translation

2012-08-20 12:23:15 -07:00

blame.c

logmsg_reencode: lazily load missing commit buffers

2013-01-26 13:28:22 -08:00

branch.c

Merge branch 'nd/branch-error-cases' into maint

2013-03-26 12:43:05 -07:00

bundle.c

…

cat-file.c

cat-file: Fix an gcc -Wuninitialized warning

2013-03-29 23:47:00 -07:00

check-attr.c

Merge branch 'maint'

2012-09-17 15:59:34 -07:00

check-ignore.c

name-hash: allow hashing an empty string

2013-02-19 14:00:12 -08:00

check-ref-format.c

…

checkout-index.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

checkout.c

checkout: print a message when switching unborn branches

2012-11-15 17:36:26 -08:00

clean.c

Merge branch 'as/check-ignore'

2013-01-23 21:19:10 -08:00

clone.c

Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint

2013-02-25 08:03:27 -08:00

column.c

i18n: column: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

commit-tree.c

Merge branch 'kk/maint-commit-tree'

2012-07-23 20:55:54 -07:00

commit.c

git-commit: only append a newline to -m mesg if necessary

2013-02-19 09:30:50 -08:00

config.c

Merge branch 'cn/config-missing-path' into maint

2012-11-25 18:35:46 -08:00

count-objects.c

i18n: count-objects: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

credential.c

git credential fill: output the whole 'struct credential'

2012-06-25 11:56:24 -07:00

describe.c

Merge branch 'jc/describe' into maint

2013-04-03 09:25:52 -07:00

diff-files.c

…

diff-index.c

update-index/diff-index: use core.preloadindex to improve performance

2012-11-02 11:38:29 -04:00

diff-tree.c

…

diff.c

Merge branch 'kb/preload-index-more'

2012-11-20 10:32:10 -08:00

fast-export.c

Merge branch 'maint-1.8.1' into maint

2013-04-12 11:48:38 -07:00

fetch-pack.c

fetch-pack: avoid repeatedly re-scanning pack directory

2013-01-26 19:37:30 -08:00

fetch.c

Merge branch 'jk/gc-auto-after-fetch'

2013-02-01 12:40:16 -08:00

fmt-merge-msg.c

Merge branch 'mg/gpg-interface-using-status' into maint

2013-04-03 09:26:27 -07:00

for-each-ref.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

fsck.c

i18n: fsck: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

gc.c

silence git gc --auto --quiet output

2012-09-27 17:57:26 -07:00

grep.c

Sync with 1.8.1 maintenance track

2013-04-03 09:18:01 -07:00

hash-object.c

i18n: hash-object: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

help.c

Merge branch 'jk/config-parsing-cleanup'

2013-02-04 10:24:50 -08:00

index-pack.c

Merge branch 'nd/index-pack-threaded-fixes' into maint

2013-04-04 13:00:41 -07:00

init-db.c

i18n: init-db: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

log.c

Merge branch 'ap/log-mailmap'

2013-01-20 17:06:53 -08:00

ls-files.c

Merge branch 'as/check-ignore'

2013-01-23 21:19:10 -08:00

ls-remote.c

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

ls-tree.c

pathspec: save the non-wildcard length part

2012-11-19 13:08:28 -08:00

mailinfo.c

Merge branch 'jc/same-encoding' into maint

2012-12-07 14:10:56 -08:00

mailsplit.c

mailsplit: sort maildir filenames more cleverly

2013-03-02 22:52:44 -08:00

merge-base.c

Merge branch 'jc/merge-bases'

2012-09-11 11:36:05 -07:00

merge-file.c

i18n: merge-file: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

merge-index.c

Which merge_file() function do you mean?

2012-12-09 23:05:27 -08:00

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

merge-tree: fix typo in merge-tree.c::unresolved

2013-03-27 10:00:50 -07:00

merge.c

Merge branch 'jc/merge-tag-object' into maint

2013-04-24 16:14:06 -07:00

mktag.c

…

mktree.c

i18n: mktree: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

mv.c

i18n: mv: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

name-rev.c

i18n: name-rev: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

notes.c

Allow custom "comment char"

2013-01-16 12:48:22 -08:00

pack-objects.c

Merge branch 'jk/peel-ref'

2012-10-25 06:42:27 -04:00

pack-redundant.c

Fix sizeof usage in get_permutations

2012-12-13 11:13:44 -08:00

pack-refs.c

i18n: pack-refs: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

patch-id.c

…

prune-packed.c

i18n: prune-packed: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

prune.c

Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1

2013-04-03 08:43:03 -07:00

push.c

Merge branch 'jc/push-reject-reasons'

2013-02-04 10:25:04 -08:00

read-tree.c

i18n: read-tree: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

receive-pack.c

Merge branch 'jc/hidden-refs'

2013-02-17 15:25:57 -08:00

reflog.c

Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint

2013-03-26 12:39:51 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Fix typo in remote set-head usage

2012-11-26 13:27:45 -08:00

replace.c

replace: parse revision argument for -d

2012-11-13 08:34:14 -05:00

rerere.c

i18n: rerere: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

reset.c

reset: update documentation to require only tree-ish with paths

2013-01-16 12:50:23 -08:00

rev-list.c

Move print_commit_list to libgit.a

2012-10-29 03:08:30 -04:00

rev-parse.c

Merge branch 'maint-1.7.11' into maint

2012-09-12 14:08:05 -07:00

revert.c

cherry-pick/revert: make usage say '<commit-ish>...'

2013-04-24 09:48:01 -07:00

rm.c

Merge branch 'jl/submodule-rm'

2012-11-29 12:52:30 -08:00

send-pack.c

push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

2013-01-24 14:37:23 -08:00

shortlog.c

Merge branch 'ap/log-mailmap'

2013-01-20 17:06:53 -08:00

show-branch.c

show-branch: use strbuf instead of static buffer

2013-04-06 18:57:15 -07:00

show-ref.c

Merge branch 'jk/peel-ref'

2012-10-25 06:42:27 -04:00

stripspace.c

Allow custom "comment char"

2013-01-16 12:48:22 -08:00

symbolic-ref.c

git symbolic-ref --delete $symref

2012-10-21 12:17:38 -07:00

tag.c

Merge branch 'ph/tag-force-no-warn-on-creation' into maint

2013-04-03 09:24:51 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

update-index: allow "-h" to also display options

2013-02-23 23:49:33 -08:00

update-ref.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

update-server-info.c

i18n: update-server-info: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

upload-archive.c

…

var.c

…

verify-pack.c

i18n: verify-pack: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

verify-tag.c

gpg_interface: allow to request status return

2013-02-14 09:30:04 -08:00

write-tree.c

i18n: write-tree: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00