summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-08-08 20:51:22 +0545
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-06 11:55:58 -0700
commit0eabf4b95ca2d3213194de95cc9cd62593811965 (patch)
treefe75e31ca88313d4a4c9be6cb590ed2c58c3a55e /builtin/commit-tree.c
parentbuiltin rebase: actions require a rebase in progress (diff)
downloadtgif-0eabf4b95ca2d3213194de95cc9cd62593811965.tar.xz
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>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions