summaryrefslogtreecommitdiff
path: root/builtin/upload-archive.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2021-09-07 21:05:05 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-07 21:45:32 -0700
commit52f1e82178e75bdf876799770922bc34fdf6fae4 (patch)
tree5bf0fbafadb750ab5f5d9d3eebdd28c50f8333fd /builtin/upload-archive.c
parenttests: stop testing `git rebase --preserve-merges` (diff)
downloadtgif-52f1e82178e75bdf876799770922bc34fdf6fae4.tar.xz
pull: remove support for `--rebase=preserve`
In preparation for `git-rebase--preserve-merges.sh` entering its after life, we remove this (deprecated) option that would still rely on it. To help users transition who still did not receive the memo about the deprecation, we offer a helpful error message instead of throwing our hands in the air and saying that we don't know that option, never heard of it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/upload-archive.c')
0 files changed, 0 insertions, 0 deletions