Junio C Hamano fbbccd0a10 checkout -m: no need to insist on having all 3 stages ... The content level merge machinery ll_merge() is prepared to merge correctly in "both sides added differently" case by using an empty blob as if it were the common ancestor. "checkout -m" could do the same, but didn't bother supporting it and instead insisted on having all three stages. Reported-by: Pete Harlan Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-12-06 14:17:01 -08:00
..
add.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
annotate.c
apply.c	Merge branch 'jc/maint-apply-report-offset'	2011-03-15 14:22:02 -07:00
archive.c	i18n: git-archive basic messages	2011-03-09 23:52:57 -08:00
bisect--helper.c
blame.c	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
branch.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
bundle.c	i18n: git-bundle basic messages	2011-03-09 23:52:57 -08:00
cat-file.c
check-attr.c
check-ref-format.c
checkout-index.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
checkout.c	checkout -m: no need to insist on having all 3 stages	2011-12-06 14:17:01 -08:00
clean.c	i18n: git-clean clean.requireForce messages	2011-03-09 23:52:57 -08:00
clone.c	Merge branch 'nd/init-gitdir'	2011-04-01 17:57:37 -07:00
commit-tree.c
commit.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
config.c	config: drop support for GIT_CONFIG_NOGLOBAL	2011-03-15 12:23:30 -07:00
count-objects.c
describe.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
diff-files.c	Convert struct diff_options to use struct pathspec	2011-02-03 12:28:15 -08:00
diff-index.c
diff-tree.c
diff.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
fast-export.c	Merge branch 'mg/placeholders-are-lowercase'	2011-02-27 21:58:30 -08:00
fetch-pack.c	Merge branch 'jc/fetch-progressive-stride'	2011-03-29 14:09:08 -07:00
fetch.c	Merge branch 'jl/submodule-fetch-on-demand'	2011-04-04 15:02:01 -07:00
fmt-merge-msg.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
for-each-ref.c
fsck.c	Remove unused variables	2011-03-22 11:43:27 -07:00
gc.c	i18n: git-gc "Auto packing the repository" message	2011-03-09 23:52:57 -08:00
grep.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
hash-object.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
help.c
index-pack.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
init-db.c	Merge branch 'nd/init-gitdir'	2011-04-01 17:57:37 -07:00
log.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
ls-files.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
ls-remote.c	get_remote_url(): use the same data source as ls-remote to get remote urls	2011-03-02 12:26:53 -08:00
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-ours.c
merge-recursive.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-tree.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge.c	Merge branch 'jc/merge-sans-branch'	2011-04-01 17:57:16 -07:00
mktag.c	Merge branch 'jn/maint-c99-format'	2011-03-23 14:55:46 -07:00
mktree.c
mv.c	i18n: git-mv "bad" messages	2011-03-09 23:52:56 -08:00
name-rev.c
notes.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
pack-objects.c	thread-utils.h: simplify the inclusion	2010-12-10 12:58:06 -08:00
pack-redundant.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
pack-refs.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
patch-id.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
prune-packed.c
prune.c
push.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
read-tree.c	Make <identifier> lowercase as per CodingGuidelines	2011-02-15 11:53:10 -08:00
receive-pack.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
reflog.c
remote-ext.c	Remove unused variables	2011-03-22 11:43:27 -07:00
remote-fd.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
remote.c	Merge branch 'jk/maint-remote-mirror-safer'	2011-04-06 10:38:14 -07:00
replace.c
rerere.c	rerere forget: deprecate invocation without pathspec	2011-03-02 12:26:18 -08:00
reset.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
rev-list.c	revision.c: introduce --min-parents and --max-parents options	2011-03-23 10:16:44 -07:00
rev-parse.c	revision.c: introduce --min-parents and --max-parents options	2011-03-23 10:16:44 -07:00
revert.c	revert: Hide '-r' option in default usage	2011-04-13 11:02:49 -07:00
rm.c	i18n: git-rm basic messages	2011-03-09 23:52:56 -08:00
send-pack.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
shortlog.c	i18n: git-shortlog basic messages	2011-03-09 23:52:58 -08:00
show-branch.c
show-ref.c
stripspace.c
symbolic-ref.c
tag.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
tar-tree.c
unpack-file.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
unpack-objects.c
update-index.c	Convert ce_path_match() to use struct pathspec	2011-02-03 14:08:30 -08:00
update-ref.c
update-server-info.c
upload-archive.c
var.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
verify-pack.c
verify-tag.c	Merge branch 'mg/maint-tag-rfc1991'	2010-12-08 11:24:13 -08:00
write-tree.c