summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileLibravatar Jim Meyering1-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Libravatar Junio C Hamano1-4/+21
2007-02-03combine-diff: special case --unified=0Libravatar Junio C Hamano1-4/+30
2006-10-26Merge branch 'jc/combined'Libravatar Junio C Hamano1-4/+8
2006-10-26combine-diff: honour --no-commit-idLibravatar Junio C Hamano1-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Libravatar Junio C Hamano1-1/+5
2006-10-26Merge branch 'jc/combined'Libravatar Junio C Hamano1-5/+43
2006-10-26combine-diff: a few more finishing touches.Libravatar Junio C Hamano1-5/+43
2006-10-13diff --numstatLibravatar Junio C Hamano1-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-2/+2
2006-08-15make inline is_null_sha1 globalLibravatar David Rientjes1-2/+2
2006-08-14Remove combine-diff.c::uninteresting()Libravatar Junio C Hamano1-9/+2
2006-08-13Fix type of combine-diff.c::show_patch_diff()Libravatar Junio C Hamano1-7/+5
2006-08-10combine-diff: use colorLibravatar Junio C Hamano1-16/+34
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Libravatar Peter Eriksen1-2/+1
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-07-05Merge branch 'th/diff'Libravatar Junio C Hamano1-34/+34
2006-06-28combine-diff.c: type sanity.Libravatar Junio C Hamano1-1/+1
2006-06-28combine-diff.c: type sanityLibravatar Junio C Hamano1-14/+15
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