diff options
| author | Toby Vincent <tobyv13@gmail.com> | 2022-07-14 11:12:20 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv13@gmail.com> | 2022-07-14 11:12:20 -0500 |
| commit | a12c0e398a492051dec0f33075ead60eeca8abb3 (patch) | |
| tree | 456ac8d50da3e2f774f41b84babe2e1bc78439e2 /git/.gitconfig | |
| parent | 7bf2b9b5ae772da7db2d2e2e03ef65622846fed3 (diff) | |
feat(git): only allow fast-forward when merging
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index cf81f16..9521860 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -23,7 +23,7 @@ defaultBranch = main rebase = true [merge] -ff = no +ff = only [fetch] prune = true |