aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/git-sync
Commit message (Collapse)AuthorAgeFilesLines
* update git-sync for simple merge casesvg2019-11-251-1/+6
| | | | | | | Instead of using git merge --no-ff which always ensure no conflict, try to git merge covering simple cases (and automatically resolvable ones) at the cost of a merge commit but abort in case of conflicts needing manuable resolution.
* new git-sync version failing in case of conflictsvg2019-11-231-0/+27
|
* Rename git-sync to s/$/-noconflict/vg2019-11-231-93/+0
| | | | | Rename this command as their will be a new version failing in case of conflict instead of duplicating conflicting files.
* modify git-sync to simpler and one-command change detectionvg2019-07-201-1/+1
|
* let the hostident be easily modifiablevg2018-02-171-3/+5
|
* be less verbose by default for git-syncvg2018-02-171-7/+18
|
* fix git-sync with better statusvg2018-02-161-2/+4
|
* shorter output with git-syncvg2018-02-161-3/+7
|
* add more scriptsVG2017-05-111-0/+74