From 606389ae2dc3c0bd269de3d918ffd12c43e75008 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Tue, 10 Jan 2012 18:31:47 -0600 Subject: [PATCH 1/2] Spell correction in Interactive Rebasing chapter. --- text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown index defcc336..07cd43d1 100644 --- a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown +++ b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown @@ -1,7 +1,7 @@ ## Interactive Rebasing ## You can also rebase interactively. This is often used to re-write your -own commit objects before pusing them somewhere. It is an easy way to +own commit objects before pushing them somewhere. It is an easy way to split, merge or re-order commits before sharing them with others. You can also use it to clean up commits you've pulled from someone when applying them locally. From 4960ae50e7a87519b8a05f78b88194b0bffa125c Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Tue, 10 Jan 2012 18:48:37 -0600 Subject: [PATCH 2/2] Change to plural adverb in Rebasing chapter. --- text/13_Rebasing/0_ Rebasing.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/13_Rebasing/0_ Rebasing.markdown b/text/13_Rebasing/0_ Rebasing.markdown index fa065042..ff37d398 100644 --- a/text/13_Rebasing/0_ Rebasing.markdown +++ b/text/13_Rebasing/0_ Rebasing.markdown @@ -16,7 +16,7 @@ Now you do some work, creating two new commits. ... Meanwhile, someone else does some work creating two new commits on the origin -branch too. This means both 'origin' and 'mywork' has advanced, which means +branch too. This means both 'origin' and 'mywork' have advanced, which means the work has diverged. [fig:rebase1]