diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 12:43:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 12:43:50 +0400 |
| commit | 44ee247f8db243fbd3c50fee0fe35696ed7da8d3 (patch) | |
| tree | 3bab3e93cd2752fd0e45d5b982242addbf20c18d /t | |
| parent | 212fa1d96040a01054d6bd92ee2bb74fe7071d33 (diff) | |
| parent | de435ac0f633b1f68dba2970cb7fa019171e40fe (diff) | |
Merge branch 'fc/decorate-tag'
* fc/decorate-tag:
Prettify log decorations even more
Change prettify_ref to prettify_refname
Diffstat (limited to 't')
| -rw-r--r-- | t/t4013/diff.log_--decorate_--all | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all index 12da8ac07d..954210ea90 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 (master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 Merge branch 'side' -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) Author: A U Thor <author@example.com> 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 <author@example.com> Date: Mon Jun 26 00:00:00 2006 +0000 |