diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2013-07-22 23:02:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 16:06:48 -0700 |
| commit | 17b83d71d52a5eb6a621be22daa624414d3ee514 (patch) | |
| tree | 2d55c178ce0711b08eef3a4e9886606954cfbf27 /Documentation/rev-list-options.txt | |
| parent | 1114fc023772001bb7053789461c69b0c3c994e3 (diff) | |
| download | git-17b83d71d52a5eb6a621be22daa624414d3ee514.tar.gz | |
typofix: documentation
Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index e632e8576e..27f8de3d86 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -369,7 +369,7 @@ each merge. The commits are: * `E` changes `quux` to "xyzzy", and its merge `P` combines the strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`. -* `X` is an indpendent root commit that added a new file `side`, and `Y` +* `X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`. |