summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:23:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:23:01 -0700
commit0def7126fda12600017a1d8cd598ee0516cf60a2 (patch)
treeb6d32fc682657ea5511434178748a7a56a0f56bc /Documentation/howto
parentMerge branch 'es/contacts' (diff)
parenttypofix: in-code comments (diff)
downloadtgif-0def7126fda12600017a1d8cd598ee0516cf60a2.tar.xz
Merge branch 'ob/typofixes'
* ob/typofixes: typofix: in-code comments typofix: documentation typofix: release notes
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/revert-branch-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 84dd839db4..0d5419e1a9 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