dotfiles

commit 791f96ee4bcecd4bbe8d5c945a71aa81e0ee5089
parent 46e19f16ec4908da4672f168fb3e31883eb20900
Author: hhvn <hayden@haydenvh.com>
Date:   Tue, 19 Jan 2021 18:37:57 +0000

.config/git/config: always use --no-ff in merges

Diffstat:
M
.config/git/config
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.config/git/config b/.config/git/config
@@ -8,3 +8,4 @@
 
 [alias]
 	hist = !sh ~/.config/git/hist
+	mrg = merge --no-ff