File tree Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change 3030 # ^^ also, 2 vs 3 dots: so important. https://stackoverflow.com/a/48681527
3131
3232 # squash unique commits from branch into one commit that keeps commit msgs.
33- squash = ! " commit_body=$( git log --graph --pretty=format:' %h (%>(16)%ad %an) %s' --abbrev-commit --date=human --no-color $( git diffbase) ..HEAD) && author_date=$( git log -1 --pretty=%aI HEAD) && git reset --soft $( git diffbase) && GIT_AUTHOR_DATE=\" $author_date \" git commit -m \" $commit_body \" "
33+ squash = ! " commit_body=$( git log --graph --pretty=format:' %h (%>(16)%ad %an) %s%+b ' --abbrev-commit --date=human --no-color $( git diffbase) ..HEAD) && author_date=$( git log -1 --pretty=%aI HEAD) && git reset --soft $( git diffbase) && GIT_AUTHOR_DATE=\" $author_date \" git commit -m \" $commit_body \" "
3434
3535 # I prefer these from my fish abbv's, but for bash we'll keep this as a fallback.
3636 db = diffbranch
You can’t perform that action at this time.
0 commit comments