global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

--dirstat: Describe non-obvious differences relative to --stat or regular diff

Browse Source 
Also add a testcase documenting the current behavior.

Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johan Herland
2011-04-11 00:48:50 +02:00
committed by Junio C Hamano
parent 5fb41b883a
commit 204f01a2f7
6 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t4013/diff.diff_--dirstat_initial_rearrange Normal file
View File

@@ -0,0 +1,2 @@
$ git diff --dirstat initial rearrange
$

2
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
View File

@@ -1,7 +1,7 @@
$ git format-patch --stdout --cover-letter -n initial..master^
From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: C O Mitter <committer@example.com>
Date: Mon, 26 Jun 2006 00:05:00 +0000
Date: Mon, 26 Jun 2006 00:06:00 +0000
Subject: [DIFFERENT_PREFIX 0/2] *** SUBJECT HERE ***
*** BLURB HERE ***

6
t/t4013/diff.log_--decorate=full_--all
View File

@@ -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>

6
t/t4013/diff.log_--decorate_--all
View File

@@ -1,4 +1,10 @@
$ git log --decorate --all
commit cd4e72fd96faed3f0ba949dc42967430374e2290 (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, master)
Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>