diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-11-18 13:14:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-11-18 13:14:20 +0300 |
| commit | 47a583533d796f304e0e58c9d6d0db36e24806a4 (patch) | |
| tree | cbf619e7846a5d5fef7f500e21090855ab15a3fe /git.sh | |
| parent | 97317bd2a3452b1602b982e918357248953dd64d (diff) | |
| download | all-47a583533d796f304e0e58c9d6d0db36e24806a4.tar.gz all-47a583533d796f304e0e58c9d6d0db36e24806a4.tar.bz2 all-47a583533d796f304e0e58c9d6d0db36e24806a4.tar.xz all-47a583533d796f304e0e58c9d6d0db36e24806a4.zip | |
Use git-reset after pulling from server-code branch.
This will prevent merge conflicts with rebased code.
Diffstat (limited to 'git.sh')
0 files changed, 0 insertions, 0 deletions