1135 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
deajan	b4f1bd37ea	Rebuilt targets	2017-06-03 13:58:33 +02:00
deajan	2b786abc6a	Some comment removal	2017-06-03 13:57:10 +02:00
deajan	bd6b1a60e8	Rebuilt targets	2017-06-03 13:52:12 +02:00
deajan	967ce33977	WIP: conflict list	2017-06-03 13:51:49 +02:00
deajan	37ca73a6f9	moved unfortunate comment placement	2017-06-03 01:28:34 +02:00
deajan	9e1c3c2a65	WIP: conflict list	2017-06-03 01:20:38 +02:00
deajan	862a6fd235	Fixed some more typo	2017-06-02 15:42:45 +02:00
deajan	83fd33bf78	WIP: conflict list	2017-06-01 17:45:02 +02:00
deajan	99b606fef8	WIP: conflict list	2017-05-31 18:02:18 +02:00
deajan	b0307fd555	Another typo fix	2017-05-31 12:36:39 +02:00
deajan	eb73d49c69	Typo fixing	2017-05-31 12:31:18 +02:00
deajan	d91230e22f	WIP: conflict list	2017-05-31 11:16:36 +02:00
deajan	825e051e3b	WIP: conflict list	2017-05-30 15:45:43 +02:00
deajan	a7ceea1dac	WIP: conflict list	2017-05-30 15:00:05 +02:00
Orsiris de Jong	3ff8a123e1	Merge pull request #103 from deajan/no-resume ... Added --no-resume option	2017-05-30 14:51:35 +02:00
Orsiris de Jong	6a4b3701d0	Merge branch 'master' into no-resume	2017-05-30 14:50:21 +02:00
deajan	45cb042fa0	Added --no-resume option	2017-05-30 14:46:35 +02:00
deajan	5c60e7a9a2	WIP: conflict detection	2017-05-30 14:36:04 +02:00
deajan	a99a96e871	WIP: conflict detection	2017-05-30 14:35:44 +02:00
deajan	f98a9a0748	WIP: getting conflict list of files	2017-05-30 12:16:59 +02:00
deajan	b541a7c98e	WIP: detect conflict files	2017-05-30 11:14:11 +02:00
Orsiris de Jong	d587e49e67	Merge pull request #101 from deajan/fix_options ... Fix missing daemon subprocess options	2017-05-30 10:18:57 +02:00
Orsiris de Jong	a32314c720	Merge branch 'master' into fix_options	2017-05-30 10:18:48 +02:00
Orsiris de Jong	63834b5714	Merge pull request #100 from deajan/fix_options ... Fix missing options to daemon subprocess	2017-05-30 10:14:31 +02:00
deajan	520c20659f	Added missing options to subprocess in daemon mode	2017-05-30 10:12:28 +02:00
deajan	f962f86f30	Updated changelog	2017-05-30 10:09:19 +02:00
deajan	908c9af888	Added --log-conflicts option	2017-05-30 09:29:16 +02:00
deajan	0b442e2bcf	Updated work comments	2017-05-30 09:19:47 +02:00
deajan	a32b5f8321	Bumped version to next dev	2017-05-30 09:15:48 +02:00
deajan	2c1e688d8e	Bumped dev versions to rc	2017-05-30 09:11:00 +02:00
deajan	8f946cb476	Updated changelog	2017-05-30 09:10:26 +02:00
deajan	78dc39b86f	Change 23242 to	2017-05-30 09:09:25 +02:00
deajan	f8df6b8eab	Rebuilt targets	2017-05-29 16:54:02 +02:00
deajan	2b163d385b	KillChilds shoudln't allow a pid of 1 either	2017-05-29 16:53:43 +02:00
deajan	3174981b9a	Rebuilt targets	2017-05-29 15:14:00 +02:00
deajan	ab40ea64e2	Checking pid doesn't contain 0	2017-05-29 15:13:17 +02:00
deajan	ee8b213894	Rebuilt targets	2017-05-28 22:20:57 +02:00
deajan	11bd517982	Last fix for KillChilds pgrep issue on Mac	2017-05-28 22:20:41 +02:00
deajan	1400390f57	Rebuilt targets	2017-05-28 21:25:22 +02:00
deajan	c2b24688ef	Another fix in the wall	2017-05-28 21:25:03 +02:00
deajan	300108641a	Rebuilt targets	2017-05-28 20:17:57 +02:00
deajan	011a316f94	Added pid test in KillChilds	2017-05-28 20:17:38 +02:00
deajan	fe210877dc	Prevent possible recursive loop with bogus pgrep implementation	2017-05-28 13:37:12 +02:00
Orsiris de Jong	a740d9b63b	Added BSD license badge	2017-05-22 14:57:16 +02:00
deajan	623408bf31	Rebuilt targets	2017-05-22 11:19:23 +02:00
deajan	5677335c24	Removed WIP dev sleep command in treeList	2017-05-22 11:19:03 +02:00
deajan	722e366ade	Rebuilt targets	2017-05-22 09:32:50 +02:00
deajan	762fd236a0	Bumped version to dev again	2017-05-22 09:32:34 +02:00
deajan	1a85d5ded9	Added -q parameter to ssh to inhibate banners	2017-05-22 09:32:12 +02:00
deajan	8d99a74710	Updated xattr comment	2017-05-03 00:19:18 +02:00