aboutsummaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-31 16:25:11 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-31 16:25:11 -0700
commitae76cb90cb835f9df42e849206ab55a1e1e1eea3 (patch)
tree020dfd2630734d221cc2894afef5cd51b6876c28 /Documentation/howto
parent7cc1e385a0b0caa27de714a6c7242b14bf023a65 (diff)
parent997b688769f8d3ea539990ab53d6a44a46a2b2b4 (diff)
downloadgit-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 'Documentation/howto')
-rw-r--r--Documentation/howto/revert-branch-rebase.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 8c32da6de..093c65604 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -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