]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6531f31 bf6ab08)
Merge branch 'pw/rebase-autostash-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2024 18:16:29 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2024 18:16:30 +0000 (11:16 -0700)
commit2b800ec45e53051c41a85900009430704bfdf031
tree9de52f5abeced8315ad4f5d70e15ddb325b037datree
parent6531f31ef3bead57a3255fa08efa6e7553c5a9a7commit | diff
parentbf6ab087d14b839f8a7b188a7af62e43164873fbcommit | diff
Merge branch 'pw/rebase-autostash-fix'

"git rebase --autostash" failed to resurrect the autostashed
changes when the command gets aborted after giving back control
asking for hlep in conflict resolution.

* pw/rebase-autostash-fix:
  rebase: apply and cleanup autostash when rebase fails to start
builtin/rebase.c diff1 | diff2 | blob | history
t/t3400-rebase.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.