... | ... | @@ -13,6 +13,8 @@ git config --global rerere.enabled 1 # auto resolve of same conflicts on r |
|
|
```
|
|
|
For example, set up a shell script like [git-config-bartlettra.sh](https://github.com/trilinos/Trilinos/blob/develop/sampleScripts/git-profiles/git-config-bartlettra.sh) and run it on every new machine to set consistent git settings. The first two settings are required. The last three are recommended.
|
|
|
|
|
|
<a name="install_git_helper_scripts"/>
|
|
|
|
|
|
**2) Install Git helper scripts locally** for the Git shell prompt [git-prompt.sh](https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh) and Git tab completion [git-completion.bash](https://raw.github.com/git/git/master/contrib/completion/git-completion.bash), and add them to your shell, for example, setting the following in your `~/.bash_profile` file:
|
|
|
|
|
|
```
|
... | ... | |