about summary refs log tree commit diff
path: root/users/glittershark/system
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-08-28T15·08-0400
committerglittershark <grfn@gws.fyi>2020-08-28T21·24+0000
commitd8701f7e21a3fbace39778356b8059250a40a994 (patch)
treeb275ac6c2f2eb1ec35e5bf67ecec484c2cf71cba /users/glittershark/system
parenta7cd92770d3d2f35ae04713fb5e245536a1a95e9 (diff)
feat(gs/home): Alias grom = git rebase origin/master r/1729
Change-Id: I8dfc3efc393dd5a3a3ad20cfb84969a8d8805f87
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1865
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/system')
-rw-r--r--users/glittershark/system/home/modules/development.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix
index 4e34bcfb0f61..5dd73379824b 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/glittershark/system/home/modules/development.nix
@@ -158,7 +158,8 @@ with lib;
       "gnp" = "git --no-pager";
       "g" = "git";
       "git" = "hub";
-      "grim" = "git fetch && git rebase -i origin/master";
+      "grim" = "git fetch && git rebase -i --autostash origin/master";
+      "grom" = "git fetch && git rebase --autostash origin/master";
       "groc" = "git fetch && git rebase --autostash origin/canon";
       "grc" = "git rebase --continue";
       "gcan" = "git commit --amend --no-edit";