diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 20:24:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 20:24:57 -0700 |
| commit | d7fccbf9c67ab9111bc853a5fc90aa87d2d3f9c0 (patch) | |
| tree | c35d99c84c5b6f4e4c14928f9465522b255bfa8c /rev-list-options.txt | |
| parent | 58f587aef6ee6b6b759fe8f4dd500f471eee1b88 (diff) | |
| download | git-htmldocs-d7fccbf9c67ab9111bc853a5fc90aa87d2d3f9c0.tar.gz | |
Autogenerated HTML docs for v1.8.4-rc0
Diffstat (limited to 'rev-list-options.txt')
| -rw-r--r-- | rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index e632e8576..27f8de3d8 100644 --- a/rev-list-options.txt +++ b/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`. |