diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-12 12:27:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-12 13:25:18 -0800 |
| commit | 4d924528d8bfe947abfc54ee9bd3892ab509c8cd (patch) | |
| tree | 0274efc726cd0e9f27916b976c59a9aaf5380a1b /Documentation | |
| parent | Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' (diff) | |
| download | tgif-4d924528d8bfe947abfc54ee9bd3892ab509c8cd.tar.xz | |
Revert "Merge branch 'ra/rebase-i-more-options'"
This reverts commit 5d9324e0f4210bb7d52bcb79efe3935703083f72, reversing
changes made to c58ae96fc4bb11916b62a96940bb70bb85ea5992.
The topic turns out to be too buggy for real use.
cf. <f2fe7437-8a48-3315-4d3f-8d51fe4bb8f1@gmail.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.25.0.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 27 |
2 files changed, 6 insertions, 24 deletions
diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.txt index cd81216e3e..91ceb34927 100644 --- a/Documentation/RelNotes/2.25.0.txt +++ b/Documentation/RelNotes/2.25.0.txt @@ -53,9 +53,6 @@ UI, Workflows & Features or a named file, instead of taking it as the command line arguments, with the "--pathspec-from-file" option. - * "git rebase -i" learned a few options that are known by "git - rebase" proper. - * "git submodule" learned a subcommand "set-url". * "git log" family learned "--pretty=reference" that gives the name diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1d0e2d27cc..0c4f038dd6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -393,31 +393,16 @@ your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch. --ignore-whitespace:: - Behaves differently depending on which backend is selected. -+ -'am' backend: When applying a patch, ignore changes in whitespace in -context lines if necessary. -+ -'interactive' backend: Treat lines with only whitespace changes as -unchanged for the sake of a three-way merge. - --whitespace=<option>:: - This flag is passed to the 'git apply' program + These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. + See also INCOMPATIBLE OPTIONS below. --committer-date-is-author-date:: - Instead of recording the time the rebased commits are - created as the committer date, reuse the author date - as the committer date. This implies --force-rebase. - --ignore-date:: ---reset-author-date:: - By default, the author date of the original commit is used - as the author date for the resulting commit. This option - tells Git to use the current timestamp instead and implies - `--force-rebase`. + These flags are passed to 'git am' to easily change the dates + of the rebased commits (see linkgit:git-am[1]). + See also INCOMPATIBLE OPTIONS below. @@ -554,7 +539,10 @@ INCOMPATIBLE OPTIONS The following options: + * --committer-date-is-author-date + * --ignore-date * --whitespace + * --ignore-whitespace * -C are incompatible with the following options: @@ -577,9 +565,6 @@ 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 --ignore-whitespace - * --preserve-merges and --committer-date-is-author-date - * --preserve-merges and --ignore-date * --keep-base and --onto * --keep-base and --root |