| 240 | } |
| 241 | |
| 242 | void NORETURN die_ff_impossible(void) |
| 243 | { |
| 244 | advise_if_enabled(ADVICE_DIVERGING, |
| 245 | _("Diverging branches can't be fast-forwarded, you need to either:\n" |
| 246 | "\n" |
| 247 | "\tgit merge --no-ff\n" |
| 248 | "\n" |
| 249 | "or:\n" |
| 250 | "\n" |
| 251 | "\tgit rebase\n")); |
| 252 | die(_("Not possible to fast-forward, aborting.")); |
| 253 | } |
| 254 | |
| 255 | void advise_on_updating_sparse_paths(struct string_list *pathspec_list) |
| 256 | { |
no test coverage detected