wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • bb760116e0 bump version, change readme master Dominik Schrempf 2020-02-23 12:07:31 +0100
  • f091625c61 update usage Dominik Schrempf 2020-02-23 12:04:00 +0100
  • 8395cf42d5 search directory only Dominik Schrempf 2020-02-23 12:00:03 +0100
  • ca8432153f change copyright Dominik Schrempf 2020-02-23 11:44:01 +0100
  • cfd35126f1 remove unused bold variable Dominik Schrempf 2020-02-23 11:03:52 +0100
  • 7acd52ecb5 sort options Dominik Schrempf 2020-02-23 10:46:49 +0100
  • dab6da3475 comment Dominik Schrempf 2020-02-23 10:46:44 +0100
  • 4d6103c54b
         Merge pull request #4 from marvinbernhardt/master Dominik Schrempf 2018-06-07 07:47:35 +0200
  • 46e829ca2b small change to help message marvinbernhardt 2018-06-06 21:05:25 +0200
  • a92ef9bacb added option to use find instead of locate marvinbernhardt 2018-06-06 20:58:19 +0200
  • 216f2a5c05 Cosmetic change. Dominik Schrempf 2018-05-30 19:27:07 +0200
  • 99eab5af39 Ignore recursive conflicts, handle them at the end. Dominik Schrempf 2018-05-30 19:18:13 +0200
  • 69128e9bb1 Change comments. Dominik Schrempf 2018-05-30 18:56:48 +0200
  • 13bfbd9d61 Improve help. Dominik Schrempf 2018-05-30 18:54:08 +0200
  • 333ae6e995 Shellcheck remove warnings. Dominik Schrempf 2018-05-30 18:53:27 +0200
  • f9676d9add Bump version. Dominik Schrempf 2018-05-30 18:51:25 +0200
  • 2974c341b3 Change sync-conflict regex pattern. Dominik Schrempf 2018-01-14 16:49:46 +0100
  • 447fe242f5 Typo; cosmetic changes. Dominik Schrempf 2017-05-12 22:20:07 +0100
  • c5172aadfe Merge pull request #3 from junkblocker/master Dominik Schrempf 2017-03-17 09:53:17 +0100
  • 38457954a1 Merge remote-tracking branch 'origin/patch-1' Manpreet Singh 2017-03-16 11:24:47 -0700
  • 62745fa37b Actually change the executable name and documentation Manpreet Singh 2017-03-16 11:23:38 -0700
  • 82633595b4 Fixed name shown to match actual script name Manpreet Singh 2017-03-16 10:39:20 -0700
  • 39b723a9b4 Merge pull request #1 from junkblocker/master Dominik Schrempf 2017-03-16 17:52:28 +0100
  • 33b59c99b2 Added support for Darwin, some interaction improvement, and style lint Manpreet Singh 2017-03-01 08:39:36 -0800
  • 64b7165669 Correct handling of recursive conflicts. Dominik Schrempf 2017-02-16 11:35:51 +0100
  • c75786682b Improve info in readme. Dominik Schrempf 2017-02-16 11:33:53 +0100
  • 0f52233489 Improve readme. Dominik Schrempf 2017-02-16 11:31:13 +0100
  • d193277014 Initial commit. Dominik Schrempf 2017-02-16 11:13:36 +0100
  • 1229d41f36 Initial commit Dominik Schrempf 2017-02-16 11:17:40 +0100