lxsameer
/
my.zsh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add two new git functions for 'fixup' and 'show' using filter

This commit is contained in:
Sameer Rahmani 2022-11-24 11:04:03 +00:00
parent 7e617143c1
commit 93542a3506
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/git.zsh
View File

@ -155,11 +155,19 @@ function git_reset_branch_commits() {
git reset $(git merge-base $1 $(git branch --show-current))
}
function git-uncommit() {
function git_uncommit() {
git reset --soft HEAD~1
git restore --staged .
}
function git_show_filter() {
git show $(g log --pretty=format:"%h %an %ad %s" origin/HEAD..HEAD |filter|cut -d ' ' -f 1 |xargs)
}
function git_fixup() {
git commit "$1" --fixup $(g log --pretty=format:"%h %an %ad %s" origin/HEAD..HEAD |filter|cut -d ' ' -f 1 |xargs)
}
#this is unlikely to change so make it all statically assigned
POST_1_7_2_GIT=$(git_compare_version "1.7.2")
#clean up the namespace slightly by removing the checker function