diff options
| author |  Brian Gernhardt <brian@gernhardtsoftware.com> | 2013-07-03 01:06:52 -0400 |
|---|---|---|
| committer | Brian Gernhardt <brian@gernhardtsoftware.com> | 2013-07-26 22:05:06 -0400 |
| commit | 8642a1e68ea4e5f417d5d7d243299050cbf40681 (patch) | |
| tree | 7f1c46940cf12de1a7d41d1e33db0e9b4b5299d7 /share/functions/__fish_git_prompt.fish | |
| parent | ec1d2e86c81c80c03a45136827a50791de363726 (diff) | |
git_prompt: Display head for simple rebase
based on git.git 1306321: "prompt: fix for simple rebase"
Diffstat (limited to 'share/functions/__fish_git_prompt.fish')
| -rw-r--r-- | share/functions/__fish_git_prompt.fish | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 17c813b5..963b29ec 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -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 total (cat $git_dir/rebase-apply/last ^/dev/null) if test -f $git_dir/rebase-apply/rebasing + set branch (cat $git_dir/rebase-apply/head-name ^/dev/null) set operation "|REBASE" else if test -f $git_dir/rebase-apply/applying set operation "|AM" |