]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d732a57) | patch
builtin rebase: stop if `git am` is in progress
authorPratik Karki <predatoramigo@gmail.com>
Wed, 8 Aug 2018 15:06:22 +0000 (20:51 +0545)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Sep 2018 18:55:58 +0000 (11:55 -0700)
commit0eabf4b95ca2d3213194de95cc9cd62593811965
treefe75e31ca88313d4a4c9be6cb590ed2c58c3a55etree | snapshot
parentd732a5707855d2cbe5c264b48a8884688a90b95bcommit | diff
builtin rebase: stop if `git am` is in progress

This commit checks for the file `applying` used by `git am` in
`rebase-apply/` and if the file is present it means `git am` is in
progress so it errors out.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.