X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Frevert-branch-rebase.txt;h=8c32da6deb05b5da700a5bd0a4281bf862b23f2c;hb=7a4383cf13819cd2ef00f0d60318aad3f1813117;hp=e70d8a31e7b05e8efc70c6a56f476324065d57a6;hpb=a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67;p=git.git diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index e70d8a31e..8c32da6de 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch ------------------------------------------------ $ git checkout master -$ git merge revert-c99 ;# this should be a fast forward +$ git merge revert-c99 ;# this should be a fast-forward Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c... cache.h | 8 ++++---- commit.c | 2 +- @@ -95,7 +95,7 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c... 5 files changed, 8 insertions(+), 8 deletions(-) ------------------------------------------------ -There is no need to redo the test at this point. We fast forwarded +There is no need to redo the test at this point. We fast-forwarded and we know 'master' matches 'revert-c99' exactly. In fact: ------------------------------------------------