From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Aug 2010 23:25:11 +0000 (-0700)
Subject: Merge branch 'jn/cherry-revert-message-clean-up'
X-Git-Tag: v1.7.3-rc0~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae76cb90cb835f9df42e849206ab55a1e1e1eea3;p=git.git

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
---

ae76cb90cb835f9df42e849206ab55a1e1e1eea3
diff --cc git-rebase--interactive.sh
index 4d14b077d,8f6876d30..eb2dff55f
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -111,12 -111,11 +111,12 @@@ VERBOSE
  OK_TO_SKIP_PRE_REBASE=
  REBASE_ROOT=
  AUTOSQUASH=
 +test "$(git config --bool rebase.autosquash)" = "true" && AUTOSQUASH=t
  NEVER_FF=
  
- GIT_CHERRY_PICK_HELP="  After resolving the conflicts,
- mark the corrected paths with 'git add <paths>', and
- run 'git rebase --continue'"
+ GIT_CHERRY_PICK_HELP="\
+ hint: after resolving the conflicts, mark the corrected paths
+ hint: with 'git add <paths>' and run 'git rebase --continue'"
  export GIT_CHERRY_PICK_HELP
  
  warn () {