diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:25:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:25:51 (GMT) |
| commit | 347231f7352a4caac8bd95924c20afde4455c89c (patch) | |
| tree | 6c3fd7829891c5292f58bacbc969212d9e14c01c /Documentation/rev-list-options.txt | |
| parent | f696543dad6c7ba27b0c4fab167a5687263a9ba0 (diff) | |
| parent | 565e135a1e5fc393f764415a4724f43cc07f4da6 (diff) | |
| download | git-347231f7352a4caac8bd95924c20afde4455c89c.zip git-347231f7352a4caac8bd95924c20afde4455c89c.tar.gz git-347231f7352a4caac8bd95924c20afde4455c89c.tar.bz2 | |
Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
* jn/maint-doc-dashdash:
Documentation: quote double-dash for AsciiDoc
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 7e7ba68..554ab8c 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -313,7 +313,7 @@ that you are filtering for a file `foo` in this commit graph: \ / / / / `-------------' ----------------------------------------------------------------------- -The horizontal line of history A--P is taken to be the first parent of +The horizontal line of history A---P is taken to be the first parent of each merge. The commits are: * `I` is the initial commit, in which `foo` exists with contents |