bb760116e0
bump version, change readme
6 years ago
f091625c61
update usage
6 years ago
8395cf42d5
search directory only
6 years ago
ca8432153f
change copyright
6 years ago
cfd35126f1
remove unused bold variable
6 years ago
7acd52ecb5
sort options
6 years ago
dab6da3475
comment
6 years ago
4d6103c54b
Merge pull request #4 from marvinbernhardt/master
...
Added option to use find instead of locate
8 years ago
46e829ca2b
small change to help message
8 years ago
a92ef9bacb
added option to use find instead of locate
8 years ago
216f2a5c05
Cosmetic change.
8 years ago
99eab5af39
Ignore recursive conflicts, handle them at the end.
8 years ago
69128e9bb1
Change comments.
8 years ago
13bfbd9d61
Improve help.
8 years ago
333ae6e995
Shellcheck remove warnings.
8 years ago
f9676d9add
Bump version.
8 years ago
2974c341b3
Change sync-conflict regex pattern.
...
fln="FILENAME WITHOUT EXTENSION"
ext="EXTENSION"
The sync-conflict regex pattern has changed from
${fln}.sync-conflict-YYYYMMDD-HHMMSS.${ext}
to
${fln}.sync-conflict-YYYYMMDD-HHMMSS-XXXXXXX.${ext}
where XXXXXXX is some hash code.
8 years ago
447fe242f5
Typo; cosmetic changes.
9 years ago
c5172aadfe
Merge pull request #3 from junkblocker/master
...
Change name to remove .sh from the script
9 years ago
38457954a1
Merge remote-tracking branch 'origin/patch-1'
9 years ago
62745fa37b
Actually change the executable name and documentation
9 years ago
82633595b4
Fixed name shown to match actual script name
9 years ago
39b723a9b4
Merge pull request #1 from junkblocker/master
...
Added support for Darwin, some interaction improvement, and style lint
9 years ago
33b59c99b2
Added support for Darwin, some interaction improvement, and style lint
9 years ago
64b7165669
Correct handling of recursive conflicts.
9 years ago
c75786682b
Improve info in readme.
9 years ago
0f52233489
Improve readme.
9 years ago
d193277014
Initial commit.
9 years ago
1229d41f36
Initial commit
9 years ago
Dominik Schrempf
marvinbernhardt
Manpreet Singh