diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:25:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:25:11 -0700 |
| commit | ae76cb90cb835f9df42e849206ab55a1e1e1eea3 (patch) | |
| tree | 020dfd2630734d221cc2894afef5cd51b6876c28 /contrib | |
| parent | 7cc1e385a0b0caa27de714a6c7242b14bf023a65 (diff) | |
| parent | 997b688769f8d3ea539990ab53d6a44a46a2b2b4 (diff) | |
| download | git-ae76cb90cb835f9df42e849206ab55a1e1e1eea3.tar.gz git-ae76cb90cb835f9df42e849206ab55a1e1e1eea3.tar.xz | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/examples/git-revert.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/examples/git-revert.sh b/contrib/examples/git-revert.sh index 49f00321b..60a05a8b9 100755 --- a/contrib/examples/git-revert.sh +++ b/contrib/examples/git-revert.sh @@ -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 |