mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 06:58:01 +00:00
[git] Add git-squash function
This commit is contained in:
parent
da682405a1
commit
365a228b7f
26
modules/git/functions/git-squash
Normal file
26
modules/git/functions/git-squash
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#
|
||||||
|
# Performs a "dirty" squash
|
||||||
|
#
|
||||||
|
# Authors:
|
||||||
|
# Daniel Carrillo <daniel.carrillo@gmail.com>
|
||||||
|
#
|
||||||
|
|
||||||
|
# function git-squash {
|
||||||
|
|
||||||
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
|
return 1
|
||||||
|
elif [ -z "$2" ]; then
|
||||||
|
print "Usage: $0 <base branch> \"commit message\"" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local bbranch=$1
|
||||||
|
local message=$2
|
||||||
|
local cbranch=$(git branch --show-current)
|
||||||
|
|
||||||
|
git reset $(git merge-base $bbranch $cbranch)
|
||||||
|
git add -A
|
||||||
|
git commit -m "$message"
|
||||||
|
|
||||||
|
# }
|
Loading…
Reference in New Issue
Block a user