wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20 Commits
1 Branch
0 Tags
426 KiB
Tag: Branch: Tree: a92ef9bacb
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a92ef9bacb'
${ noResults }
Commit Graph

20 Commits (a92ef9bacb4020a7da1813bdf4838f8b50c64dbc)
 

Author SHA1 Message Date
marvinbernhardt a92ef9bacb added option to use find instead of locate
8 years ago
Dominik Schrempf 216f2a5c05 Cosmetic change.
8 years ago
Dominik Schrempf 99eab5af39 Ignore recursive conflicts, handle them at the end.
8 years ago
Dominik Schrempf 69128e9bb1 Change comments.
8 years ago
Dominik Schrempf 13bfbd9d61 Improve help.
8 years ago
Dominik Schrempf 333ae6e995 Shellcheck remove warnings.
8 years ago
Dominik Schrempf f9676d9add Bump version.
8 years ago
Dominik Schrempf 2974c341b3 Change sync-conflict regex pattern.
8 years ago
Dominik Schrempf 447fe242f5 Typo; cosmetic changes.
9 years ago
Dominik Schrempf c5172aadfe Merge pull request #3 from junkblocker/master
9 years ago
Manpreet Singh 38457954a1 Merge remote-tracking branch 'origin/patch-1'
9 years ago
Manpreet Singh 62745fa37b Actually change the executable name and documentation
9 years ago
Manpreet Singh 82633595b4 Fixed name shown to match actual script name
9 years ago
Dominik Schrempf 39b723a9b4 Merge pull request #1 from junkblocker/master
9 years ago
Manpreet Singh 33b59c99b2 Added support for Darwin, some interaction improvement, and style lint
9 years ago
Dominik Schrempf 64b7165669 Correct handling of recursive conflicts.
9 years ago
Dominik Schrempf c75786682b Improve info in readme.
9 years ago
Dominik Schrempf 0f52233489 Improve readme.
9 years ago
Dominik Schrempf d193277014 Initial commit.
9 years ago
Dominik Schrempf 1229d41f36 Initial commit
9 years ago