diff --git a/bin/git-unfuck b/bin/git-unfuck new file mode 100755 index 0000000..fc3aea4 --- /dev/null +++ b/bin/git-unfuck @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +git log -1 --format="%h - %an, %ar : %s" +git reset HEAD~1 --soft diff --git a/bin/upd b/bin/upd deleted file mode 100755 index 317dc93..0000000 --- a/bin/upd +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -upd_fname=upd.sh -upd_scripts=( - "$HOME/org" - "$HOME/Documents/Obsidian" -) - -for path in "${upd_scripts[@]}"; do - echo -e "\e[32m====== $path\e[0m" - cd "$path" || exit 1 - "$path"/"$upd_fname" || exit 1 -done diff --git a/gitconfig b/gitconfig index 7e6d36a..4436bda 100644 --- a/gitconfig +++ b/gitconfig @@ -25,7 +25,7 @@ st = status -sb cm = commit -m sw = switch - unfuck = reset HEAD~1 --soft + unfuck = !git-unfuck main = !git switch master 2>/dev/null || git switch main [interactive]