From 4b6fcdaaedd86789e8212ca2af378f8ab1d27317 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 6 Oct 2019 00:19:35 +0200
Subject: Add shell aliases for common development and administration tasks

---
 user/modules/git.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'user/modules/git.nix')

diff --git a/user/modules/git.nix b/user/modules/git.nix
index 3c3f79bf..503b9e3f 100644
--- a/user/modules/git.nix
+++ b/user/modules/git.nix
@@ -53,7 +53,9 @@
       enable = true;
     };
     aliases = {
-      up = "merge FETCH_HEAD";
+      authors = "shortlog -s -n";
+      mup = "merge FETCH_HEAD";
+      rup = "rebase FETCH_HEAD";
       st = "status -sb";
       ci = "commit";
       br = "branch";
-- 
cgit 1.4.1