mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ra/cherry-pick-revert-skip'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2019-07-19 11:30:21 -07:00
parent b4b8c35729 dcb500dc16
commit d97c62c828
11 changed files with 266 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
advice.h
View File

@ -17,6 +17,7 @@ extern int advice_status_ahead_behind_warning;
extern int advice_commit_before_merge;
extern int advice_reset_quiet_warning;
extern int advice_resolve_conflict;
extern int advice_sequencer_in_use;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;