gitbash 1.3.6 → 1.4.0

package/README.md

@@ -32,29 +32,6 @@ brew install git-delta  # Better diff highlighting
 brew install bat        # File preview with syntax highlighting
 ```
 
-### Configuration
-
-gitbash reads configuration from `~/.gitbashrc` if it exists. You can set the following variables:
-
-```bash
-# Prefix for feature branches (default: "feature/")
-GITBASH_FEATURE_BRANCH_PREFIX="feature/"
-
-# Merge tool command invoked by 'update' when conflicts occur (default: "fork")
-GITBASH_MERGE_COMMAND="fork"
-
-# Theme for delta/bat diff highlighting: auto, dark, or light (default: "light")
-GITBASH_THEME="light"
-
-# Stale branch threshold in months for 'stale' command (default: 3)
-GITBASH_STALE_MONTHS=3
-
-# Cleanup threshold in days - branches merged more than this many days ago (default: 7)
-GITBASH_CLEANUP_DAYS=7
-```
-
-You can create this file manually or use `gitbash --config` to configure interactively.
-
 ## Commands
 
 ### branch
@@ -73,11 +50,38 @@ branch --version    # Show version
 create [JIRA_LINK|ISSUE] [TITLE...]
 ```
 
-Create feature branch with Jira parsing. Updates main first, pushes and tracks.
+Create feature branch with optional Jira parsing. Updates main first, pushes and tracks.
+
+**Branch Name Format:** `<type>/<custom-prefix>/<issue>-<title>` or `<type>/<custom-prefix>/<title>`
+
+**Examples with custom prefix** (`GITBASH_CREATE_BRANCH_PREFIX="awesome-team"`):
+
+With issue parsing enabled (default):
+```bash
+create PROJ-123 fix login bug           # → feature/awesome-team/PROJ-123-fix-login-bug
+create fix bug                          # → feature/awesome-team/NOISSUE-fix-bug
+create --hotfix PROJ-999 critical fix   # → hotfix/awesome-team/PROJ-999-critical-fix
+create                                  # Interactive mode with Jira prompt
+```
+
+With issue parsing disabled (`GITBASH_CREATE_NO_ISSUE_PARSING="yes"`):
+```bash
+create fix login bug                    # → feature/awesome-team/fix-login-bug
+create --hotfix enhance security        # → hotfix/awesome-team/enhance-security
+create                                  # Interactive mode (no Jira prompt)
+```
+
+**Examples with empty prefix** (`GITBASH_CREATE_BRANCH_PREFIX=""`, default):
 
+With parsing enabled:
 ```bash
-create PROJ-123 fix login bug  # → feature/PROJ-123-fix-login-bug
-create                          # Interactive mode
+create PROJ-123 fix bug                 # → feature/PROJ-123-fix-bug
+create fix bug                          # → feature/NOISSUE-fix-bug
+```
+
+With parsing disabled:
+```bash
+create enhance login screen             # → feature/enhance-login-screen
 ```
 
 ### switch
