From ae0f9b94f89fba8f11b1e31332792f47a7af043b Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Thu, 28 Apr 2016 15:19:58 -0500
Subject: [PATCH] add some useful rebasing git aliases

---
 git/gitconfig.symlink | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 2762d32..5ae0ac7 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -19,6 +19,10 @@
     ss  = status
     br = branch -v
 
+    # rebase commands
+    cont = rebase --continue
+    conf = "!git s | grep ^U"
+
     l = log --graph --pretty=format:'%Cred%h%Creset %C(bold blue)%an%C(reset) - %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 
     # show what I did today
@@ -34,6 +38,9 @@
     # show all deleted files in the repo
     deleted = "!git log --diff-filter=D --summary | grep delete"
 
+    # create an empty commit
+    empty = commit --allow-empty
+
     # current branch
     cbr = rev-parse --abbrev-ref HEAD