log

age author description
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: document checkignored and checkunknown configs again
Wed, 03 Feb 2016 13:12:06 -0800 Siddharth Agarwal rebase: respect checkunknown and checkignored in more cases
Wed, 03 Feb 2016 13:11:34 -0800 Siddharth Agarwal test-merge-force: add tests for merge.checkunknown=warn
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: tell _checkunknownfiles about whether this was merge --force
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: add missing doc for 'labels' parameter
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: move abort/warn checks up to the top level of _checkunknownfiles