summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Øystein Walle <oystwa@gmail.com>2021-05-05 16:52:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-07 06:14:04 +0900
commita1989cf7b8d062960b6f8de00435711c45b95285 (patch)
treed69953e957e80de89da1c3755cfe1778123482ce /merge-blobs.h
parentThe thirteenth batch (diff)
downloadtgif-a1989cf7b8d062960b6f8de00435711c45b95285.tar.xz
add: die if both --dry-run and --interactive are given
The interactive machinery does not obey --dry-run. Die appropriately if both flags are passed. Signed-off-by: Øystein Walle <oystwa@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions