From acab0a57d257a5b720a9abd70b68b6215c8d867b Mon Sep 17 00:00:00 2001
From: Alpha Chen <alpha.chen@gmail.com>
Date: Tue, 30 Jun 2015 08:22:03 -0700
Subject: [PATCH] [git] Add `push --force-with-lease` alias, remove unused
 aliases, set autosquash on rebasing

---
 .gitconfig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 084a299..57a7604 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,17 +11,18 @@
 	pager = less -S
 [alias]
 	; hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-	co = checkout
+	; co = checkout
 	g = grep --break --heading --line-number
 	standup = "!git log --all --date=short --no-merges --pretty=format:\"%h %ad %s%d\" --since=1.weeks --author=`git config user.email`"
 	; ready = rebase -i @{u}
-	ready = rebase -i develop
+	; ready = rebase -i develop
 	lol = log --graph --decorate --pretty=oneline --abbrev-commit
 	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
 	; ancestor = merge-base
 	s = status -sb
 	latest = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)'
 	root = !pwd
+	push-f = push --force-with-lease
 [difftool]
 	prompt = false
 [difftool "sourcetree"]
@@ -57,3 +58,5 @@
 	prune = true
 [tag]
 	sort = version:refname
+[rebase]
+	autosquash = true