download
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revision | Next revisionBoth sides next revision | ||
download [2018/10/08 17:45] – oschuett | download [2018/12/10 12:41] – update instructions for new CP2K-with-DBCSR-submodule tmueller | ||
---|---|---|---|
Line 53: | Line 53: | ||
The code in Git is under constant development. Check the [[http:// | The code in Git is under constant development. Check the [[http:// | ||
</ | </ | ||
+ | |||
+ | The [[https:// | ||
+ | |||
+ | === Initial checkout === | ||
The latest and all prior versions are available from the [[https:// | The latest and all prior versions are available from the [[https:// | ||
Line 59: | Line 63: | ||
< | < | ||
- | git clone https:// | + | git clone --recursive |
</ | </ | ||
Line 65: | Line 69: | ||
< | < | ||
- | git clone -b support/ | + | git clone --recursive |
</ | </ | ||
- | Your clone of the Git repository | + | === Keeping your clone up-to-date |
+ | |||
+ | Set the following once on your CP2K Git clone. It will tell Git to automatically update included submodules as well and to always use rebase instead of merge. | ||
+ | |||
+ | < | ||
+ | cd cp2k | ||
+ | git config submodule.recurse true | ||
+ | git config pull.rebase true | ||
+ | </ | ||
+ | |||
+ | After setting this option, update with the following: | ||
< | < | ||
cd cp2k | cd cp2k | ||
Line 74: | Line 89: | ||
</ | </ | ||
- | The [[https:// | + | If you want to set the options globally |
+ | |||
+ | < | ||
+ | git config --global submodule.recurse true | ||
+ | git config --global pull.rebase true | ||
+ | </ | ||
+ | |||
+ | === Keeping your clone up-to-date (Git < 2.14) === | ||
+ | |||
+ | Set the following once on your CP2K Git clone. It will tell Git to always use rebase instead of merge. | ||
+ | |||
+ | < | ||
+ | cd cp2k | ||
+ | git config pull.rebase true | ||
+ | </ | ||
+ | |||
+ | After setting this option, update with the following: | ||
+ | |||
+ | < | ||
+ | cd cp2k | ||
+ | |||
+ | git pull | ||
+ | git submodule update --recursive | ||
+ | </ |
download.txt · Last modified: 2024/09/09 13:25 by oschuett