Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update git-sync for simple merge cases | vg | 2019-11-25 | 1 | -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 conflicts | vg | 2019-11-23 | 1 | -0/+27 |
| | |||||
* | Rename git-sync to s/$/-noconflict/ | vg | 2019-11-23 | 1 | -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 detection | vg | 2019-07-20 | 1 | -1/+1 |
| | |||||
* | let the hostident be easily modifiable | vg | 2018-02-17 | 1 | -3/+5 |
| | |||||
* | be less verbose by default for git-sync | vg | 2018-02-17 | 1 | -7/+18 |
| | |||||
* | fix git-sync with better status | vg | 2018-02-16 | 1 | -2/+4 |
| | |||||
* | shorter output with git-sync | vg | 2018-02-16 | 1 | -3/+7 |
| | |||||
* | add more scripts | VG | 2017-05-11 | 1 | -0/+74 |