diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
| commit | 28c8a447dd4d6420fc08106efa1c288246b15845 (patch) | |
| tree | c1c40e1070da9044ca23ab7250ce1d6be868949b /t/t4013/diff.diff_--raw_initial | |
| parent | 12361d025fe0752342dabb06d79ff541eb081002 (diff) | |
| parent | 43d1948b7b84abc744227259dd1a3e8dfbb60358 (diff) | |
| download | git-28c8a447dd4d6420fc08106efa1c288246b15845.tar.xz | |
Merge branch 'jb/diff-no-index-no-abbrev' into maint
"git diff --no-index" did not take "--no-abbrev" option.
* jb/diff-no-index-no-abbrev:
diff: handle --no-abbrev in no-index case
Diffstat (limited to 't/t4013/diff.diff_--raw_initial')
| -rw-r--r-- | t/t4013/diff.diff_--raw_initial | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--raw_initial b/t/t4013/diff.diff_--raw_initial new file mode 100644 index 0000000000..a3e978040d --- /dev/null +++ b/t/t4013/diff.diff_--raw_initial @@ -0,0 +1,6 @@ +$ git diff --raw initial +:100644 100644 35d242b... 992913c... M dir/sub +:100644 100644 01e79c3... 10a8a9f... M file0 +:000000 100644 0000000... b1e6722... A file1 +:100644 000000 01e79c3... 0000000... D file2 +$ |