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

Merge branch 'jn/cherry-revert-message-clean-up'

Browse Source 
* 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:
Junio C Hamano
2010-08-31 16:25:11 -07:00
parent 7cc1e385a0 997b688769
commit ae76cb90cb
6 changed files with 154 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/examples/git-revert.sh
View File

@ -181,7 +181,6 @@ Conflicts:
esac
exit 1
}
echo >&2 "Finished one $me."
# If we are cherry-pick, and if the merge did not result in
# hand-editing, we will hit this commit and inherit the original