summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen2006-07-251-2/+1
* Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
* Merge branch 'th/diff'Junio C Hamano2006-07-051-34/+34
|\
| * combine-diff.c: type sanity.Junio C Hamano2006-06-281-1/+1
| * Fix some more diff options changes.Junio C Hamano2006-06-271-9/+15
| * Add msg_sep to diff_optionsTimo Hirvonen2006-06-261-3/+4
| * Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-261-31/+24
* | combine-diff.c: type sanityJunio C Hamano2006-06-281-14/+15
|/
* git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-141-0/+1
* built-in diff: assorted updates.Junio C Hamano2006-04-291-17/+30
* Merge branch 'lt/logopt'Junio C Hamano2006-04-181-35/+54
|\
| * combine-diff: show diffstat with the first parent.Junio C Hamano2006-04-171-5/+19
| * Log message printout cleanups (#2)Linus Torvalds2006-04-171-6/+16
| * Log message printout cleanupsLinus Torvalds2006-04-171-26/+21
* | cleanups: Remove unused vars from combine-diff.cSerge E. Hallyn2006-04-171-10/+2
|/
* Merge branch 'jc/combine' into nextJunio C Hamano2006-04-121-2/+2
|\
| * combine-diff: type fix.Junio C Hamano2006-04-121-2/+2
* | Merge branch 'jc/combine' into nextJunio C Hamano2006-04-111-26/+37
|\ \ | |/
| * combine-diff: fix hunks at the end (take #2).Junio C Hamano2006-04-111-28/+21
| * combine-diff: do not lose hunks with only deletion at end.Junio C Hamano2006-04-111-11/+29
* | Separate the raw diff and patch with a newlinePetr Baudis2006-04-111-0/+1
* | diff-* --patch-with-rawJunio C Hamano2006-04-101-0/+11
|/
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-061-1/+2
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-051-46/+0
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-051-45/+7
* combine-diff: use built-in xdiff.Junio C Hamano2006-04-041-102/+136
* Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen2006-04-041-1/+2
* tree/diff header cleanup.Junio C Hamano2006-03-291-1/+1
* combine-diff: Honour -z option correctly.Mark Wooding2006-02-271-2/+2
* combine-diff: Honour --full-index.Mark Wooding2006-02-271-4/+6
* combine-diff: diff-files fix.Junio C Hamano2006-02-131-4/+5
* combine-diff: Record diff status a bit more faithfullyJunio C Hamano2006-02-101-7/+25
* find_unique_abbrev() simplification.Junio C Hamano2006-02-101-12/+3
* combine-diff: move formatting logic to show_combined_diff()Junio C Hamano2006-02-091-27/+58
* combined-diff: use diffcore before intersecting paths.Junio C Hamano2006-02-091-1/+2
* diff-tree -c raw outputLinus Torvalds2006-02-091-3/+52
* combine-diff: do not punt on removed or added files.Junio C Hamano2006-02-061-10/+14
* combine-diff: show mode changes as well.Junio C Hamano2006-02-061-11/+31
* combine-diff: do not send NULL to printfJunio C Hamano2006-02-061-6/+17
* combine-diff: remove misguided --show-empty hack.Junio C Hamano2006-02-051-6/+4
* combine-diff: finishing touches to git-diff-tree --ccJunio C Hamano2006-02-021-4/+4
* combine-diff: cleanup.Junio C Hamano2006-02-021-37/+65
* combine-diff: show parent line numbers as well.Junio C Hamano2006-02-021-11/+59
* combine-diff: add a bit more comments.Junio C Hamano2006-02-021-1/+7
* combine-diff: fix placement of deletion.Junio C Hamano2006-02-021-1/+13
* combine-diff: add safety check to --cc.Junio C Hamano2006-02-021-2/+18
* combine-diff: update --cc "uninteresting hunks" logic.Junio C Hamano2006-02-021-69/+33
* combine-diff: reuse diff from the same blob.Junio C Hamano2006-02-021-2/+37
* diff-files: -c and --cc options.Junio C Hamano2006-01-281-20/+46
* combine-diff: better hunk splitting.Junio C Hamano2006-01-281-27/+116
View Lorry Controller Status