1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-19 06:53:52 +02:00
git/rebase.h
Johannes Schindelin 52f1e82178 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>
2021-09-07 21:45:32 -07:00

15 lines
226 B
C

#ifndef REBASE_H
#define REBASE_H
enum rebase_type {
REBASE_INVALID = -1,
REBASE_FALSE = 0,
REBASE_TRUE,
REBASE_MERGES,
REBASE_INTERACTIVE
};
enum rebase_type rebase_parse_value(const char *value);
#endif /* REBASE */