Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat(merge): Squash commits by default when merging

Maximilian Roosb2851dc5743b
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index c0303a1f3..d70867684 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -10,7 +10,7 @@ use crate::output::execute_command_in_worktree;
pub fn handle_merge(
target: Option<&str>,
- squash: bool,
+ squash_enabled: bool,
keep: bool,
no_hooks: bool,
force: bool,
@@ -38,7 +38,7 @@ pub fn handle_merge(
// Handle uncommitted changes depending on whether we're squashing
if repo.is_dirty()? {
- if squash {
+ if squash_enabled {
// Just stage - squash will handle committing
repo.run_command(&["add", "-A"])
.git_context("Failed to stage changes")?;
@@ -48,8 +48,8 @@ pub fn handle_merge(
}
}
- // Squash commits if requested
- if squash {
+ // Squash commits if enabled
+ if squash_enabled {
handle_squash(
&target_branch,
&config.commit_generation,
diff --git a/src/main.rs b/src/main.rs
index 2a91f4968..b9fabf860 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
use anstyle::Style;
-use clap::{CommandFactory, Parser, Subcommand, ValueEnum};
+use clap::{ArgAction, CommandFactory, Parser, Subcommand, ValueEnum};
use std::process;
use worktrunk::config::WorktrunkConfig;
use worktrunk::git::{GitError, GitResultExt, Repository};
@@ -207,9 +207,10 @@ The merge operation follows a strict order designed for fail-fast execution:
If working tree has uncommitted changes, stages all changes (git add -A) and commits
with LLM-generated message.
-4. Squash commits
- If --squash specified, counts commits since merge base with target branch. When
- multiple commits exist, squashes them into one with LLM-generated message.
+4. Squash commits (default)
+ By default, counts commits since merge base with target branch. When multiple
+ commits exist, squashes them into one with LLM-generated message. Skip squashing
+ with --no-squash.
5. Rebase onto target
Rebases current branch onto target branch. Detects conflicts and aborts if found.
@@ -227,8 +228,8 @@ EXAMPLES
Basic merge to main:
wt merge
-Squash commits before merging:
- wt merge --squash
+Merge without squashing:
+ wt merge --no-squash
Keep worktree after merging:
wt merge --keep
@@ -239,9 +240,9 @@ Skip pre-merge commands:
/// Target branch to merge into (defaults to default branch)
target: Option<String>,
- /// Squash all commits into one before merging
- #[arg(short, long)]
- squash: bool,
+ /// Disable squashing commits (by default, commits are squashed into one before merging)
+ #[arg(long = "no-squash", action = ArgAction::SetFalse, default_value_t = true)]
+ squash_enabled: bool,
/// Keep worktree after merging (don't remove)
#[arg(short, long)]
@@ -504,11 +505,11 @@ fn main() {
} => handle_push(target.as_deref(), allow_merge_commits, "Pushed to"),
Commands::Merge {
target,
- squash,
+ squash_enabled,
keep,
no_hooks,
force,
- } => handle_merge(target.as_deref(), squash, keep, no_hooks, force),
+ } => handle_merge(target.as_deref(), squash_enabled, keep, no_hooks, force),
Commands::Completion { shell } => {
let mut cli_cmd = Cli::command();
handle_completion(shell, &mut cli_cmd);
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 71c844b18..1baf34546 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -403,11 +403,11 @@ fn test_merge_squash_deterministic() {
.output()
.expect("Failed to commit");
- // Merge with squash (no LLM configured - should use deterministic message)
+ // Merge (squashing is now the default - no LLM configured, should use deterministic message)
snapshot_merge(
"merge_squash_deterministic",
&repo,
- &["main", "--squash"],
+ &["main"],
Some(&feature_wt),
);
}
@@ -461,10 +461,11 @@ fn test_merge_squash_with_llm() {
// Configure mock LLM command via environment variable
// Use sh to consume stdin and return a fixed message
+ // (squashing is now the default, no need for --squash flag)
snapshot_merge_with_env(
"merge_squash_with_llm",
&repo,
- &["main", "--squash"],
+ &["main"],
Some(&feature_wt),
&[
("WORKTRUNK_COMMIT_GENERATION__COMMAND", "sh"),
@@ -525,10 +526,11 @@ fn test_merge_squash_llm_fallback() {
// Configure LLM command that will fail (non-existent command)
// Should now error instead of falling back
+ // (squashing is now the default, no need for --squash flag)
snapshot_merge_with_env(
"merge_squash_llm_fallback",
&repo,
- &["main", "--squash"],
+ &["main"],
Some(&feature_wt),
&[(
"WORKTRUNK_COMMIT_GENERATION__COMMAND",
@@ -569,11 +571,66 @@ fn test_merge_squash_single_commit() {
.output()
.expect("Failed to commit");
- // Merge with squash - should skip squashing since there's only one commit
+ // Merge (squashing is default) - should skip squashing since there's only one commit
snapshot_merge(
"merge_squash_single_commit",
&repo,
- &["main", "--squash"],
+ &["main"],
+ Some(&feature_wt),
+ );
+}
+
+#[test]
+fn test_merge_no_squash() {
+ let mut repo = TestRepo::new();
+ repo.commit("Initial commit");
+ repo.setup_remote("main");
+
+ // Create a worktree for main
+ let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
+ .current_dir(repo.root_path())
+ .output()
+ .expect("Failed to add worktree");
+
+ // Create a feature worktree and make multiple commits
+ let feature_wt = repo.add_worktree("feature", "feature");
+
+ std::fs::write(feature_wt.join("file1.txt"), "content 1").expect("Failed to write file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "file1.txt"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "feat: add file 1"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ std::fs::write(feature_wt.join("file2.txt"), "content 2").expect("Failed to write file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "file2.txt"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "feat: add file 2"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ // Merge with --no-squash - should NOT squash the commits
+ snapshot_merge(
+ "merge_no_squash",
+ &repo,
+ &["main", "--no-squash"],
Some(&feature_wt),
);
}
@@ -645,11 +702,11 @@ fn test_merge_squash_empty_changes() {
.output()
.expect("Failed to commit");
- // Merge with squash - should fail with helpful error about no net changes
+ // Merge (squashing is default) - should fail with helpful error about no net changes
snapshot_merge(
"merge_squash_empty_changes",
&repo,
- &["main", "--squash"],
+ &["main"],
Some(&feature_wt),
);
}
@@ -806,11 +863,11 @@ fn test_merge_auto_commit_and_squash() {
std::fs::write(feature_wt.join("file1.txt"), "updated content 1")
.expect("Failed to write file");
- // Merge with --squash - should stage uncommitted changes, then squash all commits including the staged changes
+ // Merge (squashing is default) - should stage uncommitted changes, then squash all commits including the staged changes
snapshot_merge_with_env(
"merge_auto_commit_and_squash",
&repo,
- &["main", "--squash"],
+ &["main"],
Some(&feature_wt),
&[
("WORKTRUNK_COMMIT_GENERATION__COMMAND", "echo"),
@@ -1481,11 +1538,11 @@ fn test_merge_pre_squash_command_success() {
.output()
.expect("Failed to commit");
- // Merge with --squash and --force
+ // Merge with --force (squashing is now the default)
snapshot_merge(
"merge_pre_squash_command_success",
&repo,
- &["main", "--squash", "--force"],
+ &["main", "--force"],
Some(&feature_wt),
);
}
@@ -1534,11 +1591,11 @@ fn test_merge_pre_squash_command_failure() {
.output()
.expect("Failed to commit");
- // Merge with --squash and --force - pre-squash command should fail and block merge
+ // Merge with --force (squashing is default) - pre-squash command should fail and block merge
snapshot_merge(
"merge_pre_squash_command_failure",
&repo,
- &["main", "--squash", "--force"],
+ &["main", "--force"],
Some(&feature_wt),
);
}
diff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snap
index 9fe45f364..2ab913d4d 100644
--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpldTCOx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsmlUHy/test-config.toml
---
success: true
exit_code: 0
@@ -402,7 +402,7 @@ _wt() {
return 0
;;
wt__merge)
- opts="-s -k -f -v -h --squash --keep --no-hooks --force --verbose --help [TARGET]"
+ opts="-k -f -v -h --no-squash --keep --no-hooks --force --verbose --help [TARGET]"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index 910b99fc0..02f59870e 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0jIAhK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDaJquk/test-config.toml
---
success: true
exit_code: 0
@@ -267,7 +267,7 @@ complete -c wt -n "__fish_wt_using_subcommand remove" -s h -l help -d 'Print hel
complete -c wt -n "__fish_wt_using_subcommand push" -l allow-merge-commits -d 'Allow pushing merge commits (non-linear history)'
complete -c wt -n "__fish_wt_using_subcommand push" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand push" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand merge" -s s -l squash -d 'Squash all commits into one before merging'
+complete -c wt -n "__fish_wt_using_subcommand merge" -l no-squash -d 'Disable squashing commits (by default, commits are squashed into one before merging)'
complete -c wt -n "__fish_wt_using_subcommand merge" -s k -l keep -d 'Keep worktree after merging (don\'t remove)'
complete -c wt -n "__fish_wt_using_subcommand merge" -l no-hooks -d 'Skip all project hooks (pre-merge-command)'
complete -c wt -n "__fish_wt_using_subcommand merge" -s f -l force -d 'Skip approval prompts for commands'
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index d56d89400..68dceb336 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpes26rH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplCNLKR/test-config.toml
---
success: true
exit_code: 0
@@ -306,8 +306,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(merge)
_arguments "${_arguments_options[@]}" : \
-'-s[Squash all commits into one before merging]' \
-'--squash[Squash all commits into one before merging]' \
+'--no-squash[Disable squashing commits (by default, commits are squashed into one before merging)]' \
'-k[Keep worktree after merging (don'\''t remove)]' \
'--keep[Keep worktree after merging (don'\''t remove)]' \
'--no-hooks[Skip all project hooks (pre-merge-command)]' \
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
index f38c18354..6f5f064d9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCsDdYc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMD721i/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index f98fd9a2c..ed00e6127 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -19,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUIJO3O/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSm7dqz/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 1bd1997d3..323ca8029 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -16,27 +16,29 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGiDjID/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp29wNFY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing changes... (1 file, +1, -1)
-πŸ”„ Generating commit message...
+πŸ”„ Squashing 1 commits into 1 (1 file, +1)...
+πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  WIP: Auto-commit before merge
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: initial feature
-βœ… Committed changes @ [SHA]
+βœ… Squashed 1 commits into 1 @ [SHA]
πŸ”„ Rebasing onto main...
-πŸ”„ Merging 2 commits to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
-* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
-* [SHA] feat: initial feature
+* [SHA] (HEAD -> feature) Squash commits from main
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (2 commits, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 45c46127c..c7b16d608 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -18,27 +18,29 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplB1CST/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHgqkAV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing changes... (1 file, +1, -1)
-πŸ”„ Generating commit message...
+πŸ”„ Squashing 1 commits into 1 (1 file, +1)...
+πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  WIP: Auto-commit before merge
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add authentication
-βœ… Committed changes @ [SHA]
+βœ… Squashed 1 commits into 1 @ [SHA]
πŸ”„ Rebasing onto main...
-πŸ”„ Merging 2 commits to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
-* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
-* [SHA] feat: add authentication
+* [SHA] (HEAD -> feature) Squash commits from main
auth.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (2 commits, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index e177cb1b2..134bbe24e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphZdwpG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpc0fetn/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
index 7624d1c67..94c2b9193 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd5boub/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvVgUae/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 511037412..02f308f9a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,11 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIlspxR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRltXLA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 43c850adf..9a504d2bb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVOl1iS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpern16m/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
new file mode 100644
index 000000000..44657e64e
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -0,0 +1,40 @@
+---
+source: tests/integration_tests/merge.rs
+info:
+ program: wt
+ args:
+ - merge
+ - main
+ - "--no-squash"
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvdFVPg/test-config.toml
+---
+success: true
+exit_code: 0
+----- stdout -----
+πŸ”„ Rebasing onto main...
+πŸ”„ Merging 2 commits to main @ [SHA]
+
+* [SHA] (HEAD -> feature) feat: add file 2
+* [SHA] feat: add file 1
+
+ file1.txt | 1 +
+ file2.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+βœ… Merged to main (2 commits, 2 files, +2) 
+πŸ”„ Cleaning up worktree...
+
+βœ… Returned to primary at [REPO]
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index d051dcb96..c9a1282c5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -16,11 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7OsJSf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS3tfN5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index a20c30102..3108e486b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4xnHdq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw5ZzqO/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index dc717e8f3..1be98e14f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpewxYBg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppK3g8X/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 588af1f05..b2dc8be01 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT0Xi2i/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFRTeJw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 00fda5fea..d6760b558 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -13,21 +13,32 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxdVWsm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpB1r44t/test-config.toml
---
-success: false
-exit_code: 1
+success: true
+exit_code: 0
----- stdout -----
-πŸ”„ Running pre-commit:
-  exit 1
+πŸ”„ Committing changes... (1 file, +1)
+πŸ”„ Generating commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+  WIP: Auto-commit before merge
+βœ… Committed changes @ [SHA]
+πŸ”„ Rebasing onto main...
+πŸ”„ Merging 1 commit to main @ [SHA]
------ stderr -----
-❌ Pre-commit command failed
+* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
+
+ feature.txt | 1 +
+ 1 file changed, 1 insertion(+)
-Command failed with exit code: exit status: 1
+βœ… Merged to main (1 commit, 1 file, +1) 
+πŸ”„ Cleaning up worktree...
-πŸ’‘ Use --no-hooks to skip pre-commit commands
+βœ… Returned to primary at [REPO]
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index b6defb84c..bd7ac10ce 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -17,14 +17,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQNyioS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6V1hsj/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
-
πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
@@ -45,4 +42,3 @@ exit_code: 0
βœ… Returned to primary at [REPO]
----- stderr -----
-Pre-commit check passed
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
index 2dde09d27..005398878 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/merge.rs
expression: output
---
Exit code: 0
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Running pre-merge: first
  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index fb67f2f42..5e42121ad 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2pHoJx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz7ITKV/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Running pre-merge:
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index dc05c0761..9c2dd9f8e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0b1qDe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAvOzvL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Running pre-merge: format
  exit 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 86bf370bf..2dd5b2f36 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz1Svg2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJRHr7G/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index d31a23f25..a8c2bdd40 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE07Dyc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeDgewa/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Running pre-merge: check1
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 5560cbcc3..1d2a8b9c3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJDhHCh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk56RZn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Running pre-merge:
  exit 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index ada775d01..c1fc53bf4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
- "--force"
env:
CLICOLOR_FORCE: "1"
@@ -14,10 +13,11 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxrSB06/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8p7RH0/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 3e4621c17..f20a3a502 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
- "--force"
env:
CLICOLOR_FORCE: "1"
@@ -18,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC1Hhfi/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNF3MJQ/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 86f8ea094..35571ea86 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,11 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptHp5qH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkIyPq0/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index c1a4c00ad..5f19b2e87 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -17,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUTTHOg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeIG2tw/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 2d65e5655..45d6b946d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -17,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJq6lmf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH8oAuT/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 914b96d60..a42f2aa9b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -18,7 +17,7 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4DeuiX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRD0zND/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 1e8711b87..a9b8af3f6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -17,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwj2gxC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6L3zsm/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 4fe91edd0..059e0fd86 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -5,7 +5,6 @@ info:
args:
- merge
- main
- - "--squash"
env:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
@@ -20,7 +19,7 @@ info:
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA50Vmu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmyaNgb/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 18d3b7cfa..b18b515b7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,11 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphldM5d/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpES4d1v/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
index a3f40f1e5..6e8232c8d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
@@ -17,11 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptU87PL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptHYVnK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
+πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
πŸ”„ Merging 1 commit to main @ [SHA]