Tree

Tree:
d637364619a58688bdcec02b0482889d63908ff5
Date:
Message:
make 'got merge -c' fail even if new changes only affect unrelated paths Otherwise, 'got merge -c' can silently revert already committed changes. Also fix GOT_ERR_MERGE_COMMIT_OUT_OF_DATE by giving it a value distinct from GOT_ERR_MERGE_STAGED_PATHS. Patch by James Cook
Makefilecommits | blame
arraylist.hcommits | blame
blame.ccommits | blame
bloom.ccommits | blame
bloom.hcommits | blame
buf.ccommits | blame
buf.hcommits | blame
commit_graph.ccommits | blame
date.ccommits | blame
deflate.ccommits | blame
delta.ccommits | blame
delta_cache.ccommits | blame
deltify.ccommits | blame
dial.ccommits | blame
diff.ccommits | blame
diff3.ccommits | blame
diff_atomize_text.ccommits | blame
diff_debug.hcommits | blame
diff_internal.hcommits | blame
diff_main.ccommits | blame
diff_main.hcommits | blame
diff_myers.ccommits | blame
diff_output.ccommits | blame
diff_output.hcommits | blame
diff_output_edscript.ccommits | blame
diff_output_plain.ccommits | blame
diff_output_unidiff.ccommits | blame
diff_patience.ccommits | blame
diffreg.ccommits | blame
error.ccommits | blame
fetch.ccommits | blame
fileindex.ccommits | blame
gitconfig.ccommits | blame
gitproto.ccommits | blame
got_lib_deflate.hcommits | blame
got_lib_delta.hcommits | blame
got_lib_delta_cache.hcommits | blame
got_lib_deltify.hcommits | blame
got_lib_dial.hcommits | blame
got_lib_diff.hcommits | blame
got_lib_fileindex.hcommits | blame
got_lib_gitconfig.hcommits | blame
got_lib_gitproto.hcommits | blame
got_lib_gotconfig.hcommits | blame
got_lib_hash.hcommits | blame
got_lib_inflate.hcommits | blame
got_lib_lockfile.hcommits | blame
got_lib_object.hcommits | blame
got_lib_object_cache.hcommits | blame
got_lib_object_create.hcommits | blame
got_lib_object_idcache.hcommits | blame
got_lib_object_idset.hcommits | blame
got_lib_object_parse.hcommits | blame
got_lib_object_qid.hcommits | blame
got_lib_pack.hcommits | blame
got_lib_pack_create.hcommits | blame
got_lib_pack_index.hcommits | blame
got_lib_pkt.hcommits | blame
got_lib_poll.hcommits | blame
got_lib_privsep.hcommits | blame
got_lib_ratelimit.hcommits | blame
got_lib_repository.hcommits | blame
got_lib_worktree.hcommits | blame
gotconfig.ccommits | blame
hash.ccommits | blame
inflate.ccommits | blame
lockfile.ccommits | blame
murmurhash2.ccommits | blame
murmurhash2.hcommits | blame
object.ccommits | blame
object_cache.ccommits | blame
object_create.ccommits | blame
object_idset.ccommits | blame
object_open_io.ccommits | blame
object_open_privsep.ccommits | blame
object_parse.ccommits | blame
object_qid.ccommits | blame
opentemp.ccommits | blame
pack.ccommits | blame
pack_create.ccommits | blame
pack_create_io.ccommits | blame
pack_create_privsep.ccommits | blame
pack_index.ccommits | blame
patch.ccommits | blame
path.ccommits | blame
pkt.ccommits | blame
pollfd.ccommits | blame
privsep.ccommits | blame
ratelimit.ccommits | blame
rcsutil.ccommits | blame
rcsutil.hcommits | blame
read_gitconfig.ccommits | blame
read_gitconfig_privsep.ccommits | blame
read_gotconfig.ccommits | blame
read_gotconfig_privsep.ccommits | blame
reference.ccommits | blame
reference_parse.ccommits | blame
repository.ccommits | blame
repository_admin.ccommits | blame
send.ccommits | blame
serve.ccommits | blame
sigs.ccommits | blame
sockaddr.ccommits | blame
utf8.ccommits | blame
worktree.ccommits | blame
worktree_open.ccommits | blame