gitbash 2.0.1 → 2.2.0

package/commands/commits.sh

@@ -5,21 +5,28 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=_utils.sh
 source "$SOURCE_DIR/_utils.sh"
 
-# List recent commits and optionally revert selected ones
+# List the current branch's own commits and optionally revert selected ones
 commits() {
     if [[ "${1:-}" == "-v" || "${1:-}" == "--version" ]]; then
         echo "gitbash ${FUNCNAME[0]} v$VERSION"
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
-Usage: commits [COUNT]
+        gb_help << 'EOF'
+Usage: commits [-a|--all] [COUNT]
 
-List recent commits in the current branch with option to revert selected ones.
+List the commits made on the current branch with option to revert selected ones.
+
+On a feature branch only the commits that are not in the base branch are
+shown. On the base branch its own history is shown (--first-parent), so
+merged branches appear as their merge commit.
 
 Arguments:
   COUNT         Number of commits to show (default: 20)
 
+Options:
+  -a, --all     Show all recent commits reachable from HEAD
+
 Navigation:
   ↑/↓           Navigate through commits
   TAB           Select/deselect commit for revert
@@ -27,6 +34,7 @@ Navigation:
   ESC/Ctrl-C    Exit without action
 
 Notes:
+  - If the upstream has new commits, offers to fast-forward first
   - Preview shows the full commit diff
   - Selected commits are reverted newest first, whatever order you picked them in
   - Merge commits are reverted against their first parent (the branch they were merged into)
@@ -35,6 +43,7 @@ Notes:
 Examples:
   $ commits
   $ commits 50
+  $ commits --all
 
 Requirements:
   - Must be in a git repository
@@ -46,16 +55,56 @@ EOF
 
     require_git_repo || return 1
 
-    local count="${1:-20}"
+    local all=false count=""
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            -a|--all) all=true ;;
+            -*) print_error "Unknown option '$1'. See 'commits --help'."; return 1 ;;
+            *)
+                if [[ -n "$count" ]]; then
+                    print_error "Unexpected argument '$1'. See 'commits --help'."
+                    return 1
+                fi
+                count="$1"
+                ;;
+        esac
+        shift
+    done
+    count="${count:-20}"
     if ! [[ "$count" =~ ^[1-9][0-9]*$ ]]; then
         print_error "COUNT must be a positive number (got '$count')."
         return 1
     fi
     require_fzf || return 1
 
+    # Offer to pull remote commits first, so they show up (and can be reverted)
+    gb_offer_fast_forward || true
+
     local current_branch
     current_branch=$(gb_current_branch) || current_branch="(detached HEAD)"
 
+    # -----------------------------
+    # Which commits: the branch's own (not in the base branch) or, on the
+    # base branch, its first-parent history
+    # -----------------------------
+    local log_args=() scope="last $count commits" empty_hint="" base_branch base_ref
+    if [[ "$all" == false ]] && base_branch=$(gb_base_branch 2>/dev/null); then
+        base_ref=$(gb_base_ref "$base_branch")
+        if [[ "$current_branch" == "$base_branch" ]]; then
+            log_args=(--first-parent)
+            scope="last $count commits on '$base_branch' (merged branches as merge commits)"
+        elif git rev-parse --verify --quiet "$base_ref^{commit}" >/dev/null; then
+            log_args=(--not "$base_ref")
+            # Also exclude the local base branch when it is ahead of the remote one
+            if [[ "$base_ref" != "$base_branch" ]] &&
+               git show-ref --verify --quiet "refs/heads/$base_branch"; then
+                log_args+=("$base_branch")
+            fi
+            scope="commits not in '$base_ref' (up to $count)"
+            empty_hint="No commits on '$current_branch' that are not in '$base_ref'. Use 'commits --all' to show all recent commits."
+        fi
+    fi
+
     # -----------------------------
     # Build commit list (fields separated by \x1f, subject last)
     # -----------------------------
@@ -67,10 +116,10 @@ EOF
         fi
         commit_list+=$(printf "%-10s  %-60s  %-15s  %s" "$hash" "$subject" "$date" "$author")
         commit_list+=$'\t'"$hash"$'\n'
