extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-19 08:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

git: Cherry pick with --strategy-option theirs

Browse Source 
Makes things easier since resolving conflicts is no longer necessary.
This commit is contained in:
Donovan Glover 2023-07-18 12:22:00 -04:00
parent 380bf5983e
commit 8de3a2e4f2
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/fish.nix
View File

@ -46,7 +46,7 @@
gcl = "git clone"; gcl = "git clone";
gco = "git checkout"; gco = "git checkout";
gcot = "git checkout --theirs"; gcot = "git checkout --theirs";
gcp = "git cherry-pick"; gcp = "git cherry-pick --strategy-option theirs";
gd = "git diff"; gd = "git diff";
gds = "git diff --staged"; gds = "git diff --staged";
gf = "git fetch"; gf = "git fetch";