diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:51 -0700 |
| commit | fd707807f012438ab58ce6bd819ea38feca781a7 (patch) | |
| tree | ac88cc03b91210b9398a2ed09555c799c845e886 /t | |
| parent | Merge branch 'jk/asciidoc-markup-fix' (diff) | |
| parent | log: do not shorten decoration names too early (diff) | |
| download | tgif-fd707807f012438ab58ce6bd819ea38feca781a7.tar.xz | |
Merge branch 'mg/log-decorate-HEAD'
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 |