Junio C Hamano 9c53de7de1 Merge branch 'jc/am-3-fallback-regression-fix' ... "git am -3" had a small regression where it is aborted in its error handling codepath when underlying merge-recursive failed in certain ways, as it assumed that the internal call to merge-recursive will never die, which is not the case (yet). * jc/am-3-fallback-regression-fix: am -3: do not let failed merge from completing the error codepath		2015-10-26 15:55:15 -07:00
..
add.c
am.c	Merge branch 'jc/am-3-fallback-regression-fix'	2015-10-26 15:55:15 -07:00
annotate.c
apply.c	apply: convert root string to strbuf	2015-10-05 11:08:04 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'jk/war-on-sprintf'	2015-10-20 15:24:01 -07:00
branch.c	Merge branch 'kn/for-each-branch'	2015-10-15 15:43:38 -07:00
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout-index.c
checkout.c
clean.c	use strbuf_complete to conditionally append slash	2015-10-05 11:08:06 -07:00
clone.c	Merge branch 'js/clone-dissociate'	2015-10-15 15:43:49 -07:00
column.c
commit-tree.c
commit.c
config.c	config: use xstrfmt in normalize_value	2015-09-25 10:18:18 -07:00
count-objects.c
credential.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c
fetch-pack.c
fetch.c	use alloc_ref rather than hand-allocating "struct ref"	2015-10-05 11:08:05 -07:00
fmt-merge-msg.c
for-each-ref.c	ref-filter: add option to match literal pattern	2015-09-17 10:02:49 -07:00
fsck.c	Merge branch 'jk/war-on-sprintf'	2015-10-20 15:24:01 -07:00
gc.c	Merge branch 'jk/war-on-sprintf'	2015-10-20 15:24:01 -07:00
get-tar-commit-id.c
grep.c
hash-object.c
help.c	convert strncpy to memcpy	2015-10-05 11:08:06 -07:00
index-pack.c	use xsnprintf for generating git object headers	2015-09-25 10:18:18 -07:00
init-db.c	init: use strbufs to store paths	2015-10-05 11:07:04 -07:00
interpret-trailers.c
log.c	use strbuf_complete to conditionally append slash	2015-10-05 11:08:06 -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	Merge branch 'jk/war-on-sprintf'	2015-10-20 15:24:01 -07:00
ls-tree.c	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
mailinfo.c
mailsplit.c	mailsplit: make PATH_MAX buffers dynamic	2015-09-25 10:18:18 -07:00
merge-base.c
merge-file.c	Sync with 2.3.10	2015-09-28 15:28:31 -07:00
merge-index.c	use sha1_to_hex_r() instead of strcpy	2015-10-05 11:08:05 -07:00
merge-ours.c
merge-recursive.c	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
merge-tree.c	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
merge.c	use sha1_to_hex_r() instead of strcpy	2015-10-05 11:08:05 -07:00
mktag.c
mktree.c
mv.c
name-rev.c	name-rev: use strip_suffix to avoid magic numbers	2015-10-05 11:08:06 -07:00
notes.c
pack-objects.c
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c	Merge branch 'pt/pull-builtin' into maint	2015-10-16 14:32:32 -07:00
push.c
read-tree.c	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
receive-pack.c	receive-pack: simplify keep_arg computation	2015-10-05 11:08:05 -07:00
reflog.c
remote-ext.c	remote-ext: simplify git pkt-line generation	2015-09-25 10:18:18 -07:00
remote-fd.c
remote.c	Merge branch 'bb/remote-get-url'	2015-10-05 12:30:25 -07:00
repack.c
replace.c
rerere.c	Sync with 2.6.1	2015-10-05 13:20:08 -07:00
reset.c
rev-list.c	use sha1_to_hex_r() instead of strcpy	2015-10-05 11:08:05 -07:00
rev-parse.c
revert.c
rm.c
send-pack.c
shortlog.c
show-branch.c	show-branch: avoid segfault with --reflog of unborn branch	2015-09-25 10:18:18 -07:00
show-ref.c
stripspace.c
submodule--helper.c
symbolic-ref.c
tag.c	Merge branch 'kn/for-each-tag'	2015-10-05 12:30:18 -07:00
unpack-file.c	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c	upload-archive: convert sprintf to strbuf	2015-09-25 10:18:18 -07:00
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c
write-tree.c