diff options
| author | Štěpán Němec <stepnem@gmail.com> | 2012-07-14 22:20:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 05:32:28 (GMT) |
| commit | edfbbf7eead3001f8c4273220d043890421d7b73 (patch) | |
| tree | dd5429f7811425334a3ad80c309382124893c93a /Documentation/git-rebase.txt | |
| parent | 7bdb74868cf51245bce6ab033a1588e312e87310 (diff) | |
| download | git-edfbbf7eead3001f8c4273220d043890421d7b73.zip git-edfbbf7eead3001f8c4273220d043890421d7b73.tar.gz git-edfbbf7eead3001f8c4273220d043890421d7b73.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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2d71e4b..2cab7e2 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:: |