X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Frevert-branch-rebase.txt;h=85f69dbac9187ff504d4656cfab5efe074223161;hb=a8a5406ab32fccabf8ed08001d50b5373e18ff1a;hp=0d5419e1a9a6be235069f5807da08cc4e4052247;hpb=400bf4c46b2bf01cca2658c7d7b4774d7a711486;p=thirdparty%2Fgit.git diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index 0d5419e1a9..85f69dbac9 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -154,7 +154,7 @@ $ git pull . master Packing 0 objects Unpacking 0 objects -* committish: e3a693c... refs/heads/master from . +* commit-ish: e3a693c... refs/heads/master from . Trying to merge e3a693c... into 8c1f5f0... using 10d781b... Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f cache.h | 8 ++++----