Merge branch 'jn/cherry-revert-message-clean-up'
* jn/cherry-revert-message-clean-up: tests: fix syntax error in "Use advise() for hints" test cherry-pick/revert: Use advise() for hints cherry-pick/revert: Use error() for failure message Introduce advise() to print hints Eliminate “Finished cherry-pick/revert” message t3508: add check_head_differs_from() helper function and use it revert: improve success message by adding abbreviated commit sha1 revert: don't print "Finished one cherry-pick." if commit failed revert: refactor commit code into a new run_git_commit() function revert: report success when using option --strategy
This commit is contained in:
@ -112,25 +112,19 @@ $ git tag pu-anchor pu
|
||||
$ git rebase master
|
||||
* Applying: Redo "revert" using three-way merge machinery.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: Remove git-apply-patch-script.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Simple cherry-pick fails; trying Automatic cherry-pick.
|
||||
Removing Documentation/git-apply-patch-script.txt
|
||||
Removing git-apply-patch-script
|
||||
Finished one cherry-pick.
|
||||
* Applying: Document "git cherry-pick" and "git revert"
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: mailinfo and applymbox updates
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: Show commits in topo order and name all commits.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: More documentation updates.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
------------------------------------------------
|
||||
|
||||
The temporary tag 'pu-anchor' is me just being careful, in case 'git
|
||||
|
Reference in New Issue
Block a user