frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

git: Use fast-forward-only merge by default

Browse Source 
Merge commits are nasty, so make sure they're only created explicitly
and never by default.

Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock 2021-11-23 11:16:08 +00:00
parent d771bf0448
commit 898190a99f
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/config
View File

@ -19,6 +19,8 @@
[pull] [pull]
rebase = true rebase = true
prune = true prune = true
[merge]
ff = only
[rebase] [rebase]
autoStash = true autoStash = true
[log] [log]