Junio C Hamano 5b6211aee1 Merge branch 'jk/notes-merge-config' ... "git notes merge" can be told with "--strategy=<how>" option how to automatically handle conflicts; this can now be configured by setting notes.mergeStrategy configuration variable. * jk/notes-merge-config: notes: teach git-notes about notes.<name>.mergeStrategy option notes: add notes.mergeStrategy option to select default strategy notes: add tests for --commit/--abort/--strategy exclusivity notes: extract parse_notes_merge_strategy to notes-utils notes: extract enum notes_merge_strategy to notes-utils.h notes: document cat_sort_uniq rewriteMode		2015-08-31 15:39:05 -07:00
..
add.c	Merge branch 'sb/remove-unused-var-from-builtin-add' into maint	2015-08-19 14:41:33 -07:00
am.c	Merge branch 'jc/am-state-fix'	2015-08-31 15:39:03 -07:00
annotate.c
apply.c	Merge branch 'jc/apply-reject-noop-hunk'	2015-06-24 12:21:39 -07:00
archive.c
bisect--helper.c
blame.c	memoize common git-path "constant" files	2015-08-10 15:37:14 -07:00
branch.c	write_file(): drop "fatal" parameter	2015-08-24 13:09:02 -07:00
bundle.c	bundle: verify arguments more strictly	2015-05-08 10:52:11 -07:00
cat-file.c	cat-file: sort and de-dup output of --batch-all-objects	2015-06-26 09:24:42 -07:00
check-attr.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ignore.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-mailmap.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ref-format.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout-index.c	prefix_path(): unconditionally free results in the callers	2015-05-05 10:31:51 -07:00
checkout.c	Merge branch 'hv/submodule-config'	2015-08-31 15:38:52 -07:00
clean.c	Merge branch 'rs/janitorial' into maint	2015-06-16 14:33:47 -07:00
clone.c	Merge branch 'jk/git-path'	2015-08-19 14:48:56 -07:00
column.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
commit-tree.c	commit-tree: simplify parsing of option -S using skip_prefix()	2014-12-29 09:32:45 -08:00
commit.c	Merge branch 'mh/tempfile'	2015-08-25 14:57:09 -07:00
config.c	get_urlmatch: avoid useless strbuf write	2015-08-20 13:16:50 -07:00
count-objects.c	count-objects: report unused files in $GIT_DIR/worktrees/...	2014-12-01 11:00:18 -08:00
credential.c
describe.c	get_name(): rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
diff-files.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-tree.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
fast-export.c	refs: move the remaining ref module declarations to refs.h	2015-06-22 13:17:12 -07:00
fetch-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
fetch.c	Merge branch 'hv/submodule-config'	2015-08-31 15:38:52 -07:00
fmt-merge-msg.c	refs: move the remaining ref module declarations to refs.h	2015-06-22 13:17:12 -07:00
for-each-ref.c	Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint	2015-08-03 10:41:31 -07:00
fsck.c	prefer git_pathdup to git_path in some possibly-dangerous cases	2015-08-10 15:37:12 -07:00
gc.c	Merge branch 'mh/tempfile'	2015-08-25 14:57:09 -07:00
get-tar-commit-id.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
grep.c	Merge branch 'ps/grep-help-all-callback-arg'	2015-04-20 15:28:34 -07:00
hash-object.c	Merge branch 'jc/hash-object' into maint	2015-05-26 13:49:25 -07:00
help.c	Merge branch 'sb/leaks'	2015-03-20 13:11:53 -07:00
index-pack.c	Merge branch 'jc/finalize-temp-file'	2015-08-19 14:48:55 -07:00
init-db.c	write_file(): drop caller-supplied LF from calls to create a one-liner file	2015-08-25 12:49:19 -07:00
interpret-trailers.c	trailer: add interpret-trailers command	2014-10-13 13:55:27 -07:00
log.c	builtin/log.c: minor reformat	2015-08-25 13:11:21 -07:00
ls-files.c	ps_matched: xcalloc() takes nmemb and then element size	2015-08-20 09:57:38 -07:00
ls-remote.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
ls-tree.c	ls-tree: disable negative pathspec because it's not supported	2014-12-01 11:33:45 -08:00
mailinfo.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
mailsplit.c	mailsplit: remove unnecessary unlink(2) call	2014-10-07 10:49:57 -07:00
merge-base.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-file.c	Merge branch 'ab/merge-file-prefix'	2015-02-22 12:28:25 -08:00
merge-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	memoize common git-path "constant" files	2015-08-10 15:37:14 -07:00
mktag.c
mktree.c
mv.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
name-rev.c	name_ref(): rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
notes.c	Merge branch 'jk/notes-merge-config'	2015-08-31 15:39:05 -07:00
pack-objects.c	parse-options: move unsigned long option parsing out of pack-objects.c	2015-06-22 15:07:21 -07:00
pack-redundant.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-refs.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
patch-id.c	patch-id: convert to use struct object_id	2015-03-13 22:43:14 -07:00
prune-packed.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
prune.c	Merge branch 'nd/multiple-work-trees'	2015-07-13 14:02:02 -07:00
pull.c	Merge branch 'mh/tempfile'	2015-08-25 14:57:09 -07:00
push.c	push: allow --follow-tags to be set by config push.followTags	2015-03-14 15:08:35 -07:00
read-tree.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
receive-pack.c	Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint	2015-08-19 14:41:26 -07:00
reflog.c	git-reflog: add exists command	2015-07-21 14:08:14 -07:00
remote-ext.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
remote-fd.c
remote.c	remote.c: drop extraneous local variable from migrate_file	2015-08-10 15:37:12 -07:00
repack.c	prefer mkpathdup to mkpath in assignments	2015-08-10 15:37:12 -07:00
replace.c	Merge branch 'mh/replace-refs'	2015-08-03 11:01:10 -07:00
rerere.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
reset.c	memoize common git-path "constant" files	2015-08-10 15:37:14 -07:00
rev-list.c	rev-list: make it obvious that we do not support notes	2015-08-24 10:33:15 -07:00
rev-parse.c	rev-parse --parseopt: allow [*=?!] in argument hints	2015-07-15 10:30:54 -07:00
revert.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
rm.c	use file_exists() to check if a file exists in the worktree	2015-05-20 13:49:10 -07:00
send-pack.c	builtin/send-pack.c: respect user.signingkey	2015-07-21 15:24:27 -07:00
shortlog.c	convert "enum date_mode" into a struct	2015-06-29 11:39:07 -07:00
show-branch.c	convert "enum date_mode" into a struct	2015-06-29 11:39:07 -07:00
show-ref.c	show_ref(): convert local variable peeled to object_id	2015-05-25 12:19:32 -07:00
stripspace.c
symbolic-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
tag.c	update-ref and tag: add --create-reflog arg	2015-07-21 14:08:35 -07:00
unpack-file.c
unpack-objects.c	fsck (receive-pack): allow demoting errors to warnings	2015-06-23 14:27:34 -07:00
update-index.c	Merge branch 'nd/untracked-cache'	2015-05-26 13:24:46 -07:00
update-ref.c	Merge branch 'dt/refs-backend-preamble'	2015-08-03 11:01:29 -07:00
update-server-info.c
upload-archive.c
var.c
verify-commit.c	verify-commit: add option to print raw gpg status information	2015-06-22 14:20:47 -07:00
verify-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-tag.c	verify-tag: add option to print raw gpg status information	2015-06-22 14:20:47 -07:00
worktree.c	Merge branch 'jc/am-state-fix'	2015-08-31 15:39:03 -07:00
write-tree.c