X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Frevert-branch-rebase.txt;h=85f69dbac9187ff504d4656cfab5efe074223161;hb=a8a5406ab32fccabf8ed08001d50b5373e18ff1a;hp=84dd839db43560d5d459f403904ebb3769521064;hpb=283c63fac2c76deda2058f03000e18fb35d44fb6;p=thirdparty%2Fgit.git diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index 84dd839db4..85f69dbac9 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -12,7 +12,7 @@ How to revert an existing commit ================================ One of the changes I pulled into the 'master' branch turns out to -break building Git with GCC 2.95. While they were well intentioned +break building Git with GCC 2.95. While they were well-intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the 'master' branch and to adjust the 'pu' branch, using core Git tools and @@ -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 ++++----