Mercurial > dotfiles

changeset 195:e1a49db5c6ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cf3ba8f57434
children 4481fb6c3dfe
files .shell.d/50.vcs_functions.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.shell.d/50.vcs_functions.sh
+++ b/.shell.d/50.vcs_functions.sh
@@ -204,7 +204,7 @@ function vcs_current_branch() {
 }
 
 function git_next_unmerged_file() {
-  git status | grep unmerged | head -n 1 | sed 's/.*:   //'
+  git status | egrep '(unmerged|both modified)' | head -n 1 | sed 's/.*:   //'
 }
 alias git-next-unmerged-file=git_next_unmerged_file