diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:19 +0300 |
| commit | 6c083b7619f171d32df633ca0281653afabd788f (patch) | |
| tree | 1b1284680cfdfdee92314da6ea0978658bef24b1 /Documentation/config/advice.txt | |
| parent | 8463beaeb69fe0b7f651065813def4aa6827cd5d (diff) | |
| parent | 767a4ca648f8791c1fb623bd9f79fd8d7f026499 (diff) | |
Merge branch 'js/advise-when-skipping-cherry-picked'
"git rebase" by default skips changes that are equivalent to
commits that are already in the history the branch is rebased onto;
give messages when this happens to let the users be aware of
skipped commits, and also teach them how to tell "rebase" to keep
duplicated changes.
* js/advise-when-skipping-cherry-picked:
sequencer: advise if skipping cherry-picked commit
Diffstat (limited to 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 8b2849ff7b..063eec2511 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -44,6 +44,9 @@ advice.*:: Shown when linkgit:git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally. + skippedCherryPicks:: + Shown when linkgit:git-rebase[1] skips a commit that has already + been cherry-picked onto the upstream branch. statusAheadBehind:: Shown when linkgit:git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, |