diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:59:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:59:07 -0700 |
| commit | f5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f (patch) | |
| tree | 974ffecbcfaa90e90a2d72ee98bcc11cf694723f /t/t4013/diff.log_--decorate=full_--all | |
| parent | Merge branch 'sp/maint-clear-postfields' into maint (diff) | |
| parent | --dirstat: In case of renames, use target filename instead of source filename (diff) | |
| download | tgif-f5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f.tar.xz | |
Merge branch 'jh/dirstat' into maint
* jh/dirstat:
--dirstat: In case of renames, use target filename instead of source filename
Teach --dirstat not to completely ignore rearranged lines within a file
--dirstat-by-file: Make it faster and more correct
--dirstat: Describe non-obvious differences relative to --stat or regular diff
Diffstat (limited to 't/t4013/diff.log_--decorate=full_--all')
| -rw-r--r-- | t/t4013/diff.log_--decorate=full_--all | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all index d155e0bab2..44d45257da 100644 --- a/t/t4013/diff.log_--decorate=full_--all +++ b/t/t4013/diff.log_--decorate=full_--all @@ -1,4 +1,10 @@ $ git log --decorate=full --all +commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + Rearranged lines in dir/sub + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, refs/heads/master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> |