comparison .shell.d/50.vcs_functions.sh @ 195:e1a49db5c6ff

git-next-unmerged-file: also include "both modified" files
author Augie Fackler <durin42@gmail.com>
date Tue, 06 Apr 2010 15:07:46 -0500
parents efa2bfc73d2d
children a563c21235ad
comparison
equal deleted inserted replaced
194:cf3ba8f57434 195:e1a49db5c6ff
202 fi 202 fi
203 return 1 203 return 1
204 } 204 }
205 205
206 function git_next_unmerged_file() { 206 function git_next_unmerged_file() {
207 git status | grep unmerged | head -n 1 | sed 's/.*: //' 207 git status | egrep '(unmerged|both modified)' | head -n 1 | sed 's/.*: //'
208 } 208 }
209 alias git-next-unmerged-file=git_next_unmerged_file 209 alias git-next-unmerged-file=git_next_unmerged_file
210 210
211 # change to the root dir of the current wc 211 # change to the root dir of the current wc
212 function wcroot() { 212 function wcroot() {