diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 22:00:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 22:00:15 +0300 |
| commit | 5efef305d888f49ed8fce3708169a0df552ca24f (patch) | |
| tree | b8cf09cc9556bfa122ad17e7b0cd7817d0726290 /t | |
| parent | 5e896a37c7aa3cf7bf770e7dd2d93af928a4140a (diff) | |
| parent | 429ad204136b2de1cfd2e7f7f5b20df211996c9f (diff) | |
Merge branch 'mg/log-decorate-HEAD' into maint
The "log --decorate" enhancement in Git 2.4 that shows the commit
at the tip of the current branch e.g. "HEAD -> master", did not
work with --decorate=full.
* mg/log-decorate-HEAD:
log: do not shorten decoration names too early
log: decorate HEAD with branch name under --decorate=full, too
Diffstat (limited to 't')
| -rw-r--r-- | t/t4013/diff.log_--decorate=full_--all | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all index 44d45257da..b345b2ebfa 100644 --- a/t/t4013/diff.log_--decorate=full_--all +++ b/t/t4013/diff.log_--decorate=full_--all @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:06:00 2006 +0000 Rearranged lines in dir/sub -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, refs/heads/master) +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 |