@@ -202,6 +206,39 @@ commits        # Show last 20 commits
 commits 50     # Show last 50 commits
 ```
 
+### Configuration
+
+gitbash reads configuration from `~/.gitbashrc` if it exists. You can set the following variables:
+
+```bash
+# Branch prefix inserted between type and issue number (default: "")
+# No trailing slash needed - it's added automatically
+# Format: <type>/<prefix>/<issue>-<title> or <type>/<prefix>/<title>
+# Examples: "awesome-team" or "" for no prefix
+GITBASH_CREATE_BRANCH_PREFIX=""
+
+# Merge tool command invoked by 'update' when conflicts occur (default: "fork")
+GITBASH_MERGE_COMMAND="fork"
+
+# Disable Jira issue number parsing in branch names: yes or no (default: "no")
+GITBASH_CREATE_NO_ISSUE_PARSING="no"
+
+# Fallback prefix when no issue number is provided (default: "NOISSUE")
+# Only used when GITBASH_CREATE_NO_ISSUE_PARSING="no"
+GITBASH_CREATE_ISSUE_PARSING_FALLBACK="NOISSUE"
+
+# Theme for delta/bat diff highlighting: auto, dark, or light (default: "light")
+GITBASH_THEME="light"
+
+# Stale branch threshold in months for 'stale' command (default: 3)
+GITBASH_STALE_MONTHS=3
+
+# Cleanup threshold in days - branches merged more than this many days ago (default: 7)
+GITBASH_CLEANUP_DAYS=7
+```
+
+You can create this file manually or use `gitbash --config` to configure interactively.
+
 ### Individual aliases
 
 Instead of adding every command via `eval "$(gitbash --init)"` in `.zshrc` or `.bashrc`

package/bin/gitbash

@@ -15,25 +15,88 @@ load_config() {
 configure_gitbash() {
     load_config
 
-    local current_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
+    # Backward compatibility: migrate GITBASH_FEATURE_BRANCH_PREFIX to GITBASH_CREATE_BRANCH_PREFIX
+    local current_prefix="${GITBASH_CREATE_BRANCH_PREFIX:-}"
+    if [[ -z "$current_prefix" && -n "${GITBASH_FEATURE_BRANCH_PREFIX:-}" ]]; then
+        # Remove "feature/" prefix from old variable
+        current_prefix="${GITBASH_FEATURE_BRANCH_PREFIX#feature/}"
+    fi
+    # Remove trailing slash if present
+    current_prefix="${current_prefix%/}"
+    # Default to empty if still not set
+    current_prefix="${current_prefix:-}"
+    
     local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
     local current_theme="${GITBASH_THEME:-auto}"
     local current_stale_months="${GITBASH_STALE_MONTHS:-3}"
     local current_cleanup_days="${GITBASH_CLEANUP_DAYS:-7}"
+    local current_no_issue_parsing="${GITBASH_CREATE_NO_ISSUE_PARSING:-no}"
+    local current_issue_fallback="${GITBASH_CREATE_ISSUE_PARSING_FALLBACK:-NOISSUE}"
 
     echo "Configure gitbash (writes to $CONFIG_FILE)"
     echo
 
-    local input prefix merge_cmd theme stale_months cleanup_days
+    local input prefix merge_cmd theme stale_months cleanup_days no_issue_parsing issue_fallback
 
     # Branch prefix
-    read -e -p "Feature branch prefix (used by create) [${current_prefix}]: " input
-    prefix=${input:-$current_prefix}
+    echo "Branch prefix"
+    echo "Team names are typically used to organize branches by team or subproject."
+    echo "Inserted between type and branch name, examples:"
+    echo "  ''             → feature/PROJ-123-fix-bug"
+    echo "  'team'         → feature/team/PROJ-123-fix-bug"
+    echo "  'awesome-team' → hotfix/awesome-team/PROJ-999-critical-fix"
+    if [[ -n "$current_prefix" ]]; then
+        echo "Tip: Enter a single dash '-' to explicitly clear the prefix"
+    fi
+    read -e -p "Branch prefix [${current_prefix}]: " prefix
+    # If user just pressed Enter, keep current value
+    # If user entered a single dash, clear it
+    if [[ -z "$prefix" ]]; then
+        prefix="$current_prefix"
+    elif [[ "$prefix" == "-" ]]; then
+        prefix=""
+    fi
+    # Remove trailing slash if present (will be added automatically)
+    prefix="${prefix%/}"
 
     # Merge tool
+    echo
     read -e -p "Merge tool command (used by update on conflicts) [${current_merge}]: " input
     merge_cmd=${input:-$current_merge}
 
+    # Issue parsing
+    echo
+    # Invert current value for display (no_issue_parsing="no" means enabled=yes)
+    local current_enabled="yes"
+    if [[ "$current_no_issue_parsing" == "yes" ]]; then
+        current_enabled="no"
+    fi
+    
+    read -e -p "Enable Jira issue parsing in branch names? (yes/no) [${current_enabled}]: " input
+    local enable_parsing=${input:-$current_enabled}
+    
+    # Convert answer to no_issue_parsing variable (inverted logic)
+    case "$enable_parsing" in
+        yes)
+            no_issue_parsing="no"
+            ;;
+        no)
+            no_issue_parsing="yes"
+            ;;
+        *)
+            echo "Invalid value. Using 'yes' (parsing enabled)."
+            no_issue_parsing="no"
+            ;;
+    esac
+
+    # Issue parsing fallback (only ask if parsing is enabled)
+    if [[ "$enable_parsing" == "yes" ]]; then
+        read -e -p "Fallback prefix when no issue number is provided [${current_issue_fallback}]: " input
+        issue_fallback=${input:-$current_issue_fallback}
+    else
+        issue_fallback="${current_issue_fallback}"
+    fi
+
     # Theme preference
     echo
     echo "Theme preference for delta/bat (affects diff highlighting):"
@@ -68,17 +131,34 @@ configure_gitbash() {
     fi
 
     cat > "$CONFIG_FILE" <<EOF
-# gitbash configuration
-# Prefix for feature branches created by 'create'
-GITBASH_FEATURE_BRANCH_PREFIX="$prefix"
+# Automatically generated gitbash configuration
+
+# CAUTION: Do not edit this file manually to avoid setting being overwritten.
+# run 'gitbash --config' to update settings
+
+# Branch prefix inserted between type and issue (e.g., 'team-name' or '')
+# No trailing slash needed - it's added automatically
+# Format: <type>/<prefix>/<issue>-<title> or <type>/<prefix>/<title>
+GITBASH_CREATE_BRANCH_PREFIX="$prefix"
+
 # Merge tool command invoked by 'update' when conflicts occur
 GITBASH_MERGE_COMMAND="$merge_cmd"
+
+# Disable Jira issue number parsing in branch names (yes/no)
+GITBASH_CREATE_NO_ISSUE_PARSING="$no_issue_parsing"
+
+# Fallback prefix when no issue number is provided (only used if parsing is enabled)
+GITBASH_CREATE_ISSUE_PARSING_FALLBACK="$issue_fallback"
+
 # Theme for delta/bat: auto, dark, or light
 GITBASH_THEME="$theme"
+
 # Stale branch threshold in months (branches older than this in 'stale')
 GITBASH_STALE_MONTHS="$stale_months"
+
 # Cleanup threshold in days (branches merged more than this many days ago)
 GITBASH_CLEANUP_DAYS="$cleanup_days"
+
 EOF
 
     echo

package/commands/create.sh

@@ -7,6 +7,19 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
 source "$SOURCE_DIR/_utils.sh"
 
 create() {
+    # Load configuration
+    local no_issue_parsing="${GITBASH_CREATE_NO_ISSUE_PARSING:-no}"
+    local issue_fallback="${GITBASH_CREATE_ISSUE_PARSING_FALLBACK:-NOISSUE}"
+    
+    # Load branch prefix with backward compatibility
+    local branch_prefix_config="${GITBASH_CREATE_BRANCH_PREFIX:-}"
+    if [[ -z "$branch_prefix_config" && -n "${GITBASH_FEATURE_BRANCH_PREFIX:-}" ]]; then
+        # Migrate old variable: remove "feature/" prefix
+        branch_prefix_config="${GITBASH_FEATURE_BRANCH_PREFIX#feature/}"
+    fi
+    # Remove trailing slash if present (will be added automatically when used)
+    branch_prefix_config="${branch_prefix_config%/}"
+
     # -----------------------------
     # 0. Check for help/version flag and parse options
     # -----------------------------
@@ -24,19 +37,20 @@ create() {
                 cat << 'EOF'
 Usage: create [OPTIONS] [JIRA_LINK] [TITLE...]
 
-Create a new git branch with the pattern: <prefix>/<ISSUE>-<title>
+Create a new git branch with optional Jira issue parsing.
 
 Options:
   -h, --help       Show this help message
   -t, --type       Show branch type selector menu (feature, bugfix, hotfix, release)
-  --feature        Use 'feature/' prefix (default)
-  --bugfix         Use 'bugfix/' prefix
-  --hotfix         Use 'hotfix/' prefix
-  --release        Use 'release/' prefix
+  --feature        Use 'feature/' type (default)
+  --bugfix         Use 'bugfix/' type
+  --hotfix         Use 'hotfix/' type
+  --release        Use 'release/' type
 
-Configuration:
-  - Default branch prefix can be set via GITBASH_FEATURE_BRANCH_PREFIX in ~/.gitbashrc
-  - Run 'gitbash --config' to set default prefix
+Configuration (run 'gitbash --config'):
+  - GITBASH_CREATE_BRANCH_PREFIX: Custom prefix between type and issue (default: "")
+  - GITBASH_CREATE_NO_ISSUE_PARSING: Disable Jira parsing (yes/no, default: "no")
+  - GITBASH_CREATE_ISSUE_PARSING_FALLBACK: Fallback when no issue (default: "NOISSUE")
 
 Branch Types:
   feature/  - New features and enhancements
@@ -44,44 +58,48 @@ Branch Types:
   hotfix/   - Urgent production fixes
   release/  - Release preparation branches
 
-Interactive mode (no arguments):
+Branch Name Format:
+  <type><custom-prefix><issue>-<title>  (with issue parsing)
+  <type><custom-prefix><title>          (without issue parsing)
+
+Examples with custom prefix "awesome-team" (no trailing slash needed):
+
+  With issue parsing enabled (default):
+    $ create PROJ-123 fix login bug
+    # → feature/awesome-team/PROJ-123-fix-login-bug
+    
+    $ create fix bug
+    # → feature/awesome-team/NOISSUE-fix-bug (uses fallback)
+    
+    $ create --hotfix PROJ-999 critical fix
+    # → hotfix/awesome-team/PROJ-999-critical-fix
+
+  With issue parsing disabled (GITBASH_CREATE_NO_ISSUE_PARSING="yes"):
+    $ create fix login bug
+    # → feature/awesome-team/fix-login-bug
+    
+    $ create --hotfix enhance security
+    # → hotfix/awesome-team/enhance-security
+
+Examples with empty prefix (GITBASH_CREATE_BRANCH_PREFIX=""):
+
+  With parsing enabled:
+    $ create PROJ-123 fix bug
+    # → feature/PROJ-123-fix-bug
+
+  With parsing disabled:
+    $ create enhance login screen
+    # → feature/enhance-login-screen
+
+Interactive Mode:
   $ create
-  Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):
-  > https://jira.company.com/browse/PROJ-123
-  Parsed issue number: PROJ-123
-
-  Enter branch title (will be converted to lowercase with dashes):
-  > Fix Login Bug
-  
-  Branch name: feature/PROJ-123-fix-login-bug
-  Create this branch? (y/N): y
-
-With type selector:
-  $ create -t PROJ-123 urgent fix
-  Branch type >
-  > feature/ - New features and enhancements
-    bugfix/  - Bug fixes
-    hotfix/  - Urgent production fixes
-    release/ - Release preparation branches
-  
-  # Select hotfix/, creates: hotfix/PROJ-123-urgent-fix
-
-Quick type flags:
-  $ create --bugfix PROJ-456 fix crash
-  # Creates: bugfix/PROJ-456-fix-crash
-
-One-liner mode (with arguments):
-  $ create https://jira.company.com/browse/PROJ-123 fix login bug
-  Parsed issue number: PROJ-123
-  
-  Branch name: feature/PROJ-123-fix-login-bug
-  Create this branch? (y/N): y
-
-Examples:
+  # Prompts for Jira link (if parsing enabled) and title
+
+More Examples:
   create https://jira.company.com/browse/PROJ-123 make some fixes
   create PROJ-456 implement new feature
   create -t PROJ-789 some work                    # Show type menu
-  create --hotfix PROJ-999 critical fix           # Use hotfix prefix
+  create --hotfix PROJ-999 critical fix           # Use hotfix type
 
 EOF
                 return 0
@@ -149,19 +167,26 @@ TYPES
             return 1
         fi
 
-        # Extract just the prefix (first word)
+        # Extract just the type prefix (first word)
         branch_prefix=$(echo "$selected_type" | awk '{print $1}')
     else
-        branch_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
+        # Use default feature/ type
+        branch_prefix="feature/"
     fi
 
     # -----------------------------
-    # 2. Get Jira link from user (or from arguments)
+    # 2. Get Jira link from user (or from arguments) - skip if parsing disabled
     # -----------------------------
     local jira_link
     local branch_title
     
-    if [[ ${#positional_args[@]} -gt 0 ]]; then
+    if [[ "$no_issue_parsing" == "yes" ]]; then
+        # Issue parsing disabled - treat all args as branch title
+        if [[ ${#positional_args[@]} -gt 0 ]]; then
+            branch_title="${positional_args[*]}"
+        fi
+        jira_link=""
+    elif [[ ${#positional_args[@]} -gt 0 ]]; then
         # Arguments provided - use one-liner mode
         # Use array index 1 for zsh compatibility (zsh arrays are 1-indexed, bash uses 0)
         if [[ -n "${ZSH_VERSION:-}" ]]; then
@@ -190,10 +215,13 @@ TYPES
     # -----------------------------
     local issue_number
     
-    if [[ -z "$jira_link" ]]; then
-        # No Jira link provided, use NOISSUE
-        issue_number="NOISSUE"
-        print_info "No Jira link provided. Using NOISSUE."
+    if [[ "$no_issue_parsing" == "yes" ]]; then
+        # Issue parsing disabled - no issue number in branch name
+        issue_number=""
+    elif [[ -z "$jira_link" ]]; then
+        # No Jira link provided, use configured fallback
+        issue_number="$issue_fallback"
+        print_info "No Jira link provided. Using $issue_fallback."
     else
         # First try to match just the issue number pattern (e.g., PROJ-123)
         issue_number=$(echo "$jira_link" | grep -o -E '^[A-Z]+-[0-9]+$' | head -1 || true)
@@ -206,8 +234,8 @@ TYPES
         fi
 
         if [[ -z "$issue_number" ]]; then
-            print_warning "Could not parse issue number from Jira link. Using NOISSUE."
-            issue_number="NOISSUE"
+            print_warning "Could not parse issue number from Jira link. Using $issue_fallback."
+            issue_number="$issue_fallback"
             # If parsing failed and we had arguments, include the first arg in the title
             if [[ -n "$branch_title" ]]; then
                 branch_title="$jira_link $branch_title"
@@ -238,8 +266,20 @@ TYPES
     # -----------------------------
     # 4. Construct branch name
     # -----------------------------
-    # branch_prefix is set earlier from type menu, flag, or config
-    local branch_name="${branch_prefix}${issue_number}-${branch_title}"
+    # branch_prefix contains the type (feature/, hotfix/, etc.)
+    # branch_prefix_config is the custom prefix inserted between type and issue
+    # Format: <type>/<custom-prefix>/<issue>-<title> or <type>/<custom-prefix>/<title>
+    local branch_name
+    local custom_prefix_part=""
+    if [[ -n "$branch_prefix_config" ]]; then
+        custom_prefix_part="${branch_prefix_config}/"
+    fi
+    
+    if [[ -n "$issue_number" ]]; then
+        branch_name="${branch_prefix}${custom_prefix_part}${issue_number}-${branch_title}"
+    else
+        branch_name="${branch_prefix}${custom_prefix_part}${branch_title}"
+    fi
     
     echo "Branch name: $branch_name"
 

package/commands/stale.sh

@@ -12,6 +12,7 @@ stale() {
     # -----------------------------
     local json_mode=false
     local my_mode=false
+    local all_mode=false
     local filter_args=()
     local stale_months="${GITBASH_STALE_MONTHS:-3}"
     
@@ -33,6 +34,7 @@ Arguments:
 
 Options:
   -h, --help      Show this help message
+  -a, --all       Start in 'all branches' mode (default is stale mode)
   -m, --my        Pre-fill filter with your git username (from git config user.name)
   --json          Output branch data as JSON (non-interactive)
   --age=N         Override stale threshold in months (default: 3, configurable via GITBASH_STALE_MONTHS)
@@ -69,8 +71,9 @@ Examples:
   $ stale --age=6
   # Show branches older than 6 months
 
-  # Press Ctrl-A to show all branches including recent ones
-  # Select branches with TAB, press Enter to delete
+  $ stale --all
+  # Start with all branches visible (including recent ones)
+  # Press Ctrl-A to toggle between all/stale view
 
   $ stale --my
   # Pre-fills fzf filter with your git username to show only your branches
@@ -95,6 +98,10 @@ EOF
                 json_mode=true
                 shift
                 ;;
+            -a|--all)
+                all_mode=true
+                shift
+                ;;
             -m|--my)
                 my_mode=true
                 shift
@@ -266,11 +273,31 @@ EOF
     local stale_file=$(mktemp)
     local all_file=$(mktemp)
     local state_file=$(mktemp)
-    echo "$stale_branch_list" > "$stale_file"
-    echo "$abort_label" >> "$stale_file"
-    echo "$all_branch_list" > "$all_file"
-    echo "$abort_label" >> "$all_file"
-    echo "stale" > "$state_file"
+    
+    # Write stale branches with header
+    {
+        echo "══ Stale branches (>${stale_months}mo, oldest first) ══"
+        if [[ -n "$stale_branch_list" ]]; then
+            echo "$stale_branch_list"
+        fi
+        echo "$abort_label"
+    } > "$stale_file"
+    
+    # Write all branches with header
+    {
+        echo "══ All branches (oldest first) ══"
+        if [[ -n "$all_branch_list" ]]; then
+            echo "$all_branch_list"
+        fi
+        echo "$abort_label"
+    } > "$all_file"
+    
+    # Set initial state based on --all flag
+    if [[ "$all_mode" == true ]]; then
+        printf "all" > "$state_file"
+    else
+        printf "stale" > "$state_file"
+    fi
 
     # -----------------------------
     # 6. Run fzf picker with preview
@@ -278,64 +305,46 @@ EOF
     local stale_count=$(echo "$stale_branch_list" | grep -c . || echo "0")
     local all_count=$(echo "$all_branch_list" | grep -c . || echo "0")
     
-    # Create toggle script
+    # Create toggle script  
     local toggle_script=$(mktemp)
     cat > "$toggle_script" << TOGGLE_EOF
 #!/bin/bash
-state=\$(cat "$state_file")
+state=\$(cat "$state_file" | tr -d '\n')
+# Toggle: if currently stale, switch to all; if currently all, switch to stale
 if [[ "\$state" == "stale" ]]; then
-    echo "all" > "$state_file"
+    # Switching FROM stale TO all
+    printf "all" > "$state_file"
     cat "$all_file"
 else
-    echo "stale" > "$state_file"
+    # Switching FROM all TO stale
+    printf "stale" > "$state_file"
     cat "$stale_file"
 fi
 TOGGLE_EOF
     chmod +x "$toggle_script"
     
-    # Create prompt script
-    local prompt_script=$(mktemp)
-    cat > "$prompt_script" << PROMPT_EOF
-#!/bin/bash
-state=\$(cat "$state_file")
-if [[ "\$state" == "stale" ]]; then
-    echo "Stale branches (>${stale_months}mo, oldest first) > "
-else
-    echo "All branches (oldest first) > "
-fi
-PROMPT_EOF
-    chmod +x "$prompt_script"
-    
-    # Create header script  
-    local header_script=$(mktemp)
-    cat > "$header_script" << HEADER_EOF
-#!/bin/bash
-state=\$(cat "$state_file")
-if [[ "\$state" == "stale" ]]; then
-    echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than ${stale_months} months)"
-else
-    echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing all $all_count branches"
-fi
-HEADER_EOF
-    chmod +x "$header_script"
+    # Set initial input file based on mode
+    local initial_input_file
+    if [[ "$all_mode" == true ]]; then
+        initial_input_file="$all_file"
+    else
+        initial_input_file="$stale_file"
+    fi
     
     local selection
     selection=$(
-        fzf \
-            --prompt="Stale branches (>${stale_months}mo, oldest first) > " \
+        cat "$initial_input_file" | fzf \
             --query="$filter" \
             -i \
             --reverse \
             --border \
-            --header="[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than ${stale_months} months)" \
+            --header="[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit" \
+            --header-lines=1 \
             --multi \
             --delimiter=$'\t' \
             --with-nth=1 \
             --bind=enter:accept \
-            --bind="ctrl-a:reload($toggle_script)+transform-prompt($prompt_script)+transform-header($header_script)" \
+            --bind="ctrl-a:reload(bash $toggle_script)+clear-query" \
             --preview='
                 line={}
                 if [[ "$line" == "✖ Abort" ]]; then
@@ -350,7 +359,7 @@ Showing $stale_count stale branches (older than ${stale_months} months)" \
                 fi
             ' \
             --preview-window=right:35% \
-            < "$stale_file"
+            < "$initial_input_file"
     ) </dev/tty || true
     
     # Cleanup temp files

package/commands/status.sh

@@ -292,21 +292,16 @@ EOF
       done
       
       echo
-      prompt_read "Would you like to commit and push these changes? (Y/n): " ans
-      case "$ans" in
-        [nN][oO]|[nN])
-          echo "Continuing..."
-          ;;
-        *)
-          # Source commit.sh if commit function not available
-          if ! declare -f commit >/dev/null 2>&1; then
-            source "$SOURCE_DIR/commit.sh"
-          fi
-          # Use the commit function with staged and push flags
-          commit -s -p
-          break
-          ;;
-      esac
+      echo "Ready to commit and push staged changes."
+      echo "Press Ctrl+C to abort."
+      echo
+      # Source commit.sh if commit function not available
+      if ! declare -f commit >/dev/null 2>&1; then
+        source "$SOURCE_DIR/commit.sh"
+      fi
+      # Directly prompt for commit message (user can Ctrl+C to abort)
+      commit -s -p
+      break
     fi
   done
 }

package/commands/switch.sh

@@ -101,19 +101,42 @@ EOF
       fi
     }
   )
-  selected_branch=$(
-    fzf \
-      --height=40% \
-      --reverse \
-      --border \
-      --prompt="Select branch: " \
-      --query="$filter" \
-      -i \
-      --preview="branch=\$(echo {} | sed 's/^[^:]*: //'); if [[ \"\$branch\" == *───* ]]; then echo 'Spacer - not selectable'; else 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' \"\$branch\" 2>/dev/null && echo && git log --oneline --color=always -n 10 \"\$branch\" 2>/dev/null; fi" \
-      --preview-window=right:50% \
-      --header="Current: $current_branch" \
-      <<< "$branch_list"
-  ) </dev/tty || true
+
+  # -----------------------------
+  # 3b. Check for single match when filter is provided
+  # -----------------------------
+  if [[ -n "$filter" ]]; then
+    # Filter branch list (case-insensitive), excluding spacer
+    local matching_branches
+    matching_branches=$(echo "$branch_list" | grep -iv '───' | grep -i "$filter" || true)
+    local match_count
+    match_count=$(echo "$matching_branches" | grep -c . || echo "0")
+    
+    if [[ "$match_count" -eq 1 ]]; then
+      # Single match - skip fzf
+      selected_branch="$matching_branches"
+      print_info "Single match found, switching directly..."
+    fi
+  fi
+
+  # -----------------------------
+  # 3c. Use fzf if no single match
+  # -----------------------------
+  if [[ -z "$selected_branch" ]]; then
+    selected_branch=$(
+      fzf \
+        --height=40% \
+        --reverse \
+        --border \
+        --prompt="Select branch: " \
+        --query="$filter" \
+        -i \
+        --preview="branch=\$(echo {} | sed 's/^[^:]*: //'); if [[ \"\$branch\" == *───* ]]; then echo 'Spacer - not selectable'; else 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' \"\$branch\" 2>/dev/null && echo && git log --oneline --color=always -n 10 \"\$branch\" 2>/dev/null; fi" \
+        --preview-window=right:50% \
+        --header="Current: $current_branch" \
+        <<< "$branch_list"
+    ) </dev/tty || true
+  fi
 
   # -----------------------------
   # 4. Handle selection

package/commands/update.sh

@@ -8,7 +8,7 @@ source "$SOURCE_DIR/_utils.sh"
 
 # Update the current branch with the latest version of master/main
 update() {
-  local merge_tool="${GITBASH_FEATURE_BRANCH_PREFIX:-}"
+  local merge_tool="${GITBASH_MERGE_COMMAND:-fork}"
   local should_push=false
 
   # Parse arguments

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",