Skip to content

Commit b2c39d7

Browse files
committed
Add git fixup helper
1 parent e15b231 commit b2c39d7

3 files changed

Lines changed: 23 additions & 1 deletion

File tree

bin/git-fixup

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/zsh
2+
3+
amount=${1:-10}
4+
array=(${(@f)"$(git --no-pager log -n $amount --pretty=format:%s)"})
5+
for (( i = 1; i <= $#array; i++ )) do
6+
key="$i"
7+
if [[ $#i == 1 ]]; then
8+
key=" $key"
9+
fi
10+
echo "$key $array[i]"
11+
done
12+
13+
local choice
14+
echo ""
15+
read "choice?Commit to fixup?: "
16+
if [[ "$choice" -le "0" ]]; then
17+
echo "No commit given.. Exiting."
18+
else
19+
local commits_back=$(($choice - 1))
20+
git commit --fixup HEAD~$commits_back
21+
fi

install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ln -nfs "$(pwd)/zsh/.zsh" "$HOME/.zsh"
99
ln -nfs "$(pwd)/.ruby-version" "$HOME/.ruby-version"
1010

1111
ln -nfs "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" "$HOME/.bin/sub"
12+
ln -nfs "$(pwd)/bin/git-fixup" "$HOME/.bin/git-fixup"
1213

1314
SUBLIME_DIR="$HOME/Library/Application Support/Sublime Text 2/Packages/User"
1415
ln -nfs "$(pwd)/sublime/Preferences.sublime-settings" "$SUBLIME_DIR/Preferences.sublime-settings"

zsh/.zsh/aliases.zsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ alias mou="open -a \"Mou.app\""
3434
# Git
3535
alias g="open -a gitx ."
3636
alias gs="git status -sb"
37-
alias gf="git commit --fixup"
37+
alias gf="git-fixup"
3838
alias gb="git branch"
3939
alias gc="git checkout"
4040
alias gm="git merge"

0 commit comments

Comments
 (0)