diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-28 00:03:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 00:08:29 -0800 |
| commit | ea726d02e9677a66586d7ffebe97f112ab6dab33 (patch) | |
| tree | d2248253c5d6b025cbd5dbfabbecf19788f2bc10 /git-applypatch.sh | |
| parent | 3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd (diff) | |
| download | git-ea726d02e9677a66586d7ffebe97f112ab6dab33.tar.gz | |
diff-files: -c and --cc options.
This ports the "combined diff" to diff-files so that differences
to the working tree files since stage 2 and stage 3 are shown
the same way as combined diff output from diff-tree for the
merge commit would be shown if the current working tree files
are committed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-applypatch.sh')
0 files changed, 0 insertions, 0 deletions