From: Oleg Broytman <phd@phdru.name>
Date: Tue, 16 May 2017 11:29:28 +0000 (+0300)
Subject: .gitconfig: Add ff and git aliases
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=761f73a4e79bbf4e28d975a8aa623d3d250bbe58;p=dotfiles.git

.gitconfig: Add ff and git aliases
---

diff --git a/.gitconfig b/.gitconfig
index 3860cb2..f5605cf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -148,6 +148,8 @@
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
+	ff = merge --ff-only
+	git = !git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate