summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorLibravatar Pavel Roskin <proski@gnu.org>2006-07-09 03:44:30 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-09 02:42:41 -0700
commitaddf88e455f85bc6cfe0284b70aaad10b6d3486e (patch)
tree704e8b6de26fde0bff86618e363dbde9f70e1393 /Documentation/howto
parentMerge branch 'sf/diff' (diff)
downloadtgif-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.xz
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/isolate-bugs-with-bisect.txt2
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/howto/isolate-bugs-with-bisect.txt b/Documentation/howto/isolate-bugs-with-bisect.txt
index edbcd4c661..926bbdc3cb 100644
--- a/Documentation/howto/isolate-bugs-with-bisect.txt
+++ b/Documentation/howto/isolate-bugs-with-bisect.txt
@@ -28,7 +28,7 @@ Then do
and at this point "git bisect" will churn for a while, and tell you what
the mid-point between those two commits are, and check that state out as
-the head of the bew "bisect" branch.
+the head of the new "bisect" branch.
Compile and reboot.
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index c2d4a91c7c..fcd64e9b9b 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -124,7 +124,7 @@ up your changes, along with other changes.
The two commits #2' and #3' in the above picture record the same
changes your e-mail submission for #2 and #3 contained, but
-probably with the new sign-off line added by the upsteam
+probably with the new sign-off line added by the upstream
maintainer and definitely with different committer and ancestry
information, they are different objects from #2 and #3 commits.