diff options
| author | vg <vgm+dev@devys.org> | 2019-11-23 13:18:13 +0100 |
|---|---|---|
| committer | vg <vgm+dev@devys.org> | 2019-11-23 13:18:13 +0100 |
| commit | a0f6cf9ea9fc0ca36263001a20bf1d0e00987731 (patch) | |
| tree | 3e7c8ae0b2499e1fb8abdd367c6c54e977df29e6 | |
| parent | 6747e12f8f57b1c62308d3d509927f0af6f2498d (diff) | |
| download | scripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.tar.gz scripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.tar.bz2 scripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.zip | |
Rename git-sync to s/$/-noconflict/
Rename this command as their will be a new version failing in case of
conflict instead of duplicating conflicting files.
| -rwxr-xr-x | scripts/git-sync-noconflict (renamed from scripts/git-sync) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/git-sync b/scripts/git-sync-noconflict index e0117d7..e0117d7 100755 --- a/scripts/git-sync +++ b/scripts/git-sync-noconflict |