mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-08 02:31:18 -03:00
git_prompt: Display head for simple rebase
based on git.git 1306321: "prompt: fix for simple rebase"
This commit is contained in:
@@ -470,6 +470,7 @@ function __fish_git_prompt_operation_branch_bare --description "__fish_git_promp
|
|||||||
set step (cat $git_dir/rebase-apply/next ^/dev/null)
|
set step (cat $git_dir/rebase-apply/next ^/dev/null)
|
||||||
set total (cat $git_dir/rebase-apply/last ^/dev/null)
|
set total (cat $git_dir/rebase-apply/last ^/dev/null)
|
||||||
if test -f $git_dir/rebase-apply/rebasing
|
if test -f $git_dir/rebase-apply/rebasing
|
||||||
|
set branch (cat $git_dir/rebase-apply/head-name ^/dev/null)
|
||||||
set operation "|REBASE"
|
set operation "|REBASE"
|
||||||
else if test -f $git_dir/rebase-apply/applying
|
else if test -f $git_dir/rebase-apply/applying
|
||||||
set operation "|AM"
|
set operation "|AM"
|
||||||
|
|||||||
Reference in New Issue
Block a user