From 361ffd42d7d0f6a3ab1c6a2345b2784b9381cb4d Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 3 Jul 2020 12:42:01 -0400 Subject: [PATCH] feat(gs/home): Make groc alias autostash Change-Id: I8ce5ca50d90ed092e92ea7c1c2eaf796e56659d4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/902 Reviewed-by: glittershark --- users/glittershark/system/home/modules/development.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index d5b7a60d3..d786154f6 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -150,7 +150,7 @@ with lib; "g" = "git"; "git" = "hub"; "grim" = "git fetch && git rebase -i origin/master"; - "groc" = "git fetch && git rebase origin/canon"; + "groc" = "git fetch && git rebase --autostash origin/canon"; "grc" = "git rebase --continue"; "gcan" = "git commit --amend --no-edit"; "grl" = "git reflog";