Путеводитель по Руководству Linux
  User  |  Syst  |  Libr  |  Device  |  Files  |  Other  |  Admin  |  Head  |


   git-rebase    ( 1 )

повторное применение коммитов поверх другого базового наконечника (Reapply commits on top of another base tip)

INCOMPATIBLE OPTIONS

The following options:


       •   --apply


       •   --whitespace


       •   -C


       are incompatible with the following options:


       •   --merge


       •   --strategy


       •   --strategy-option


       •   --allow-empty-message


       •   --[no-]autosquash


       •   --rebase-merges


       •   --preserve-merges


       •   --interactive


       •   --exec


       •   --no-keep-empty


       •   --empty=


       •   --reapply-cherry-picks


       •   --edit-todo


       •   --root when used in combination with --onto


       In addition, the following pairs of options are incompatible:


       •   --preserve-merges and --interactive


       •   --preserve-merges and --signoff


       •   --preserve-merges and --rebase-merges


       •   --preserve-merges and --empty=


       •   --preserve-merges and --ignore-whitespace


       •   --preserve-merges and --committer-date-is-author-date


       •   --preserve-merges and --ignore-date


       •   --keep-base and --onto


       •   --keep-base and --root


       •   --fork-point and --root