From fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Sun, 11 Feb 2018 16:43:28 +0700 Subject: rebase: introduce and use pseudo-ref REBASE_HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new command `git rebase --show-current-patch` is useful for seeing the commit related to the current rebase state. Some however may find the "git show" command behind it too limiting. You may want to increase context lines, do a diff that ignores whitespaces... For these advanced use cases, the user can execute any command they want with the new pseudo ref REBASE_HEAD. This also helps show where the stopped commit is from, which is hard to see from the previous patch which implements --show-current-patch. Helped-by: Tim Landscheidt Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index 41c915d18c..a13a581fe6 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -182,6 +182,7 @@ You can run "git stash pop" or "git stash drop" at any time. } finish_rebase () { + rm -f "$(git rev-parse --git-path REBASE_HEAD)" apply_autostash && { git gc --auto || true; } && rm -rf "$state_dir" -- cgit v1.3