mirror of
https://github.com/ivabus/dotfiles
synced 2024-11-24 17:15:08 +03:00
Add merge config
This commit is contained in:
parent
64fffd21bc
commit
b53d1fb20f
1 changed files with 1 additions and 0 deletions
|
@ -34,6 +34,7 @@ echo "\n${RED}Git configured with:$DEFAULTC"
|
||||||
echo "${GREEN}user.name: ${DEFAULTC}$GITNAME"
|
echo "${GREEN}user.name: ${DEFAULTC}$GITNAME"
|
||||||
echo "${GREEN}user.email: ${DEFAULTC}$GITEMAIL"
|
echo "${GREEN}user.email: ${DEFAULTC}$GITEMAIL"
|
||||||
echo "${GREEN}core.editor: ${DEFAULTC}$GITEDITOR"
|
echo "${GREEN}core.editor: ${DEFAULTC}$GITEDITOR"
|
||||||
|
echo "${GREEN}pull.rebase: ${DEFAULTC}false (merge)"
|
||||||
if [[ $answer = [Yy] ]]
|
if [[ $answer = [Yy] ]]
|
||||||
then
|
then
|
||||||
echo "${GREEN}commit.codesign: ${DEFAULTC}true"
|
echo "${GREEN}commit.codesign: ${DEFAULTC}true"
|
||||||
|
|
Loading…
Reference in a new issue