summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorŠtěpán Němec <stepnem@gmail.com>2012-07-14 22:20:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-06 22:34:20 (GMT)
commit7615cb005bf15abce05cbdde775e5fdf4662d655 (patch)
tree2fa0f11a15470fc63269e8be3fbcfaa786c66d41 /Documentation/git-rebase.txt
parent1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3 (diff)
downloadgit-7615cb005bf15abce05cbdde775e5fdf4662d655.zip
git-7615cb005bf15abce05cbdde775e5fdf4662d655.tar.gz
git-7615cb005bf15abce05cbdde775e5fdf4662d655.tar.bz2
doc: A few minor copy edits.
- (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 147fa1a..feb51a6 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -273,7 +273,7 @@ which makes little sense.
Pass the <strategy-option> through to the merge strategy.
This implies `--merge` and, if no strategy has been
specified, `-s recursive`. Note the reversal of 'ours' and
- 'theirs' as noted in above for the `-m` option.
+ 'theirs' as noted above for the `-m` option.
-q::
--quiet::