Tree
- Tree:
abcd93b1a48710aa9576b8c53f5f9e2149594315
- 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
README.md | commits | blame |
sync-upstream.sh* | commits | blame |
README.md
MAINTSCRIPTS ============ This directory contains scripts to aid in the maintenance of -portable. * `sync-upstream.sh`: this script helps automate the syncing of upstream `GoT` with `-portable`.