diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:34 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
| commit | 52eb738d6b40bf8816727fcf7f39febc761ef0db (patch) | |
| tree | 78f8a2baf0660a987b2fdc93665def51f44e5432 /Documentation | |
| parent | rebase: move incompatibility checks between backend options a bit earlier (diff) | |
| download | tgif-52eb738d6b40bf8816727fcf7f39febc761ef0db.tar.xz | |
rebase: add an --am option
Currently, this option doesn't do anything except error out if any
options requiring the interactive-backend are also passed. However,
when we make the default backend configurable later in this series, this
flag will provide a way to override the config setting.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6e2569cd8a..93092da3bf 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -258,6 +258,13 @@ See also INCOMPATIBLE OPTIONS below. original branch. The index and working tree are also left unchanged as a result. +--am: + Use git-am internally to rebase. This option may become a + no-op in the future once the interactive backend handles + everything the am one does. ++ +See also INCOMPATIBLE OPTIONS below. + --empty={drop,keep,ask}:: How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become @@ -378,7 +385,7 @@ See also INCOMPATIBLE OPTIONS below. Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is - ever ignored. + ever ignored. Implies --am. + See also INCOMPATIBLE OPTIONS below. @@ -418,6 +425,7 @@ with `--keep-base` in order to drop those commits from your branch. --whitespace=<option>:: These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. + Implies --am. + See also INCOMPATIBLE OPTIONS below. @@ -561,6 +569,7 @@ INCOMPATIBLE OPTIONS The following options: + * --am * --committer-date-is-author-date * --ignore-date * --ignore-whitespace |