diff --git a/modules/fish.nix b/modules/fish.nix index a9bea4ff..94f84bb0 100644 --- a/modules/fish.nix +++ b/modules/fish.nix @@ -43,6 +43,7 @@ gca = "git commit --amend"; gcl = "git clone"; gco = "git checkout"; + gcot = "git checkout --theirs"; gd = "git diff"; # Show all file changes not staged yet gds = "git diff --staged"; # Show changes staged but not committed gi = "git init";