Permalink
Browse files

Add CHERRY-PICKING interactive state

  • Loading branch information...
1 parent e18c789 commit 16b10f0523245108bb511ddc27b4fa58badc1cad @dahlbyk dahlbyk committed Apr 21, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 GitUtils.ps1
View
@@ -37,6 +37,9 @@ function Get-GitBranch($gitDir = $(Get-GitDirectory), [Diagnostics.Stopwatch]$sw
} elseif (Test-Path $gitDir\MERGE_HEAD) {
dbg 'Found MERGE_HEAD' $sw
$r = '|MERGING'
+ } elseif (Test-Path $gitDir\CHERRY_PICK_HEAD) {
+ dbg 'Found CHERRY_PICK_HEAD' $sw
+ $r = '|CHERRY-PICKING'
} elseif (Test-Path $gitDir\BISECT_LOG) {
dbg 'Found BISECT_LOG' $sw
$r = '|BISECTING'

0 comments on commit 16b10f0

Please sign in to comment.