Skip to content

Commit 6a14cf0

Browse files
committed
Set project-wide git configuration for pull and merge to ff=only
1 parent 641fbfd commit 6a14cf0

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
@@ -23,6 +23,8 @@ else
2323
git config --global init.defaultBranch "master"
2424
git config --global --add safe.directory "${PROJ_DIR}"
2525
git config --global --add safe.directory "${PROJ_DIR}/.git"
26+
git config --global pull.ff only
27+
git config --global merge.ff only
2628
git config --list
2729

2830
test-exists "${PROJ_DIR}/.gitconfig"

0 commit comments

Comments
 (0)