diff --git a/lib/git.zsh b/lib/git.zsh index bed17df..c9c51da 100755 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -151,7 +151,7 @@ function git_commits_from() { git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative $1..$(git branch --show-current) } -function reset_branch_commits() { +function git_reset_branch_commits() { git reset $(git merge-base $1 $(git branch --show-current)) }