-    done < <(git log -n "$count" --format='%h%x1f%cr%x1f%an%x1f%s' 2>/dev/null)
+    done < <(git log -n "$count" --format='%h%x1f%cr%x1f%an%x1f%s' HEAD ${log_args[@]+"${log_args[@]}"} 2>/dev/null)
 
     if [[ -z "$commit_list" ]]; then
-        echo "No commits found."
+        echo "${empty_hint:-No commits found.}"
         return 0
     fi
 
@@ -78,11 +127,11 @@ EOF
     pager=$(gb_diff_pager)
     preview='
         hash=$(printf "%s" {} | cut -f2)
-        git show --stat --color=always "$hash" 2>/dev/null
+        git show --stat --color=$GB_COLOR "$hash" 2>/dev/null
         echo
         echo "─────────────────────────────────────────────────────"
         echo
-        git show --color=always --format= "$hash" 2>/dev/null | head -300 | __PAGER__'
+        git show --color=$GB_COLOR --format= "$hash" 2>/dev/null | head -300 | __PAGER__'
     preview="${preview//__PAGER__/$pager}"
 
     local selection
@@ -92,7 +141,7 @@ EOF
         --reverse \
         --border \
         --header="[TAB] select for revert | [Enter] revert selected | [ESC] exit
-Showing last $count commits" \
+Showing $scope" \
         --multi \
         --delimiter=$'\t' \
         --with-nth=1 \

package/commands/create.sh

@@ -51,7 +51,7 @@ create() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: create [OPTIONS] [JIRA_LINK] [TITLE...]
 
 Create a new git branch from the latest base branch, with optional Jira issue parsing.

package/commands/pr.sh

@@ -5,52 +5,6 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=_utils.sh
 source "$SOURCE_DIR/_utils.sh"
 
