diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:21 (GMT) |
| commit | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch) | |
| tree | 53941cdc41e6ad573859ee63c570499b869fc967 /Documentation/config/advice.txt | |
| parent | b4b8c35729985a8f1f5e22f82259a2499efbc37a (diff) | |
| parent | dcb500dc16ce8db556b51e9a5b3fa977111d0443 (diff) | |
| download | git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.zip git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.gz git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.bz2 | |
Merge branch 'ra/cherry-pick-revert-skip'
"git cherry-pick/revert" learned a new "--skip" action.
* ra/cherry-pick-revert-skip:
cherry-pick/revert: advise using --skip
cherry-pick/revert: add --skip option
sequencer: use argv_array in reset_merge
sequencer: rename reset_for_rollback to reset_merge
sequencer: add advice for revert
Diffstat (limited to 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index ee85c53..6aaa360 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -68,6 +68,8 @@ advice.*:: resolveConflict:: Advice shown by various commands when conflicts prevent the operation from being performed. + sequencerInUse:: + Advice shown when a sequencer command is already in progress. implicitIdentity:: Advice on how to set your identity configuration when your information is guessed from the system username and |