diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:36 -0700 |
| commit | b20f67a65939a9c8f43354d70ab6000f615d1804 (patch) | |
| tree | d248b20f74bc89f15670809a7f55a97f824679d5 /advice.h | |
| parent | Merge branch 'jt/push-negotiation-fixes' into maint (diff) | |
| parent | pull: fix handling of multiple heads (diff) | |
| download | tgif-b20f67a65939a9c8f43354d70ab6000f615d1804.tar.xz | |
Merge branch 'en/pull-conflicting-options' into maint
"git pull" had various corner cases that were not well thought out
around its --rebase backend, e.g. "git pull --ff-only" did not stop
but went ahead and rebased when the history on other side is not a
descendant of our history. The series tries to fix them up.
* en/pull-conflicting-options:
pull: fix handling of multiple heads
pull: update docs & code for option compatibility with rebasing
pull: abort by default when fast-forwarding is not possible
pull: make --rebase and --no-rebase override pull.ff=only
pull: since --ff-only overrides, handle it first
pull: abort if --ff-only is given and fast-forwarding is impossible
t7601: add tests of interactions with multiple merge heads and config
t7601: test interaction of merge/rebase/fast-forward flags and options
Diffstat (limited to 'advice.h')
| -rw-r--r-- | advice.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -96,6 +96,7 @@ void advise_if_enabled(enum advice_type type, const char *advice, ...); int error_resolve_conflict(const char *me); void NORETURN die_resolve_conflict(const char *me); void NORETURN die_conclude_merge(void); +void NORETURN die_ff_impossible(void); void advise_on_updating_sparse_paths(struct string_list *pathspec_list); void detach_advice(const char *new_name); |