From a7c6e3b828a518361336bea6344eca0e63b37243 Mon Sep 17 00:00:00 2001
From: TheK4n <djvlad967891@gmail.com>
Date: Wed, 8 Mar 2023 17:06:39 +0300
Subject: [PATCH] ref gitconfig

---
 home/user/.gitconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home/user/.gitconfig b/home/user/.gitconfig
index b9db6d4..fbcf472 100644
--- a/home/user/.gitconfig
+++ b/home/user/.gitconfig
@@ -35,22 +35,22 @@
     bm = branch --merged
     bn = branch --no-merged
     hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all --color=always
-    df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
     hs = "!git hist | head"
+    df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
     llog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
     open = "!hub browse"
     type = cat-file -t
     dump = cat-file -p
     find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
-    unstage = 'reset HEAD --'
+    unstage = "reset HEAD --"
     last = log -1 HEAD
     branches = branch -avv --list
 
     # edit conflicted file on merge
-    edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
+    edit-unmerged = "!$EDITOR $(git ls-files --unmerged | cut -f2 | sort -u)"
 
     # add conflicted file on merge
-    add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
+    add-unmerged = "!git add $(git ls-files --unmerged | cut -f2 | sort -u)"
 
 [github]
     user = "TheK4n"