7 commits

Author	SHA1	Message	Date
Kyle Wood	d45565f83b	Handle gpg signing better (#1123) ... Instead of checking whether it was set previously, setting it to false, then setting it back to true if it was true before, just use the command-line argument in git to override the config for that command. Using a variable makes it pretty painless to do.	2018-05-24 13:41:50 -05:00
Zach Brown	c1d0b4b4c6	Update Paper to MC 1.12-pre5	2017-05-20 23:49:56 -05:00
Zach Brown	c1932e0290	Add upstreamMerge script to paper tool	2016-08-19 16:02:31 -05:00
DemonWav	4108dc5b68	Workaround for OSX not having the realpath command.	2016-04-03 03:53:58 -05:00
DemonWav	0394633734	Use set -e to handle errors better in the build scripts	2016-04-03 03:43:30 -05:00
DemonWav	7effde04b1	Rebuild patches after we continue from a paper edit.	2016-04-03 01:39:31 -05:00
DemonWav	8b66d99e73	Cleanup and restructure the project	2016-04-01 23:15:41 -05:00

Renamed from upstreamMerge.sh (Browse further)