-# Convert a remote URL to the repository's web URL (credentials and .git removed).
-# Handles https://[user[:token]@]host/path, ssh://[user@]host[:port]/path and user@host:path.
-_pr_web_base() {
-  local url="$1" scheme="https" rest host path
-  case "$url" in
-    http://*|https://*)
-      scheme="${url%%://*}"
-      rest="${url#*://}"
-      host="${rest%%/*}"
-      host="${host##*@}"
-      path="${rest#*/}"
-      ;;
-    ssh://*)
-      rest="${url#ssh://}"
-      host="${rest%%/*}"
-      host="${host##*@}"
-      host="${host%%:*}"
-      path="${rest#*/}"
-      ;;
-    *@*:*)
-      host="${url%%:*}"
-      host="${host##*@}"
-      path="${url#*:}"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-  path="${path%/}"
-  path="${path%.git}"
-  if [[ -z "$host" || -z "$path" || ( -n "$rest" && "$path" == "$rest" ) ]]; then
-    return 1
-  fi
-
-  # Azure DevOps SSH: ssh.dev.azure.com:v3/org/project/repo
-  if [[ "$host" == "ssh.dev.azure.com" && "$path" == v3/*/*/* ]]; then
-    local org project repo
-    path="${path#v3/}"
-    org="${path%%/*}"; path="${path#*/}"
-    project="${path%%/*}"; repo="${path#*/}"
-    echo "https://dev.azure.com/$org/$project/_git/$repo"
-    return 0
-  fi
-  echo "$scheme://$host/$path"
-}
-
 # Web URL for creating a pull/merge request for a branch
 _pr_create_url() {
   local base="$1" branch="$2" encoded
@@ -83,7 +37,7 @@ pr() {
         return 0
         ;;
       -h|--help)
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: pr [OPTIONS]
 
 Open the current branch's pull request in your browser.
@@ -105,7 +59,7 @@ Behavior:
       Bitbucket                    <repo>/pull-requests/new?source=<branch>
       Azure DevOps                 <repo>/pullrequestcreate?sourceRef=<branch>
   - Works with SSH and HTTPS remotes; credentials in the remote URL are never used
-  - Opens the browser with 'open' (macOS) or 'xdg-open' (Linux), otherwise prints the URL
+  - Opens the browser (macOS, Linux, WSL, Git Bash on Windows), otherwise prints the URL
 
 Examples:
   $ pr
@@ -147,7 +101,7 @@ EOF
     print_error "Detached HEAD: check out a branch first."
     return 1
   fi
-  if ! base=$(_pr_web_base "$remote_url"); then
+  if ! base=$(gb_web_url "$remote_url"); then
     print_error "Don't know how to open '$remote_url' in a browser."
     return 1
   fi

package/commands/repo.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
+# Open the repository's web page
+repo() {
+  local print_only=false
+
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      -v|--version)
+        echo "gitbash ${FUNCNAME[0]} v$VERSION"
+        return 0
+        ;;
+      -h|--help)
+        gb_help << 'EOF_HELP'
+Usage: repo [OPTIONS]
+
+Open the repository's web page in your browser.
+
+Options:
+  --print       Print the URL instead of opening it
+  -h, --help    Show this help message
+
+Behavior:
+  - Uses the URL of the configured remote (GITBASH_REMOTE, default: origin)
+  - With the GitHub CLI (gh) installed and logged in, opens it with 'gh repo view --web'
+  - Otherwise opens the URL derived from the remote
+    (GitHub, GitHub Enterprise, GitLab, Bitbucket, Azure DevOps)
+  - Works with SSH and HTTPS remotes; credentials in the remote URL are never used
+  - Opens the browser (macOS, Linux, WSL, Git Bash on Windows), otherwise prints the URL
+
+Examples:
+  $ repo
+  $ repo --print
+
+EOF_HELP
+        return 0
+        ;;
+      --print)
+        print_only=true
+        shift
+        ;;
+      *)
+        print_error "Unknown argument: $1"
+        echo "Usage: repo [--print]" >&2
+        return 1
+        ;;
+    esac
+  done
+
+  require_git_repo || return 1
+
+  local remote remote_url url
+  remote=$(gb_remote)
+  if ! remote_url=$(git config --get "remote.$remote.url"); then
+    print_error "No remote '$remote' found."
+    return 1
+  fi
+  if ! url=$(gb_web_url "$remote_url"); then
+    print_error "Don't know how to open '$remote_url' in a browser."
+    return 1
+  fi
+
+  if [[ "$print_only" == true ]]; then
+    echo "$url"
+    return 0
+  fi
+
+  if [[ "$url" != *gitlab* && "$url" != *bitbucket.org/* && "$url" != *dev.azure.com/* && "$url" != *visualstudio.com/* ]] &&
+     command -v gh >/dev/null 2>&1; then
+    if GH_PROMPT_DISABLED=1 gh repo view "$url" --web >/dev/null 2>&1; then
+      print_success "Opened $url"
+      return 0
+    fi
+  fi
+
+  gb_open_url "$url"
+}

package/commands/reset-repo.sh

@@ -0,0 +1,200 @@
+#!/usr/bin/env bash
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
+# Abort an unfinished merge, rebase, cherry-pick, revert or am
+_reset_repo_abort_operations() {
+  local path
+  if [[ -d "$(git rev-parse --git-path rebase-merge)" || -d "$(git rev-parse --git-path rebase-apply)" ]]; then
+    path=$(git rev-parse --git-path rebase-apply)
+    if [[ -f "$path/applying" ]]; then
+      git am --abort >/dev/null 2>&1
+    else
+      git rebase --abort >/dev/null 2>&1
+    fi
+  fi
+  [[ -f "$(git rev-parse --git-path MERGE_HEAD)" ]] && git merge --abort >/dev/null 2>&1
+  [[ -f "$(git rev-parse --git-path CHERRY_PICK_HEAD)" ]] && git cherry-pick --abort >/dev/null 2>&1
+  [[ -f "$(git rev-parse --git-path REVERT_HEAD)" ]] && git revert --abort >/dev/null 2>&1
+  return 0
+}
+
+# Reset the current branch to its state on the remote and delete all
+# untracked and ignored files, like a fresh clone
+reset-repo() {
+  local dry_run=false
+
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      -v|--version)
+        echo "gitbash ${FUNCNAME[0]} v$VERSION"
+        return 0
+        ;;
+      -h|--help)
+        gb_help << 'EOF_HELP'
+Usage: reset-repo [OPTIONS]
+
+Reset the current branch like a fresh clone: discard all local changes and
+unpushed commits, and delete untracked and ignored files (build output,
+node_modules, ...).
+
+Options:
+  -n, --dry-run   Only show what would be reset and deleted
+  -y, --yes       Don't ask for confirmation
+  -h, --help      Show this help message
+
+Behavior:
+  - Fetches the configured remote (GITBASH_REMOTE, default: origin) and resets
+    the branch to <remote>/<branch>; a branch that is not on the remote keeps
+    its commits and only loses the local changes
+  - Aborts an unfinished merge, rebase, cherry-pick or revert first
+  - Keeps files matching GITBASH_RESET_KEEP (space-separated .gitignore
+    patterns, e.g. '.env .idea/'), .gitbashrc-user and nested repositories
+  - Stashes and other branches are not touched
+  - Commits that are lost can be recovered with 'git reflog' for a while
+
+Examples:
+  $ reset-repo --dry-run
+  $ reset-repo
+
+EOF_HELP
+        return 0
+        ;;
+      -n|--dry-run)
+        dry_run=true
+        shift
+        ;;
+      -y|--yes)
+        export GITBASH_ASSUME_YES=1
+        shift
+        ;;
+      *)
+        print_error "Unknown argument: $1"
+        echo "Usage: reset-repo [--dry-run] [--yes]" >&2
+        return 1
+        ;;
+    esac
+  done
+
+  require_git_repo || return 1
+
+  local repo_root
+  repo_root=$(git rev-parse --show-toplevel) || return 1
+  cd "$repo_root" || return 1
+
+  # During a rebase HEAD is detached; the branch is the one being rebased
+  local branch="" head_name
+  for head_name in rebase-merge/head-name rebase-apply/head-name; do
+    head_name=$(git rev-parse --git-path "$head_name")
+    if [[ -f "$head_name" ]]; then
+      branch=$(cat "$head_name")
+      branch="${branch#refs/heads/}"
+      break
+    fi
+  done
+  if [[ -z "$branch" ]] && ! branch=$(gb_current_branch); then
+    print_error "Detached HEAD: check out a branch first."
+    return 1
+  fi
+
+  local remote target
+  remote=$(gb_remote)
+  if ! git remote get-url "$remote" >/dev/null 2>&1; then
+    print_error "No remote '$remote' configured."
+    return 1
+  fi
+  print_info "Fetching '$remote'..."
+  if ! git fetch --quiet --prune "$remote"; then
+    print_error "Failed to fetch '$remote'."
+    return 1
+  fi
+  if git show-ref --verify --quiet "refs/remotes/$remote/$branch"; then
+    target="$remote/$branch"
+  else
+    target="$branch"
+    print_warning "'$branch' is not on '$remote': keeping its commits, only local changes are discarded."
+  fi
+
+  # Patterns of files to keep (git clean -e); .gitbashrc-user is always kept
+  local -a keep clean_args
+  local pattern
+  IFS=' ' read -r -a keep <<< "${GITBASH_RESET_KEEP:-}"
+  keep+=(".gitbashrc-user")
+  clean_args=(-d -x)
+  for pattern in "${keep[@]}"; do
+    [[ -n "$pattern" ]] && clean_args+=(-e "$pattern")
+  done
+
+  # What would be lost
+  local lost_commits changes untracked
+  lost_commits=$(git log --oneline "$target..refs/heads/$branch")
+  changes=$(git status --porcelain --untracked-files=no)
+  untracked=$(git clean -n "${clean_args[@]}")
+
+  local head_commit
+  head_commit=$(git rev-parse "refs/heads/$branch")
+  if [[ -z "$lost_commits" && -z "$changes" && -z "$untracked" &&
+        "$(git rev-parse HEAD)" == "$(git rev-parse "$target")" ]]; then
+    _reset_repo_abort_operations
+    print_success "'$branch' is already like a fresh clone of '$target'."
+    return 0
+  fi
+
+  echo "Resetting '$branch' to '$target':"
+  if [[ -n "$lost_commits" ]]; then
+    echo
+    print_warning "$(printf '%s\n' "$lost_commits" | wc -l | tr -d ' ') unpushed commit(s) will be removed from '$branch':"
+    printf '%s\n' "$lost_commits" | sed 's/^/    /'
+  fi
+  if [[ -n "$changes" ]]; then
+    echo
+    echo "Local changes to discard:"
+    printf '%s\n' "$changes" | sed 's/^/    /'
+  fi
+  if [[ -n "$untracked" ]]; then
+    echo
+    echo "Untracked and ignored files to delete:"
+    printf '%s\n' "$untracked" | sed 's/^Would remove /    /'
+  fi
+  if [[ ${#keep[@]} -gt 1 ]]; then
+    echo
+    echo "Kept (GITBASH_RESET_KEEP): ${GITBASH_RESET_KEEP}"
+  fi
+  echo
+
+  if [[ "$dry_run" == true ]]; then
+    print_info "Dry run - nothing was changed."
+    return 0
+  fi
+
+  if ! gb_confirm "Reset '$branch' and delete these files?" n; then
+    print_info "Aborted - nothing was changed."
+    return 1
+  fi
+
+  _reset_repo_abort_operations
+  if [[ "$(gb_current_branch)" != "$branch" ]] && ! git switch --quiet --force "$branch"; then
+    print_error "Failed to check out '$branch'."
+    return 1
+  fi
+  if ! git reset --quiet --hard "$target"; then
+    print_error "Failed to reset '$branch' to '$target'."
+    return 1
+  fi
+  if ! git clean -q -f "${clean_args[@]}"; then
+    print_error "Failed to delete untracked files."
+    return 1
+  fi
+  if [[ -f .gitmodules ]]; then
+    git submodule update --init --recursive --force --quiet ||
+      print_warning "Failed to update submodules."
+  fi
+
+  print_success "'$branch' is now like a fresh clone of '$target'."
+  if [[ -n "$lost_commits" ]]; then
+    print_info "Removed commits can be recovered with 'git reflog' (previous HEAD: ${head_commit:0:12})."
+  fi
+}

package/commands/stale.sh

@@ -28,7 +28,7 @@ stale() {
                 return 0
                 ;;
             -h|--help)
-                cat << 'EOF'
+                gb_help << 'EOF'
 Usage: stale [OPTIONS] [FILTER...]
 
 Show remote branches ordered by last commit date (oldest first) and delete
@@ -229,7 +229,7 @@ TOGGLE_EOF
                 echo \"Branch: $remote_q/\$branch\"
                 echo
                 echo 'Recent commits:'
-                git log --oneline --color=always -n 15 \"refs/remotes/$remote_q/\$branch\" 2>/dev/null || echo 'No commits found'
+                git log --oneline --color=\$GB_COLOR -n 15 \"refs/remotes/$remote_q/\$branch\" 2>/dev/null || echo 'No commits found'
             " \
             --preview-window=right:35% \
             < "$tmp_dir/$(cat "$tmp_dir/state")"

package/commands/stash.sh

@@ -11,7 +11,7 @@ stash() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: stash [NAME...]
 
 Create a git stash with a descriptive name.

package/commands/stashes.sh

@@ -14,7 +14,7 @@ stashes() {
         return 0
     fi
     if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
+        gb_help << 'EOF'
 Usage: stashes [OPTIONS]
 
 Interactive menu to manage git stashes.
@@ -87,7 +87,7 @@ Examples:
 Actions:
   💾 Stash       - Create a new stash with all changes
   📦 Unstash     - Apply stash to working directory, optionally drop it
-  🗑️  Clean up   - Delete stashes without applying (supports multi-select)
+  🗑️  Clean up    - Delete stashes without applying (supports multi-select)
 
 Requirements:
   - fzf (fuzzy finder)

package/commands/status.sh

@@ -45,7 +45,7 @@ status() {
     return 0
   fi
   if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-    cat << 'EOF'
+    gb_help << 'EOF'
 Usage: status [OPTIONS]
 
 Interactive git status: stage, unstage, discard and commit with diff previews.
@@ -92,8 +92,8 @@ EOF
       echo "=== UNTRACKED ==="; echo
       if [[ -d "$file" ]]; then ls -la "$file"; else __BAT__ "$file" 2>/dev/null || echo "Cannot preview file"; fi
     else
-      staged=$(git diff --cached --color=always -- "$file" 2>/dev/null)
-      unstaged=$(git diff --color=always -- "$file" 2>/dev/null)
+      staged=$(git diff --cached --color=$GB_COLOR -- "$file" 2>/dev/null)
+      unstaged=$(git diff --color=$GB_COLOR -- "$file" 2>/dev/null)
       if [[ -n "$staged" ]]; then echo "=== STAGED CHANGES ==="; echo; printf "%s\n" "$staged" | __PAGER__; fi
       if [[ -n "$unstaged" ]]; then
         [[ -n "$staged" ]] && echo

package/commands/switch.sh

@@ -100,14 +100,15 @@ switch() {
       return 0
       ;;
     -h|--help)
-      cat << 'EOF'
+      gb_help << 'EOF'
 Usage: switch [FILTER...]
 
 Select a git branch using fzf and switch to it.
 
 Arguments:
   FILTER...     Optional search words to pre-fill fzf (joined with spaces).
-                If exactly one branch name contains them, switches directly.
+                Switches directly on an exact branch name, or if exactly
+                one branch name contains them.
 
 Options:
   -h, --help    Show this help message
@@ -152,10 +153,19 @@ EOF
   fi
 
   # -----------------------------
-  # Single match: switch directly
+  # Exact or single match: switch directly
   # -----------------------------
   local selected="" query="$filter"
   if [[ -n "$filter" ]]; then
+    # An exact branch name wins even if other branches contain it too
+    # (local first, then a remote branch like "origin/<filter>")
+    selected=$(printf '%s\n' "$branch_list" | awk -F'\t' -v f="$filter" '$2 == "local" && $3 == f { print; exit }')
+    if [[ -z "$selected" ]]; then
+      selected=$(printf '%s\n' "$branch_list" | awk -F'\t' -v f="$filter" '$2 == "remote" && ($3 == f || substr($3, index($3, "/") + 1) == f) { print; exit }')
+    fi
+    [[ -n "$selected" ]] && print_info "Exact match found, switching directly..."
+  fi
+  if [[ -n "$filter" && -z "$selected" ]]; then
     local matches match_count
     matches=$(printf '%s\n' "$branch_list" | awk -F'\t' '$2 != "spacer"' |
       while IFS= read -r line; do
@@ -192,9 +202,9 @@ EOF
             remote) ref=\"refs/remotes/\$name\" ;;
             *) echo 'Spacer - not selectable'; exit 0 ;;
           esac
-          git log --color=always -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$ref\" 2>/dev/null
+          git log --color=\$GB_COLOR -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$ref\" 2>/dev/null
           echo
-          git log --oneline --color=always -n 10 \"\$ref\" 2>/dev/null
+          git log --oneline --color=\$GB_COLOR -n 10 \"\$ref\" 2>/dev/null
         " \
         --preview-window=right:50% \
         --header="[Enter] switch | [Del] delete local branch | [Esc] exit | Current: $current_branch" \
@@ -232,25 +242,6 @@ EOF
   fi
   print_success "Switched to branch: $(gb_current_branch)"
 
-  # -----------------------------
   # Offer to fast-forward if behind the upstream
-  # -----------------------------
-  local now upstream_remote upstream_merge behind
-  now=$(gb_current_branch) || return 0
-  upstream_remote=$(git config "branch.$now.remote" 2>/dev/null) || return 0
-  upstream_merge=$(git config "branch.$now.merge" 2>/dev/null) || return 0
-  git fetch --quiet "$upstream_remote" "$upstream_merge" 2>/dev/null || return 0
-  behind=$(git rev-list --count "HEAD..@{upstream}" 2>/dev/null) || return 0
-  if [[ "$behind" -gt 0 ]]; then
-    print_warning "Branch is $behind commit(s) behind its upstream."
-    if gb_confirm "Fast-forward to the latest changes?" y; then
-      if git merge --ff-only --quiet "@{upstream}"; then
-        print_success "Up to date."
-      else
-        print_error "Could not fast-forward (you have local commits or changes). Run 'git pull' to reconcile."
-        return 1
-      fi
-    fi
-  fi
-  return 0
+  gb_offer_fast_forward
 }