summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2006-06-27Fix some more diff options changes.Libravatar Junio C Hamano1-9/+15
2006-06-26Add msg_sep to diff_optionsLibravatar Timo Hirvonen1-3/+4
2006-06-26Merge with_raw, with_stat and summary variables to output_formatLibravatar Timo Hirvonen1-31/+24
2006-05-14git diff: support "-U" and "--unified" options properlyLibravatar Linus Torvalds1-0/+1
2006-04-29built-in diff: assorted updates.Libravatar Junio C Hamano1-17/+30
2006-04-18Merge branch 'lt/logopt'Libravatar Junio C Hamano1-35/+54
2006-04-17combine-diff: show diffstat with the first parent.Libravatar Junio C Hamano1-5/+19
2006-04-17Log message printout cleanups (#2)Libravatar Linus Torvalds1-6/+16
2006-04-17Log message printout cleanupsLibravatar Linus Torvalds1-26/+21
2006-04-17cleanups: Remove unused vars from combine-diff.cLibravatar Serge E. Hallyn1-10/+2
2006-04-12Merge branch 'jc/combine' into nextLibravatar Junio C Hamano1-2/+2
2006-04-12combine-diff: type fix.Libravatar Junio C Hamano1-2/+2
2006-04-11Merge branch 'jc/combine' into nextLibravatar Junio C Hamano1-26/+37
2006-04-11combine-diff: fix hunks at the end (take #2).Libravatar Junio C Hamano1-28/+21
2006-04-11combine-diff: do not lose hunks with only deletion at end.Libravatar Junio C Hamano1-11/+29
2006-04-11Separate the raw diff and patch with a newlineLibravatar Petr Baudis1-0/+1
2006-04-10diff-* --patch-with-rawLibravatar Junio C Hamano1-0/+11
2006-04-06Match ofs/cnt types in diff interface.Libravatar Junio C Hamano1-1/+2
2006-04-05combine-diff: move the code to parse hunk-header into common library.Libravatar Junio C Hamano1-46/+0
2006-04-05combine-diff: refactor built-in xdiff interface.Libravatar Junio C Hamano1-45/+7
2006-04-04combine-diff: use built-in xdiff.Libravatar Junio C Hamano1-102/+136
2006-04-04Use blob_, commit_, tag_, and tree_type throughout.Libravatar Peter Eriksen1-1/+2
2006-03-29tree/diff header cleanup.Libravatar Junio C Hamano1-1/+1
2006-02-27combine-diff: Honour -z option correctly.Libravatar Mark Wooding1-2/+2
2006-02-27combine-diff: Honour --full-index.Libravatar Mark Wooding1-4/+6
2006-02-13combine-diff: diff-files fix.Libravatar Junio C Hamano1-4/+5
2006-02-10combine-diff: Record diff status a bit more faithfullyLibravatar Junio C Hamano1-7/+25
2006-02-10find_unique_abbrev() simplification.Libravatar Junio C Hamano1-12/+3
2006-02-09combine-diff: move formatting logic to show_combined_diff()Libravatar Junio C Hamano1-27/+58
2006-02-09combined-diff: use diffcore before intersecting paths.Libravatar Junio C Hamano1-1/+2
2006-02-09diff-tree -c raw outputLibravatar Linus Torvalds1-3/+52
2006-02-06combine-diff: do not punt on removed or added files.Libravatar Junio C Hamano1-10/+14
2006-02-06combine-diff: show mode changes as well.Libravatar Junio C Hamano1-11/+31
2006-02-06combine-diff: do not send NULL to printfLibravatar Junio C Hamano1-6/+17
2006-02-05combine-diff: remove misguided --show-empty hack.Libravatar Junio C Hamano1-6/+4
2006-02-02combine-diff: finishing touches to git-diff-tree --ccLibravatar Junio C Hamano1-4/+4
2006-02-02combine-diff: cleanup.Libravatar Junio C Hamano1-37/+65
2006-02-02combine-diff: show parent line numbers as well.Libravatar Junio C Hamano1-11/+59
2006-02-02combine-diff: add a bit more comments.Libravatar Junio C Hamano1-1/+7
2006-02-02combine-diff: fix placement of deletion.Libravatar Junio C Hamano1-1/+13
2006-02-02combine-diff: add safety check to --cc.Libravatar Junio C Hamano1-2/+18
2006-02-02combine-diff: update --cc "uninteresting hunks" logic.Libravatar Junio C Hamano1-69/+33
2006-02-02combine-diff: reuse diff from the same blob.Libravatar Junio C Hamano1-2/+37
2006-01-28diff-files: -c and --cc options.Libravatar Junio C Hamano1-20/+46
2006-01-28combine-diff: better hunk splitting.Libravatar Junio C Hamano1-27/+116
2006-01-28diff-tree --cc: squelch header generation on empty patch.Libravatar Junio C Hamano1-16/+30
2006-01-28combine-diff: extend --cc logic to Octopus.Libravatar Junio C Hamano1-26/+63
2006-01-28combine-diff: minor output changes.Libravatar Junio C Hamano1-3/+2
2006-01-28combine-diff: fix appending at the tail of a list.Libravatar Junio C Hamano1-11/+6
2006-01-28diff-tree --cc: denser combined diff output for a merge commit.Libravatar Junio C Hamano1-5/+64