Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion text/13_Rebasing/0_ Rebasing.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down