From d8701f7e21a3fbace39778356b8059250a40a994 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 28 Aug 2020 11:08:22 -0400 Subject: feat(gs/home): Alias grom = git rebase origin/master Change-Id: I8dfc3efc393dd5a3a3ad20cfb84969a8d8805f87 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1865 Reviewed-by: glittershark Tested-by: BuildkiteCI --- users/glittershark/system/home/modules/development.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index 4e34bcfb0f..5dd7337982 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"; -- cgit 1.4.1