Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-rebase.txt: Fix spelling
author
Horst H. von Brand
<vonbrand@inf.utfsm.cl>
Thu, 21 Jan 2010 20:34:25 +0000
(17:34 -0300)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 21 Jan 2010 23:02:45 +0000
(15:02 -0800)
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5a9f039
)
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 89a957ef77bf4a832959e8b57bec3bf197f024cb..823f2a4638c5b53671e294faf7a99a56d17c897a 100644
(file)
--- a/
Documentation/git-rebase.txt
+++ b/
Documentation/git-rebase.txt
@@
-312,7
+312,7
@@
which makes little sense.
When the commit log message begins with "squash! ..." (or
"fixup! ..."), and there is a commit whose title begins with
the same ..., automatically modify the todo list of rebase -i
- so that the commit marked for
quashing come
right after the
+ so that the commit marked for
squashing comes
right after the
commit to be modified, and change the action of the moved
commit from `pick` to `squash` (or `fixup`).
+