mirror of
https://github.com/git/git.git
synced 2024-04-27 23:45:12 +02:00
48229c193d
This is to ensure we won't break different diff formats when we start to imply "-p" by "-m". Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.7 KiB
Plaintext
62 lines
1.7 KiB
Plaintext
$ git log -m --raw master
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
|
|
Merge: 9a6d494 c7a2ab9
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
Merge branch 'side'
|
|
|
|
:100644 100644 cead32e... 992913c... M dir/sub
|
|
:100644 100644 b414108... 10a8a9f... M file0
|
|
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
|
|
Merge: 9a6d494 c7a2ab9
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
Merge branch 'side'
|
|
|
|
:100644 100644 7289e35... 992913c... M dir/sub
|
|
:100644 100644 f4615da... 10a8a9f... M file0
|
|
:000000 100644 0000000... b1e6722... A file1
|
|
:100644 000000 01e79c3... 0000000... D file2
|
|
:100644 000000 7289e35... 0000000... D file3
|
|
|
|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:03:00 2006 +0000
|
|
|
|
Side
|
|
|
|
:100644 100644 35d242b... 7289e35... M dir/sub
|
|
:100644 100644 01e79c3... f4615da... M file0
|
|
:000000 100644 0000000... 7289e35... A file3
|
|
|
|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:02:00 2006 +0000
|
|
|
|
Third
|
|
|
|
:100644 100644 8422d40... cead32e... M dir/sub
|
|
:000000 100644 0000000... b1e6722... A file1
|
|
|
|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:01:00 2006 +0000
|
|
|
|
Second
|
|
|
|
This is the second commit.
|
|
|
|
:100644 100644 35d242b... 8422d40... M dir/sub
|
|
:100644 100644 01e79c3... b414108... M file0
|
|
:100644 000000 01e79c3... 0000000... D file2
|
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:00:00 2006 +0000
|
|
|
|
Initial
|
|
$
|