From 72869f2e3f36e7c93b3bd8190892c74cd8c1e418 Mon Sep 17 00:00:00 2001 From: Dana Sherson Date: Sun, 3 Dec 2023 11:54:12 +1300 Subject: [PATCH] WIP --- bin/git_commit_during_rebase | 2 +- bin/git_log_range | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/git_commit_during_rebase b/bin/git_commit_during_rebase index b2ef8e8..737811b 100755 --- a/bin/git_commit_during_rebase +++ b/bin/git_commit_during_rebase @@ -1,4 +1,4 @@ #!/usr/bin/env bash echo git_commit_during_rebase; -git_add_p && ( git_status_clean || git commit --no-edit --no-verify 2> /dev/null || ( git_find_sha HEAD && git commit --amend --no-edit --no-verify ) ) && ( git_status_clean || git_stash ) +git_add_p && ( git_status_clean || git commit --no-edit --no-verify 2> /dev/null || ( git commit --amend --no-edit --no-verify ) ) && ( git_status_clean || git_stash ) diff --git a/bin/git_log_range b/bin/git_log_range index deee922..9e7fe9f 100755 --- a/bin/git_log_range +++ b/bin/git_log_range @@ -2,5 +2,4 @@ from="$(git_branch_name "$1")"; to="$(git_branch_name ${2:-HEAD})"; - prefix="$3"; - [[ "$from" != "$(git_branch_name)" ]] && echo "$prefix$from".."$prefix$to" + [[ "$from" != "$(git_branch_name)" ]] && echo "$from".."$to"