diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
| commit | bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7 (patch) | |
| tree | 41c8af11bdbfb05d0c13db0e66c3bbddb6702e93 /builtin/commit.c | |
| parent | The fourth batch (diff) | |
| parent | pull: pass --autostash to merge (diff) | |
| download | tgif-bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7.tar.xz | |
Merge branch 'dl/merge-autostash'
"git merge" learns the "--autostash" option.
* dl/merge-autostash: (22 commits)
pull: pass --autostash to merge
t5520: make test_pull_autostash() accept expect_parent_num
merge: teach --autostash option
sequencer: implement apply_autostash_oid()
sequencer: implement save_autostash()
sequencer: unlink autostash in apply_autostash()
sequencer: extract perform_autostash() from rebase
rebase: generify create_autostash()
rebase: extract create_autostash()
reset: extract reset_head() from rebase
rebase: generify reset_head()
rebase: use apply_autostash() from sequencer.c
sequencer: rename stash_sha1 to stash_oid
sequencer: make apply_autostash() accept a path
rebase: use read_oneliner()
sequencer: make read_oneliner() extern
sequencer: configurably warn on non-existent files
sequencer: make read_oneliner() accept flags
sequencer: make file exists check more efficient
sequencer: stop leaking buf
...
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index d3e7781e65..09170f5cfb 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1721,6 +1721,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) &oid, flags); } + apply_autostash(git_path_merge_autostash(the_repository)); + UNLEAK(err); UNLEAK(sb); return 0; |