voronind/nix
0
0
Fork 0
Code Issues 40 Pull requests Packages Projects Releases Wiki Activity

Git : Make git_resign specify commit count.

Browse source
This commit is contained in:
Dmitry Voronin 2024-04-10 11:42:01 +03:00
parent 6c910177df
commit 3be989de7d
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
module/common/bash/module/Git.nix
View file

@ -131,12 +131,12 @@
function gr() { function gr() {
local base="''${1}" local base="''${1}"
# rebase last 2 commits by default. # Rebase last 2 commits by default.
if [[ "''${base}" = "" ]]; then if [[ "''${base}" = "" ]]; then
base="2" base="2"
fi fi
# if 0, rebase from root. else from specified base. # If 0, rebase from root. else from specified base.
if [[ "''${base}" = "0" ]]; then if [[ "''${base}" = "0" ]]; then
git rebase -i --root git rebase -i --root
else else
@ -195,9 +195,22 @@
open "''${url}" open "''${url}"
} }
# Resign all the old commits. # Resign the old commits. 0 to resign from root.
# Usage: git_resign [COMMIT_COUNT]
function git_resign() { function git_resign() {
git rebase --exec 'git commit --amend --no-edit -n -S' -i --root local base="''${1}"
# Resign last commit by default.
if [[ "''${base}" = "" ]]; then
base="1"
fi
# If 0, rebase from root. else from specified base.
if [[ "''${base}" = "0" ]]; then
git rebase --exec 'git commit --amend --no-edit -n -S' -i --root
else
git rebase --exec 'git commit --amend --no-edit -n -S' -i HEAD~''${base}
fi
} }
# Show current branch. # Show current branch.