mirror of
https://codeberg.org/kiss-community/repo
synced 2024-12-23 07:40:11 -07:00
18 lines
394 B
Plaintext
18 lines
394 B
Plaintext
|
#!/bin/sh
|
||
|
|
|
||
|
|
cat <<EOF
|
||
|
|
|
||
|
|
NOTE: Updates will now show a warning from Git about
|
||
|
|
the merge strategy. Simply set the desired merge strategy
|
||
|
|
and the warning will disappear.
|
||
|
|
|
||
|
|
Examples:
|
||
|
|
|
||
|
|
git config pull.rebase false # merge (the default strategy)
|
||
|
|
git config pull.rebase true # rebase
|
||
|
|
git config pull.ff only # fast-forward only
|
||
|
|
|
||
|
|
TIP: --global can be used to set this user-wide.
|
||
|
|
|
||
|
|
EOF
|