diff options
| author | Brian Downing <bdowning@lavos.net> | 2008-01-17 06:42:34 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-17 11:15:23 -0500 |
| commit | 6d85ccdb6f1bb6e97a2815d059850a2cc2f8e93b (patch) | |
| tree | c7dadabbe173f149fca84afb1d88923236cf8f20 /doc/plugins/contrib/gallery.mdwn | |
| parent | 06bd32f9dad90233a0882f114bcc2099a2d50bb6 (diff) | |
Add full parser for git diff-tree output
The -c option to git log/diff-tree produces "merged" diffs with a
different format from normal ones. However, the existing diff-tree
parser only accepted non-merged diff lines. Merged diff lines caused
the parser to get out of sync. This patch adds a full parser for diffs
with any number of parents. See the "DIFF FORMAT FOR MERGES" section in
the git-diff-tree man page for more information.
Signed-off-by: Brian Downing <bdowning@lavos.net>
Diffstat (limited to 'doc/plugins/contrib/gallery.mdwn')
0 files changed, 0 insertions, 0 deletions