Permalink
Browse files

fix rv

  • Loading branch information...
1 parent bf0bccb commit 90014e23ce49b5d392720407a7a74da56f48d475 @orefalo committed Jan 24, 2014
Showing with 11 additions and 8 deletions.
  1. +11 −8 fish/g2.fish
View
19 fish/g2.fish
@@ -820,14 +820,7 @@ function __g2_sync --argument-names flag
end
set -l branch (command git rev-parse --symbolic-full-name --abbrev-ref HEAD)
-
- # count the number of changes in/out
- #set -l tmpfile "/tmp/delta$RANDOM"
-
set -l count (command git rev-list --left-right --count "$branch...$remote" -- ^/dev/null |tr \t \n)
-
-
- # command git rev-list --left-right "$branch...$remote" -- ^ /dev/null > "$tmpfile"
set -l lchg $count[1]
set -l rchg $count[2]
@@ -854,6 +847,16 @@ function __g2_sync --argument-names flag
return 0;
end
+function __g2_rv
+
+ command git rev-parse; or return 1
+ __g2_iswip; or return 1
+ __g2_isdirty; or return 1
+
+ command git revert $argv
+
+end
+
function __g2_mg
command git rev-parse; or return 1
@@ -1164,4 +1167,4 @@ end
set GIT_EXE (which git)
test ! "$GIT_EXE"; and __g2_fatal "Sorry, git is a required G2 dependency and must be in the PATH"
-set -x GIT_EXE
+set -x GIT_EXE

0 comments on commit 90014e2

Please sign in to comment.