Junio C Hamano a6822e4172 Merge branch 'ss/commit-squash-msg' ... When "git merge --squash" stopped due to conflict, the concluding "git commit" failed to read in the SQUASH_MSG that shows the log messages from all the squashed commits. * ss/commit-squash-msg: commit: do not lose SQUASH_MSG contents		2016-04-06 11:39:10 -07:00
..
add.c
am.c	Merge branch 'jc/am-i-v-fix'	2016-02-24 13:26:01 -08:00
annotate.c
apply.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
archive.c
bisect--helper.c
blame.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
branch.c	config: rename git_config_set_or_die to git_config_set	2016-02-22 10:23:55 -08:00
bundle.c
cat-file.c
check-attr.c	give "nbuf" strbuf a more meaningful name	2016-02-01 13:43:02 -08:00
check-ignore.c	give "nbuf" strbuf a more meaningful name	2016-02-01 13:43:02 -08:00
check-mailmap.c
check-ref-format.c	use xmallocz to avoid size arithmetic	2016-02-22 14:51:09 -08:00
checkout-index.c	checkout-index: disallow "--no-stage" option	2016-02-01 13:43:49 -08:00
checkout.c	builtin/checkout.c: mark strings for translation	2016-02-29 14:27:58 -08:00
clean.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
clone.c	Merge branch 'sb/submodule-parallel-update'	2016-04-06 11:39:01 -07:00
column.c
commit-tree.c
commit.c	Merge branch 'ss/commit-squash-msg'	2016-04-06 11:39:10 -07:00
config.c	Merge branch 'jk/config-get-urlmatch'	2016-04-03 10:29:26 -07:00
count-objects.c
credential.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c	diff: activate diff.renames by default	2016-02-25 11:31:02 -08:00
fast-export.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
fetch-pack.c	fetch-pack: fix object_id of exact sha1	2016-03-01 11:19:19 -08:00
fetch.c	Merge branch 'sb/submodule-parallel-update'	2016-04-06 11:39:01 -07:00
fmt-merge-msg.c
for-each-ref.c
fsck.c
gc.c
get-tar-commit-id.c
grep.c	grep: turn off gitlink detection for --no-index	2016-03-07 12:27:28 -08:00
hash-object.c	Merge branch 'jk/options-cleanup'	2016-02-10 14:20:08 -08:00
help.c	convert trivial cases to FLEX_ARRAY macros	2016-02-22 14:51:09 -08:00
index-pack.c	Merge branch 'jc/index-pack'	2016-04-03 10:29:31 -07:00
init-db.c	setup: set startup_info->have_repository more reliably	2016-03-06 17:18:16 -08:00
interpret-trailers.c
log.c	diff: activate diff.renames by default	2016-02-25 11:31:02 -08:00
ls-files.c	Merge branch 'jk/options-cleanup'	2016-02-10 14:20:08 -08:00
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c	use xmallocz to avoid size arithmetic	2016-02-22 14:51:09 -08:00
merge.c	Merge branch 'mm/diff-renames-default'	2016-04-03 10:29:22 -07:00
mktag.c
mktree.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
mv.c	use st_add and st_mult for allocation size computation	2016-02-22 14:51:09 -08:00
name-rev.c
notes.c	Merge branch 'jk/notes-merge-from-anywhere'	2016-02-03 14:15:59 -08:00
pack-objects.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
pack-redundant.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c	Merge branch 'jc/strbuf-getline'	2016-01-28 16:10:14 -08:00
push.c	Merge branch 'mm/push-default-warning'	2016-02-26 13:37:25 -08:00
read-tree.c
receive-pack.c	builtin/receive-pack.c: use parse_options API	2016-03-01 13:38:45 -08:00
reflog.c	convert trivial cases to FLEX_ARRAY macros	2016-02-22 14:51:09 -08:00
remote-ext.c	convert manual allocations to argv_array	2016-02-22 14:50:32 -08:00
remote-fd.c
remote.c	Merge branch 'ps/config-error'	2016-02-26 13:37:19 -08:00
repack.c
replace.c
rerere.c
reset.c
rev-list.c	list-objects: pass full pathname to callbacks	2016-02-12 12:51:17 -08:00
rev-parse.c	Merge branch 'jk/rev-parse-local-env-vars'	2016-04-03 10:29:27 -07:00
revert.c
rm.c	Merge branch 'nd/ita-cleanup' into maint	2016-02-22 13:10:21 -08:00
send-pack.c
shortlog.c	Merge branch 'jk/shortlog'	2016-01-28 16:10:14 -08:00
show-branch.c
show-ref.c
stripspace.c	stripspace: call U+0020 a "space" instead of a "blank"	2016-01-29 16:02:34 -08:00
submodule--helper.c	Merge branch 'sb/submodule-parallel-update'	2016-04-06 11:39:01 -07:00
symbolic-ref.c
tag.c
unpack-file.c
unpack-objects.c
update-index.c	Merge branch 'jk/options-cleanup'	2016-02-10 14:20:08 -08:00
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
write-tree.c