Elijah Newren 5291828df8 merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict ... There are a variety of questions users might ask while resolving conflicts: * What changes have been made since the previous (first) parent? * What changes are staged? * What is still unstaged? (or what is still conflicted?) * What changes did I make to resolve conflicts so far? The first three of these have simple answers: * git diff HEAD * git diff --cached * git diff There was no way to answer the final question previously. Adding one is trivial in merge-ort, since it works by creating a tree representing what should be written to the working copy complete with conflict markers. Simply write that tree to .git/AUTO_MERGE, allowing users to answer the fourth question with * git diff AUTO_MERGE I avoided using a name like "MERGE_AUTO", because that would be merge-specific (much like MERGE_HEAD, REBASE_HEAD, REVERT_HEAD, CHERRY_PICK_HEAD) and I wanted a name that didn't change depending on which type of operation the merge was part of. Ensure that paths which clean out other temporary operation-specific files (e.g. CHERRY_PICK_HEAD, MERGE_MSG, rebase-merge/ state directory) also clean out this AUTO_MERGE file. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-03-20 12:35:40 -07:00
..
add.c	drop unused argc parameters	2020-09-30 12:53:47 -07:00
am.c	builtin/*: update usage format	2021-01-06 15:10:49 -08:00
annotate.c
apply.c
archive.c
bisect--helper.c	Merge branch 'mr/bisect-in-c-3'	2020-11-09 14:06:25 -08:00
blame.c	Merge branch 'ab/mailmap'	2021-01-25 14:19:19 -08:00
branch.c	Merge branch 'ph/use-delete-refs'	2021-02-05 16:40:45 -08:00
bugreport.c	builtin/bugreport.c: use thread-safe localtime_r()	2020-12-01 13:05:37 -08:00
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c	shortlog: remove unused(?) "repo-abbrev" feature	2021-01-12 14:04:42 -08:00
check-ref-format.c
checkout-index.c	checkout-index: propagate errors to exit code	2020-10-27 12:41:56 -07:00
checkout.c	cache-tree: clean up cache_tree_update()	2021-01-23 17:14:07 -08:00
clean.c
clone.c	Merge branch 'js/init-defaultbranch-advice'	2020-12-18 15:15:17 -08:00
column.c
commit-graph.c	builtin/*: update usage format	2021-01-06 15:10:49 -08:00
commit-tree.c
commit.c	shortlog: remove unused(?) "repo-abbrev" feature	2021-01-12 14:04:42 -08:00
config.c	config: implement --fixed-value with --get*	2020-11-25 14:43:48 -08:00
count-objects.c
credential-cache--daemon.c
credential-cache.c
credential-store.c	crendential-store: use timeout when locking file	2020-11-25 12:30:18 -08:00
credential.c	credential: load default config	2020-10-16 12:30:45 -07:00
describe.c	refs: switch peel_ref() to peel_iterated_oid()	2021-01-21 15:51:31 -08:00
diff-files.c	diff-merges: new function diff_merges_set_dense_combined_if_unset()	2020-12-21 13:47:31 -08:00
diff-index.c	builtin/diff-index: learn --merge-base	2020-09-20 21:30:26 -07:00
diff-tree.c	builtin/diff-tree: learn --merge-base	2020-09-21 13:37:03 -07:00
diff.c	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
difftool.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
env--helper.c	assert PARSE_OPT_NONEG in parse-options callbacks	2020-09-30 12:53:47 -07:00
fast-export.c	builtin/*: update usage format	2021-01-06 15:10:49 -08:00
fast-import.c	Merge branch 'jk/fast-import-marks-cleanup'	2020-11-02 13:17:40 -08:00
fetch-pack.c
fetch.c	fetch: implement support for atomic reference updates	2021-01-12 12:06:15 -08:00
fmt-merge-msg.c
for-each-ref.c	ref-filter: move ref_sorting flags to a bitfield	2021-01-07 15:13:21 -08:00
for-each-repo.c	for-each-repo: do nothing on empty config	2021-01-07 19:12:02 -08:00
fsck.c	fsck: make fsck_config() re-usable	2021-01-05 14:58:29 -08:00
gc.c	Merge branch 'jk/peel-iterated-oid'	2021-02-03 15:04:49 -08:00
get-tar-commit-id.c
grep.c	grep/log: remove hidden --debug and --grep-debug options	2021-01-26 11:36:20 -08:00
hash-object.c
help.c
index-pack.c	object-file.c: rename from sha1-file.c	2021-01-04 13:01:55 -08:00
init-db.c	get_default_branch_name(): prepare for showing some advice	2020-12-13 15:53:50 -08:00
interpret-trailers.c
log.c	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
ls-files.c	ls-files.c: add --deduplicate option	2021-01-23 11:48:20 -08:00
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c	merge-base, xdiff: zero out xpparam_t structures	2020-10-20 12:53:26 -07:00
merge.c	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
mktag.c	mktag: add a --[no-]strict option	2021-01-06 14:22:24 -08:00
mktree.c
multi-pack-index.c
mv.c
name-rev.c	oid_pos(): access table through const pointers	2021-01-28 12:03:26 -08:00
notes.c
pack-objects.c	Merge branch 'jv/pack-objects-narrower-ref-iteration'	2021-02-05 16:40:45 -08:00
pack-redundant.c	Merge branch 'jc/deprecate-pack-redundant'	2021-01-25 14:19:18 -08:00
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c	pull: display default warning only when non-ff	2020-12-15 17:39:42 -08:00
push.c	Merge branch 'sk/force-if-includes'	2020-10-27 15:09:49 -07:00
range-diff.c
read-tree.c
rebase.c	merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict	2021-03-20 12:35:40 -07:00
receive-pack.c	Merge branch 'js/trace2-session-id'	2020-12-08 15:11:20 -08:00
reflog.c
remote-ext.c
remote-fd.c
remote.c	config: convert multi_replace to flags	2020-11-25 14:43:47 -08:00
repack.c	fetch-pack: refactor writing promisor file	2021-01-12 16:01:07 -08:00
replace.c
rerere.c
reset.c
rev-list.c
rev-parse.c	rev-parse: add option for absolute or relative path formatting	2020-12-12 23:35:51 -08:00
revert.c	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
rm.c
send-pack.c	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
shortlog.c	Merge branch 'ab/mailmap'	2021-01-25 14:19:19 -08:00
show-branch.c
show-index.c
show-ref.c	refs: switch peel_ref() to peel_iterated_oid()	2021-01-21 15:51:31 -08:00
sparse-checkout.c	sparse-checkout: load sparse-checkout patterns	2021-01-23 17:14:07 -08:00
stash.c	Merge branch 'en/stash-apply-sparse-checkout'	2021-01-15 15:20:29 -08:00
stripspace.c
submodule--helper.c	builtin/*: update usage format	2021-01-06 15:10:49 -08:00
symbolic-ref.c
tag.c	Merge branch 'ph/use-delete-refs'	2021-02-05 16:40:45 -08:00
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c	update-ref: disallow "start" for ongoing transactions	2020-11-16 13:44:01 -08:00
update-server-info.c
upload-archive.c
upload-pack.c
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c	worktree: teach list verbose mode	2021-01-30 09:57:40 -08:00
write-tree.c