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
auth.ccommits | blame
auth.hcommits | blame
gotd.8commits | blame
gotd.ccommits | blame
gotd.conf.5commits | blame
gotd.hcommits | blame
imsg.ccommits | blame
listen.ccommits | blame
listen.hcommits | blame
log.ccommits | blame
log.hcommits | blame
parse.ycommits | blame
privsep_stub.ccommits | blame
repo_imsg.ccommits | blame
repo_read.ccommits | blame
repo_read.hcommits | blame
repo_write.ccommits | blame
repo_write.hcommits | blame
session.ccommits | blame
session.hcommits | blame