377
edits
No edit summary |
No edit summary |
||
Line 64: | Line 64: | ||
make -j2 && make install | make -j2 && make install | ||
:::::::::: --[[User:Flughund|Flughund]] ([[User talk:Flughund|talk]]) 05:40, 8 October 2017 (EDT) | :::::::::: --[[User:Flughund|Flughund]] ([[User talk:Flughund|talk]]) 05:40, 8 October 2017 (EDT) | ||
::::::::::: Well, there are a few lines but I don't find it much worse than the svn way. The line with 'git add' can be shortened like this: | |||
git commit -am 'Increase tiny version to 6.' | |||
::::::::::: (-a adds all modified files that Git wasn't told to ignore) | |||
::::::::::: Also, this commit is no more necessary than with svn, where you don't commit the change... But with the commit, the repo can be updated with: | |||
git pull --rebase | |||
::::::::::: which automatically reapplies your commit on top of the updated origin/master. So, it's nice to have. Otherwise, without the commit, the repo would have to be updated with something like: | |||
git reset --hard && git pull | |||
echo "1.8.6" > version | |||
sed s/PLIB_TINY_VERSION\ \ 5/PLIB_TINY_VERSION\ \ 6/ -i src/util/ul.h | |||
::::::::::: or more elegantly: | |||
git stash save Update-tiny-version-number-to-6 # Or simply 'git stash' | |||
git pull | |||
git stash pop | |||
::::::::::: Also, in my FG build script I use 'make -j$(nproc)' to avoid hardcoding the number of parallel jobs. | |||
::::::::::: --[[User:Rominet|Rominet]] ([[User talk:Rominet|talk]]) 06:14, 8 October 2017 (EDT) |
edits