diff --git a/modules/fish.nix b/modules/fish.nix index e20cbf84..940c4f91 100644 --- a/modules/fish.nix +++ b/modules/fish.nix @@ -47,6 +47,7 @@ gco = "git checkout"; gcot = "git checkout --theirs"; gcp = "git cherry-pick --strategy-option theirs"; + gcpx = "git cherry-pick --strategy-option theirs -x"; gd = "git diff"; gds = "git diff --staged"; gf = "git fetch";