path: root/path.c
diff options
authorDenton Liu <>2020-04-07 14:28:07 (GMT)
committerJunio C Hamano <>2020-04-10 16:28:02 (GMT)
commita03b55530ab844974b7058042a015fcfcd9e7a53 (patch)
treebafe59f6e7bab8e6d37854fc7be2a85f71176425 /path.c
parent804fe3155761e73c3dcc4e162ddb3ff560f16cd7 (diff)
merge: teach --autostash option
In rebase, one can pass the `--autostash` option to cause the worktree to be automatically stashed before continuing with the rebase. This option is missing in merge, however. Implement the `--autostash` option and corresponding `merge.autoStash` option in merge which stashes before merging and then pops after. This option is useful when a developer has some local changes on a topic branch but they realize that their work depends on another branch. Previously, they had to run something like git fetch ... git stash push git merge FETCH_HEAD git stash pop but now, that is reduced to git fetch ... git merge --autostash FETCH_HEAD When an autostash is generated, it is automatically reapplied to the worktree only in three explicit situations: 1. An incomplete merge is commit using `git commit`. 2. A merge completes successfully. 3. A merge is aborted using `git merge --abort`. In all other situations where the merge state is removed using remove_merge_branch_state() such as aborting a merge via `git reset --hard`, the autostash is saved into the stash reflog instead keeping the worktree clean. Helped-by: Phillip Wood <> Suggested-by: Alban Gruin <> Signed-off-by: Denton Liu <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'path.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/path.c b/path.c
index 88cf593..d764738 100644
--- a/path.c
+++ b/path.c
@@ -1535,5 +1535,6 @@ REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG")
REPO_GIT_PATH_FUNC(shallow, "shallow")