diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 12:54:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 12:54:21 -0700 |
commit | 7d6f46e6146b1934447203aaec7403cbc44c7710 (patch) | |
tree | 2392827358bf0e6396238d97b4f447b956b8a9a0 /git-rebase.txt | |
parent | 810dc8f1583cea4aa8bebdfbbc5da4b72f4b0b20 (diff) | |
download | git-htmldocs-7d6f46e6146b1934447203aaec7403cbc44c7710.tar.gz |
Autogenerated HTML docs for v2.33.0-328-g8b7c1
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 3f1030df7..506345cb0 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -79,9 +79,10 @@ remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit -will be skipped. For example, running `git rebase master` on the -following history (in which `A'` and `A` introduce the same set of changes, -but have different committer information): +will be skipped and warnings will be issued (if the `merge` backend is +used). For example, running `git rebase master` on the following +history (in which `A'` and `A` introduce the same set of changes, but +have different committer information): ------------ A---B---C topic @@ -312,7 +313,10 @@ See also INCOMPATIBLE OPTIONS below. By default (or if `--no-reapply-cherry-picks` is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number -of upstream commits that need to be read. +of upstream commits that need to be read. When using the `merge` +backend, warnings will be issued for each dropped commit (unless +`--quiet` is given). Advice will also be issued unless +`advice.skippedCherryPicks` is set to false (see linkgit:git-config[1]). + `--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance. |