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
add.sh*commits | blame
backout.sh*commits | blame
blame.sh*commits | blame
branch.sh*commits | blame
cat.sh*commits | blame
checkout.sh*commits | blame
cherrypick.sh*commits | blame
cleanup.sh*commits | blame
clone.sh*commits | blame
commit.sh*commits | blame
common.shcommits | blame
diff.sh*commits | blame
fetch.sh*commits | blame
histedit.sh*commits | blame
import.sh*commits | blame
init.sh*commits | blame
integrate.sh*commits | blame
log.sh*commits | blame
merge.sh*commits | blame
pack.sh*commits | blame
patch.sh*commits | blame
rebase.sh*commits | blame
ref.sh*commits | blame
revert.sh*commits | blame
rm.sh*commits | blame
send.sh*commits | blame
stage.sh*commits | blame
status.sh*commits | blame
tag.sh*commits | blame
tree.sh*commits | blame
unstage.sh*commits | blame
update.sh*commits | blame