summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-02 17:43:47 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-02 17:53:26 -0800
commitf7a3d33f0f93eba4db61819b289df76a32d61b1b (patch)
treee3dd9df323411fb872574c7ac9797cc8c0736b38 /git-reset.sh
parent46dc941246af6e845eb7835afdb8cd20eed835b7 (diff)
downloadgit-f7a3d33f0f93eba4db61819b289df76a32d61b1b.tar.gz
combine-diff: finishing touches to git-diff-tree --cc
This updates the output format to make administrative lines more consistent with the traditional diffs. The "index" line shows blob object names from each parents (separated by commas), double dots and the object name of the resulting blob. The hunk header line begins with N+1 '@' characters for N-way diff, the line number L of the first line in the hunk and line count C from the parent in "-L,C" format for each parents and then the line number of the first line in the hunk and line count from the resulting file in "+L,C" format, and finally N+1 '@' characters (earlier versions had the line numbers from the resulting file at the beginning). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-reset.sh')
0 files changed, 0 insertions, 0 deletions