diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-25 14:46:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-25 14:46:12 -0700 |
| commit | d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4 (patch) | |
| tree | 5c5c94d5853acf90d9e379de637c7b21ba5dc92f /t | |
| parent | b91069ae9a6cb2d92fa6a5ed6d258bed530abcc7 (diff) | |
| parent | 33e7018c459e6583b899690cabd21c808ffd3c85 (diff) | |
| download | git-d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4.tar.gz git-d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4.tar.xz | |
Merge branch 'lh/short-decorate'
* lh/short-decorate:
git-log: allow --decorate[=short|full]
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 1 | ||||
| -rw-r--r-- | t/t4013/diff.log_--decorate=full_--all | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8b33321f8..8e3694ed5 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -207,6 +207,7 @@ log --root --cc --patch-with-stat --summary master log -SF master log -SF -p master log --decorate --all +log --decorate=full --all rev-list --parents HEAD rev-list --children HEAD diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all new file mode 100644 index 000000000..903d9d965 --- /dev/null +++ b/t/t4013/diff.log_--decorate=full_--all @@ -0,0 +1,34 @@ +$ git log --decorate=full --all +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/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) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:03:00 2006 +0000 + + Side + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ |