feat: cmergeでgit rev-parse --git-dirするようにする

Author: sevenc-nanashi

.gitconfig

@@ -38,8 +38,8 @@
 	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ >> .gitignore ;}; gi"
 	change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR  $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch  --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;};  f "
 	sync = !"f(){ git pull && git push; }; f"
-  cmerge = !"f(){ echo $1 > .git/cmerge; git merge $1 -m \"merge: $1 -> $(git rev-parse --abbrev-ref HEAD)\"; }; f"
-  ccmerge = !"f(){ git commit -am \"merge: $(cat .git/cmerge) -> $(git branch --show-current)\"; rm .git/cmerge; }; f"
+  cmerge = !"f(){ echo $1 > $(git rev-parse --git-dir)/cmerge; git merge $1 -m \"merge: $1 -> $(git rev-parse --abbrev-ref HEAD)\"; }; f"
+  ccmerge = !"f(){ git commit -am \"merge: $(cat $(git rev-parse --git-dir)/cmerge) -> $(git branch --show-current)\"; rm .git/cmerge; }; f"
   undo = reset --soft HEAD~1
   amend = "commit --amend --no-edit"
 [push]

nushell/config.nu

@@ -59,7 +59,6 @@ $env.config.keybindings ++= [{
     keycode: char_c
     event: [{ send: ViChangeMode mode: normal }]
 }]
-source $"($nu.home-path)/.cargo/env.nu"
 
 alias mr = mise run