diff --git a/README.md b/README.md index a9898ab..2bcea1f 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ bat git-delta fd rg +fzf ``` ### Useful diff --git a/git/configs/alias.gitconfig b/git/configs/alias.gitconfig new file mode 100644 index 0000000..444d05b --- /dev/null +++ b/git/configs/alias.gitconfig @@ -0,0 +1,2 @@ +[alias] + fixup = "!f() { TARGET=$(git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 ); git commit --fixup=$TARGET ${@:2} && GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f" diff --git a/git/configs/common.gitconfig b/git/configs/common.gitconfig index 9f0da52..f1cc3a7 100644 --- a/git/configs/common.gitconfig +++ b/git/configs/common.gitconfig @@ -1,6 +1,7 @@ [include] path = ~/.dotfiles/git/configs/lfs.gitconfig path = ~/.dotfiles/git/configs/delta.gitconfig + path = ~/.dotfiles/git/configs/alias.gitconfig [push] default = simple