diff options
| author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2011-12-07 17:00:14 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2011-12-07 17:00:14 +0100 |
| commit | aff013430e60b5f20ece4cb43bf8eb9620e53fc4 (patch) | |
| tree | d812e36c82f2cde94a6e32af361fe01cbfb1bca3 | |
| parent | 953e6e10a521c16dcadabb5bfcfda12d4d6cf559 (diff) | |
| parent | 8aa376c9d0a9762b62c9e9ee09737ad37191cbf6 (diff) | |
Merge commit '8aa376c9d0a97'
| -rw-r--r-- | 01_Functions.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh index 8078203..f781358 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -195,7 +195,7 @@ get_git_branch () if [ "$REBASE_DIR" = "$GIT_DIR/rebase-merge" ] then current=$(< $REBASE_DIR/done wc -l) - last=$(( $current + $(< $REBASE_DIR/git rebase-todo grep -v "^#\|^[[:blank:]]*$" | wc -l) )) + last=$(( $current + $(< $REBASE_DIR/git-rebase-todo grep -v "^#\|^[[:blank:]]*$" | wc -l) )) rebase=$rebase$rebase_in_progress": " else current=$(cat $REBASE_DIR/next) |