log_--diff-merges=first-parent_main
56 lines
1.02 KB
| 1 | $ git log --diff-merges=first-parent main |
| 2 | commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 |
| 3 | Merge: 9a6d494 c7a2ab9 |
| 4 | Author: A U Thor <author@example.com> |
| 5 | Date: Mon Jun 26 00:04:00 2006 +0000 |
| 6 | |
| 7 | Merge branch 'side' |
| 8 | |
| 9 | diff --git a/dir/sub b/dir/sub |
| 10 | index cead32e..992913c 100644 |
| 11 | --- a/dir/sub |
| 12 | +++ b/dir/sub |
| 13 | @@ -4,3 +4,5 @@ C |
| 14 | D |
| 15 | E |
| 16 | F |
| 17 | +1 |
| 18 | +2 |
| 19 | diff --git a/file0 b/file0 |
| 20 | index b414108..10a8a9f 100644 |
| 21 | --- a/file0 |
| 22 | +++ b/file0 |
| 23 | @@ -4,3 +4,6 @@ |
| 24 | 4 |
| 25 | 5 |
| 26 | 6 |
| 27 | +A |
| 28 | +B |
| 29 | +C |
| 30 | |
| 31 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a |
| 32 | Author: A U Thor <author@example.com> |
| 33 | Date: Mon Jun 26 00:03:00 2006 +0000 |
| 34 | |
| 35 | Side |
| 36 | |
| 37 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 |
| 38 | Author: A U Thor <author@example.com> |
| 39 | Date: Mon Jun 26 00:02:00 2006 +0000 |
| 40 | |
| 41 | Third |
| 42 | |
| 43 | commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 |
| 44 | Author: A U Thor <author@example.com> |
| 45 | Date: Mon Jun 26 00:01:00 2006 +0000 |
| 46 | |
| 47 | Second |
| 48 | |
| 49 | This is the second commit. |
| 50 | |
| 51 | commit 444ac553ac7612cc88969031b02b3767fb8a353a |
| 52 | Author: A U Thor <author@example.com> |
| 53 | Date: Mon Jun 26 00:00:00 2006 +0000 |
| 54 | |
| 55 | Initial |
| 56 | $ |