From: Matthieu Moy <redacted>
In any case, I can't reproduce with 1.8.1.2.526.gf51a757: I don't get
undless output. On the other hand, I get a slightly misformatted output:
* commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 2c1e6a36f4b712e914fac994463da7d0fdb2bc6d)
|\ Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
| |
| | Commit S
| |
| | diff --git a/file b/file
| | index 6bb4d3e..afd2e75 100644
| | --- a/file
| | +++ b/file
| | @@ -1,4 +1,5 @@
| | 1
| | 1a
| | 2
| | +2a
| | 3
| |
commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8)
| | Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
The second "commit" line (diff with second parent) doesn't have the
"| |" prefix, I don't think this is intentional.
The second "commit" line should start with "| * ":
| |
| * commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8)
| | Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
Dale
On Wed, Feb 06, 2013 at 10:03:00AM -0500, Dale R. Worley wrote:
quoted
From: Matthieu Moy <redacted>
In any case, I can't reproduce with 1.8.1.2.526.gf51a757: I don't get
undless output. On the other hand, I get a slightly misformatted output:
* commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 2c1e6a36f4b712e914fac994463da7d0fdb2bc6d)
|\ Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
| |
| | Commit S
| |
| | diff --git a/file b/file
| | index 6bb4d3e..afd2e75 100644
| | --- a/file
| | +++ b/file
| | @@ -1,4 +1,5 @@
| | 1
| | 1a
| | 2
| | +2a
| | 3
| |
commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8)
| | Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
The second "commit" line (diff with second parent) doesn't have the
"| |" prefix, I don't think this is intentional.
The second "commit" line should start with "| * ":
No. That would indicate a commit on the branch that is the second
parent of the first commit. But this is the same commit as the one
above, just with a diff against its second parent instead of its first
parent.
I would argue that the line should start with "| | ", since it really is
just a continuation of the same commit.
| |
| | commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8)
| | Merge: 2c1e6a3 33e70e7
| | Author: Matthieu Moy [off-list ref]
| | Date: Tue Feb 5 22:05:33 2013 +0100
John