diff --git a/lib/git/repo_index.sh b/lib/git/repo_index.sh
index 1589ad2..f3d616c 100644
--- a/lib/git/repo_index.sh
+++ b/lib/git/repo_index.sh
@@ -167,7 +167,7 @@ function _git_index_count() {
 
 # Returns the current git branch (returns nothing if not a git repository)
 parse_git_branch() {
-  \git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
+  \git branch 2> /dev/null | sed "s/^\* \([^ ]*\)/\1/;tm;d;:m"
 }
 
 # If the working directory is clean, update the git repository. Otherwise, show changes.
diff --git a/lib/git/tools.sh b/lib/git/tools.sh
index c12f628..cb45e2c 100644
--- a/lib/git/tools.sh
+++ b/lib/git/tools.sh
@@ -128,20 +128,50 @@ fi
 update_travis_ci_status() {
   if [ -e ".travis.yml" ]; then
     if type ruby > /dev/null 2>&1 && type travis-ci > /dev/null 2>&1; then
-      # Use repo from origin remote
-      local branches=$(git branch -a | sed "s/ *remotes\/origin\///;tm;d;:m;/^HEAD/d;")
       local stat_file=".travis_status~"
-      echo -n > "$stat_file"
+      local tmp_stat_file="$stat_file"".tmp"
+
+      # Either update all branches, or only current branch
+      if [ "$UPDATE_ALL_BRANCHES" = "true" ]; then
+        # All branches on origin remotes
+        local branches="$(git branch -a | sed "s/ *remotes\/origin\///;tm;d;:m;/^HEAD/d;")"
+        # Create a new, blank temp file
+        echo -n > "$tmp_stat_file"
+      else
+        # Only current branch
+        local branches="$(\git branch 2> /dev/null | sed "s/^\* \([^ ]*\)/\1/;tm;d;:m")"
+        # Copy current file to temp file
+        touch "$stat_file"
+        cp -f "$stat_file" "$tmp_stat_file"
+      fi
+
       for branch in $branches; do
         local travis_output=$(travis-ci "$branch" 2>&1)
+        local status=""
         case "$travis_output" in
-        *built\ OK*)    echo "$branch passed"  >> "$stat_file";;
-        *failed*)       echo "$branch failed"  >> "$stat_file";;
-        *in\ progress*) echo "$branch running" >> "$stat_file";;
+        *built\ OK*)    status="passed";;
+        *failed*)       status="failed";;
+        *in\ progress*) status="running";;
         esac
+
+        # If branch has a build status
+        if [ -n "$status" ]; then
+          if grep -q "^$branch" "$tmp_stat_file"; then
+            # Replace branch's build status
+            sed -e "s/^$branch .*/$branch $status/" -i "$tmp_stat_file"
+          else
+            # Append new line for branch
+            echo "$branch $status" >> "$tmp_stat_file"
+          fi
+        fi
       done
 
+      # Replace current stat file with finished update
+      cp -f "$tmp_stat_file" "$stat_file"
+      # Ignore stat file from git repo
       git_ignore "$stat_file" ".git/info/exclude"
+      # Remove temporary file
+      rm -f "$tmp_stat_file"
     fi
   fi
 }