Commit Graph

1342 Commits (5bc77dfe76047772afc2381fce2d643c93464e89)
 

Author SHA1 Message Date
deajan 84a108dd41 Rebuilt targets 7 years ago
deajan d0d7be40c3 Added --dry support for conflict list 7 years ago
deajan 7a24cf49cd Implemented --alert-conflicts options 7 years ago
deajan be3b3d39b6 Added error handling to conflict list functions 7 years ago
deajan 11408d2de0 Add more locale exports 7 years ago
deajan 7260d43416 Improved conflict list work 7 years ago
deajan 1d7cb5be53 Multiple file list fixes 7 years ago
deajan b4f1bd37ea Rebuilt targets 7 years ago
deajan 2b786abc6a Some comment removal 7 years ago
deajan bd6b1a60e8 Rebuilt targets 7 years ago
deajan 967ce33977 WIP: conflict list 7 years ago
deajan 37ca73a6f9 moved unfortunate comment placement 7 years ago
deajan 9e1c3c2a65 WIP: conflict list 7 years ago
deajan 862a6fd235 Fixed some more typo 7 years ago
deajan 83fd33bf78 WIP: conflict list 7 years ago
deajan 99b606fef8 WIP: conflict list 7 years ago
deajan b0307fd555 Another typo fix 7 years ago
deajan eb73d49c69 Typo fixing 7 years ago
deajan d91230e22f WIP: conflict list 7 years ago
deajan 825e051e3b WIP: conflict list 7 years ago
deajan a7ceea1dac WIP: conflict list 7 years ago
Orsiris de Jong 3ff8a123e1 Merge pull request #103 from deajan/no-resume
Added --no-resume option
7 years ago
Orsiris de Jong 6a4b3701d0 Merge branch 'master' into no-resume 7 years ago
deajan 45cb042fa0 Added --no-resume option 7 years ago
deajan 5c60e7a9a2 WIP: conflict detection 7 years ago
deajan a99a96e871 WIP: conflict detection 7 years ago
deajan f98a9a0748 WIP: getting conflict list of files 7 years ago
deajan b541a7c98e WIP: detect conflict files 7 years ago
Orsiris de Jong d587e49e67 Merge pull request #101 from deajan/fix_options
Fix missing daemon subprocess options
7 years ago
Orsiris de Jong a32314c720 Merge branch 'master' into fix_options 7 years ago
Orsiris de Jong 63834b5714 Merge pull request #100 from deajan/fix_options
Fix missing options to daemon subprocess
7 years ago
deajan 520c20659f Added missing options to subprocess in daemon mode 7 years ago
deajan f962f86f30 Updated changelog 7 years ago
deajan 908c9af888 Added --log-conflicts option 7 years ago
deajan 0b442e2bcf Updated work comments 7 years ago
deajan a32b5f8321 Bumped version to next dev 7 years ago
deajan 2c1e688d8e Bumped dev versions to rc 7 years ago
deajan 8f946cb476 Updated changelog 7 years ago
deajan 78dc39b86f Change 23242 to 7 years ago
deajan f8df6b8eab Rebuilt targets 7 years ago
deajan 2b163d385b KillChilds shoudln't allow a pid of 1 either 7 years ago
deajan 3174981b9a Rebuilt targets 7 years ago
deajan ab40ea64e2 Checking pid doesn't contain 0 7 years ago
deajan ee8b213894 Rebuilt targets 7 years ago
deajan 11bd517982 Last fix for KillChilds pgrep issue on Mac 7 years ago
deajan 1400390f57 Rebuilt targets 7 years ago
deajan c2b24688ef Another fix in the wall 7 years ago
deajan 300108641a Rebuilt targets 7 years ago
deajan 011a316f94 Added pid test in KillChilds 7 years ago
deajan fe210877dc Prevent possible recursive loop with bogus pgrep implementation 7 years ago