Junio C Hamano b37f81b7b6 Merge branch 'jh/note-trees-record-blobs' ...

"git notes -C <blob>" should not take an object that is not a blob.

* jh/note-trees-record-blobs:
  notes: disallow reusing non-blob as a note object

2014-03-14 14:25:39 -07:00

..

add.c

Merge branch 'jc/add-2.0-ignore-removal'

2014-03-07 15:14:47 -08:00

annotate.c

…

apply.c

Merge branch 'nd/no-more-fnmatch'

2014-03-14 14:25:31 -07:00

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

…

blame.c

Merge branch 'dk/blame-janitorial'

2014-02-27 14:01:46 -08:00

branch.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/oi-delta-base'

2014-01-10 10:33:11 -08:00

check-attr.c

Merge branch 'jc/check-attr-honor-working-tree'

2014-03-14 14:06:00 -07:00

check-ignore.c

Merge branch 'dw/check-ignore-sans-index'

2013-09-20 12:37:32 -07:00

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'nd/lift-path-max'

2013-10-30 12:10:56 -07:00

checkout.c

pathspec: convert some match_pathspec_depth() to ce_path_match()

2014-02-24 14:36:52 -08:00

clean.c

Merge branch 'ep/varscope'

2014-02-27 14:01:30 -08:00

clone.c

Merge branch 'nd/transport-positive-depth-only' into maint

2014-02-05 13:58:52 -08:00

column.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

commit-tree.c

commit-tree: add and document --no-gpg-sign

2014-02-24 14:51:35 -08:00

commit.c

Merge branch 'ep/varscope'

2014-02-27 14:01:30 -08:00

config.c

config: teach "git config --file -" to read from the standard input

2014-02-18 16:12:14 -08:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'nd/no-more-fnmatch'

2014-03-14 14:25:31 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'tg/diff-no-index-refactor'

2013-12-27 14:58:17 -08:00

fast-export.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

fetch-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

fetch.c

Merge branch 'ep/varscope'

2014-02-27 14:01:30 -08:00

fmt-merge-msg.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

for-each-ref.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

fsck.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

gc.c

Merge branch 'nd/daemonize-gc'

2014-03-05 15:06:39 -08:00

get-tar-commit-id.c

stop installing git-tar-tree link

2013-12-03 12:35:22 -08:00

grep.c

pathspec: convert some match_pathspec_depth() to dir_path_match()

2014-02-24 14:37:09 -08:00

hash-object.c

…

help.c

builtin/help.c: speed up is_git_command() by checking for builtin commands first

2014-01-06 11:26:31 -08:00

index-pack.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

init-db.c

Merge branch 'mh/safe-create-leading-directories'

2014-01-27 10:45:33 -08:00

log.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

ls-files.c

pathspec: pass directory indicator to match_pathspec_item()

2014-02-24 14:37:19 -08:00

ls-remote.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

ls-tree.c

pathspec: rename match_pathspec_depth() to match_pathspec()

2014-02-24 14:37:14 -08:00

mailinfo.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

mailsplit.c

…

merge-base.c

Merge branch 'bm/merge-base-octopus-dedup' into maint

2014-02-13 13:38:59 -08:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

merge-tree.c

…

merge.c

Merge branch 'nv/commit-gpgsign-config'

2014-02-27 14:01:03 -08:00

mktag.c

…

mktree.c

…

mv.c

builtin/mv: don't use memory after free

2014-02-18 15:51:56 -08:00

name-rev.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

notes.c

Merge branch 'jh/note-trees-record-blobs'

2014-03-14 14:25:39 -07:00

pack-objects.c

Merge branch 'jk/pack-bitmap'

2014-02-27 14:01:48 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

prune-packed: use strbuf to avoid having to worry about PATH_MAX

2013-12-17 10:43:30 -08:00

prune.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

push.c

Merge branch 'cc/starts-n-ends-with-endgame'

2014-03-07 15:18:28 -08:00

read-tree.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

receive-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

reflog.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

repack.c

Merge branch 'jk/pack-bitmap'

2014-02-27 14:01:48 -08:00

replace.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

rerere.c

…

reset.c

Merge branch 'nd/reset-setup-worktree'

2014-03-14 14:25:03 -07:00

rev-list.c

Merge branch 'jk/pack-bitmap'

2014-02-27 14:01:48 -08:00

rev-parse.c

Merge branch 'ds/rev-parse-required-args'

2014-02-27 14:01:23 -08:00

revert.c

cherry-pick, revert: add the --gpg-sign option

2014-01-27 15:15:52 -08:00

rm.c

Merge branch 'nd/submodule-pathspec-ending-with-slash'

2014-02-27 14:01:15 -08:00

send-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

shortlog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

show-branch.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

show-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

stripspace.c

…

symbolic-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

tag.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

unpack-file.c

…

unpack-objects.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-index.c

Merge branch 'nd/submodule-pathspec-ending-with-slash'

2014-02-27 14:01:15 -08:00

update-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-server-info.c

…

upload-archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…