lloeki/dotfiles
1
0
Fork 0
mirror of https://github.com/lloeki/dotfiles.git synced 2025-12-06 07:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix subject on rebase

Browse source
This commit is contained in:
Loic Nageleisen 2014-04-17 10:17:39 +02:00
parent ca5b9f0754
commit 921092a052
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/git_prompt_info
View file

@ -128,7 +128,7 @@ __git_ps1_vars() {
branch=$(__git_ps1_branch) branch=$(__git_ps1_branch)
# evaluate action # evaluate action
[[ -d "$g/rebase-merge" ]] && rebase=1 merge=1 subject=$(__git_ps1_rebase_merge_head) [[ -d "$g/rebase-merge" ]] && rebase=1 merge=1 subject=$(__git_ps1_rebase_merge_head $g)
[[ $rebase -eq 1 && -f "$g/rebase-merge/interactive" ]] && interactive=1 merge=0 [[ $rebase -eq 1 && -f "$g/rebase-merge/interactive" ]] && interactive=1 merge=0
[[ -d "$g/rebase-apply" ]] && rebase=1 apply=1 [[ -d "$g/rebase-apply" ]] && rebase=1 apply=1
[[ $apply -eq 1 && -f "$g/rebase-apply/applying" ]] && rebase=0 [[ $apply -eq 1 && -f "$g/rebase-apply/applying" ]] && rebase=0