summary refs log tree commit diff stats
path: root/user/modules/git.nix
diff options
context:
space:
mode:
authorAlan Pearce2019-10-06 00:19:35 +0200
committerAlan Pearce2019-10-06 02:25:24 +0200
commit4b6fcdaaedd86789e8212ca2af378f8ab1d27317 (patch)
treef03a51b0d75d294dc896c92735ca80abefd20827 /user/modules/git.nix
parent2649bcb16beb51345f0ca8fe790fb47ad0513882 (diff)
downloadnixfiles-4b6fcdaaedd86789e8212ca2af378f8ab1d27317.tar.lz
nixfiles-4b6fcdaaedd86789e8212ca2af378f8ab1d27317.tar.zst
nixfiles-4b6fcdaaedd86789e8212ca2af378f8ab1d27317.zip
Add shell aliases for common development and administration tasks
Diffstat (limited to 'user/modules/git.nix')
-rw-r--r--user/modules/git.nix4
1 files changed, 3 insertions, 1 deletions
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";