Junio C Hamano bb6ac5ea13 Merge branch 'jc/apply-ws-prefix' into maint ...

* jc/apply-ws-prefix:
  apply: omit ws check for excluded paths
  apply: hoist use_patch() helper for path exclusion up
  apply: use the right attribute for paths in non-Git patches

Conflicts:
	builtin/apply.c

2014-09-19 14:05:10 -07:00

..

add.c

read-cache: new API write_locked_index instead of write_index/write_cache

2014-06-13 11:49:10 -07:00

annotate.c

annotate: use argv_array

2014-07-16 11:10:11 -07:00

apply.c

Merge branch 'jc/apply-ws-prefix' into maint

2014-09-19 14:05:10 -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 'rs/code-cleaning'

2014-07-22 10:59:37 -07:00

branch.c

refactor skip_prefix to return a boolean

2014-06-20 10:44:43 -07:00

bundle.c

…

cat-file.c

Merge branch 'jk/warn-on-object-refname-ambiguity'

2014-03-25 11:07:36 -07:00

check-attr.c

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

2014-03-18 14:03:03 -07:00

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

entry.c: update cache_changed if refresh_cache is set in checkout_entry()

2014-06-13 11:49:39 -07:00

checkout.c

Merge branch 'nd/split-index'

2014-07-16 11:25:40 -07:00

clean.c

use xcalloc() to allocate zero-initialized memory

2014-07-21 10:30:21 -07:00

clone.c

use local cloning if insteadOf makes a local URL

2014-07-17 11:17:13 -07:00

column.c

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

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

commit-tree.c

commit_tree: take a pointer/len pair rather than a const strbuf

2014-06-12 10:29:41 -07:00

commit.c

Merge branch 'ta/string-list-init'

2014-07-23 11:35:54 -07:00

config.c

Merge branch 'jk/daemon-tolower'

2014-06-16 10:07:15 -07:00

count-objects.c

…

credential.c

…

describe.c

hashmap: add simplified hashmap_get_from_hash() API

2014-07-07 13:56:35 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'jk/alloc-commit-id'

2014-07-22 10:59:25 -07:00

diff.c

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

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

fast-export.c

Merge branch 'jk/commit-buffer-length'

2014-07-02 12:53:02 -07:00

fetch-pack.c

Merge branch 'nd/shallow-clone'

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

fetch.c

Merge branch 'jk/xstrfmt'

2014-07-09 11:34:05 -07:00

fmt-merge-msg.c

Merge branch 'jk/xstrfmt'

2014-07-09 11:34:05 -07:00

for-each-ref.c

use commit_list_count() to count the members of commit_lists

2014-07-17 13:36:25 -07:00

fsck.c

refs.c: add a public is_branch function

2014-07-16 13:06:41 -07:00

gc.c

Merge branch 'nd/daemonize-gc' into maint

2014-06-25 11:47:36 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint

2014-06-25 11:47:49 -07: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

Merge branch 'maint'

2014-07-21 12:35:39 -07:00

init-db.c

i18n: only extract comments marked with "TRANSLATORS:"

2014-04-17 11:09:56 -07:00

log.c

Merge branch 'jk/commit-buffer-length' into maint

2014-07-16 11:16:38 -07:00

ls-files.c

pathspec: pass directory indicator to match_pathspec_item()

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

ls-remote.c

builtin/ls-remote.c: rearrange xcalloc arguments

2014-05-27 14:00:43 -07:00

ls-tree.c

pathspec: rename match_pathspec_depth() to match_pathspec()

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

mailinfo.c

Merge branch 'rs/mailinfo-header-cmp' into maint

2014-06-25 11:48:23 -07: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 'rs/code-cleaning'

2014-07-16 11:33:09 -07:00

mktag.c

…

mktree.c

builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

2014-03-03 14:54:45 -08:00

mv.c

Merge branch 'nd/split-index'

2014-07-16 11:25:40 -07:00

name-rev.c

use xstrfmt to replace xmalloc + strcpy/strcat

2014-06-19 15:20:54 -07:00

notes.c

Merge branch 'mh/ref-transaction'

2014-06-03 12:06:41 -07:00

pack-objects.c

Merge branch 'jk/pack-shallow-always-without-bitmap'

2014-08-26 11:16:25 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

patch-id: make it stable against hunk reordering

2014-06-10 13:09:24 -07:00

prune-packed.c

i18n: mark all progress lines for translation

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

prune.c

Merge branch 'mh/replace-refs-variable-rename'

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

push.c

refactor skip_prefix to return a boolean

2014-06-20 10:44:43 -07:00

read-tree.c

read-tree: note about dropping split-index mode or index version

2014-06-13 11:49:41 -07:00

receive-pack.c

Merge branch 'jk/misc-fixes-maint'

2014-07-28 11:30:41 -07:00

reflog.c

refs.c: add new functions reflog_exists and delete_reflog

2014-05-08 14:31:43 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'rs/ref-transaction-0'

2014-07-21 11:18:37 -07:00

repack.c

Merge branch 'jk/strip-suffix'

2014-07-16 11:26:00 -07:00

replace.c

Merge branch 'cc/replace-graft'

2014-07-27 15:14:18 -07:00

rerere.c

rerere: fix for merge.conflictstyle

2014-04-30 10:30:02 -07:00

reset.c

Merge branch 'nd/split-index'

2014-07-16 11:25:40 -07:00

rev-list.c

commit: record buffer length in cache

2014-06-13 12:09:38 -07:00

rev-parse.c

Merge branch 'jk/misc-fixes-maint'

2014-07-28 11:30:41 -07:00

revert.c

parse-options: multi-word argh should use dash to separate words

2014-03-24 10:43:34 -07:00

rm.c

read-cache: new API write_locked_index instead of write_index/write_cache

2014-06-13 11:49:10 -07: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

Merge branch 'jk/misc-fixes-maint'

2014-07-28 11:30:41 -07: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

Merge branch 'jk/tag-sort'

2014-07-23 11:35:45 -07:00

unpack-file.c

…

unpack-objects.c

Merge branch 'mh/replace-refs-variable-rename'

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

update-index.c

Merge branch 'nd/split-index'

2014-07-16 11:25:40 -07:00

update-ref.c

refs.c: change ref_transaction_update() to do error checking and return status

2014-07-14 11:54:42 -07: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-commit.c

verify-commit: scriptable commit signature verification

2014-06-23 15:50:31 -07:00

verify-pack.c

verify-pack: use strbuf_strip_suffix

2014-06-30 13:43:32 -07:00

verify-tag.c

…

write-tree.c

…