]> git.ipfire.org Git - thirdparty/git.git/commit - combine-diff.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 30997bb) | patch
combine-diff.c: teach combined diffs about line prefix
authorJohn Keeping <john@keeping.me.uk>
Thu, 7 Feb 2013 20:15:28 +0000 (20:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Feb 2013 19:42:07 +0000 (11:42 -0800)
commit41ee2ad6cbebab0429248a14ec4e02afddd60dbe
tree6aa506a69925fe5235ad037c5d1f6e265e5a81e3tree | snapshot
parent30997bb8f11bd6e63a582c3b4e029ca47868ad8dcommit | diff
combine-diff.c: teach combined diffs about line prefix

When running "git log --graph --cc -p" the diff output for merges is not
indented by the graph structure, unlike the diffs of non-merge commits
(added in commit 7be5761 - diff.c: Output the text graph padding before
each diff line).

Fix this by teaching the combined diff code to output diff_line_prefix()
before each line.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.