X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4013%2Fdiff.log_--decorate_--all;h=fd7c3e64396b4ea57c3b03d2e120580205263462;hb=4b3c1800613fcebdb3c6d7e99bfd8e670ec67248;hp=12da8ac07de4423cf4736aced96bab8150f83ef0;hpb=037e9d5b1575d7ede05b50c317d9d88258556d84;p=git.git diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all index 12da8ac07..fd7c3e643 100644 --- a/t/t4013/diff.log_--decorate_--all +++ b/t/t4013/diff.log_--decorate_--all @@ -1,12 +1,12 @@ $ git log --decorate --all -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master) +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, master) Merge: 9a6d494 c7a2ab9 Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000 Merge branch 'side' -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) Author: A U Thor Date: Mon Jun 26 00:03:00 2006 +0000 @@ -26,7 +26,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000 This is the second commit. -commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial) +commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial) Author: A U Thor Date: Mon Jun 26 00:00:00 2006 +0000