Skip to content

Commit 6add0dc

Browse files
committed
Set tests global git configuration for pull and merge to ff=only
1 parent 3cbc0cb commit 6add0dc

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

test/00-git-config.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ git config --global user.name "Your Name"
1515
git config --global init.defaultBranch "master"
1616
git config --global --add safe.directory "$(pwd)"
1717
git config --global --add safe.directory "$(pwd)/.git"
18+
git config --global pull.ff only
19+
git config --global merge.ff only
1820
git config --list
1921

2022
test-exists "${HOME}/.gitconfig"

0 commit comments

Comments
 (0)