aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2007-12-26Fix rewrite_diff() name quoting.Junio C Hamano1-10/+1
2007-12-26combine-diff: Fix path quotingJunio C Hamano1-10/+31
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-1/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-5/+5
2007-09-20Full rework of quote_c_style and write_name_quoted.Pierre Habouzit1-14/+2
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin1-2/+1
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland1-1/+1
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-0/+1
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-2/+2
2007-03-03Tell multi-parent diff about core.symlinks.Johannes Sixt1-0/+10
2007-02-27convert object type handling from a string to a numberNicolas Pitre1-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering1-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano1-4/+21
2007-02-03combine-diff: special case --unified=0Junio C Hamano1-4/+30
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-4/+8
2006-10-26combine-diff: honour --no-commit-idJunio C Hamano1-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Junio C Hamano1-1/+5
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-5/+43
2006-10-26combine-diff: a few more finishing touches.Junio C Hamano1-5/+43
2006-10-13diff --numstatJunio C Hamano1-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-2/+2
2006-08-15make inline is_null_sha1 globalDavid Rientjes1-2/+2
2006-08-14Remove combine-diff.c::uninteresting()Junio C Hamano1-9/+2
2006-08-13Fix type of combine-diff.c::show_patch_diff()Junio C Hamano1-7/+5
2006-08-10combine-diff: use colorJunio C Hamano1-16/+34
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen1-2/+1
2006-07-10Fix more typos, primarily in the codePavel Roskin1-1/+1
2006-07-05Merge branch 'th/diff'Junio C Hamano1-34/+34
2006-06-28combine-diff.c: type sanity.Junio C Hamano1-1/+1
2006-06-28combine-diff.c: type sanityJunio C Hamano1-14/+15
2006-06-27Fix some more diff options changes.Junio C Hamano1-9/+15
2006-06-26Add msg_sep to diff_optionsTimo Hirvonen1-3/+4
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen1-31/+24
2006-05-14git diff: support "-U" and "--unified" options properlyLinus Torvalds1-0/+1
2006-04-29built-in diff: assorted updates.Junio C Hamano1-17/+30
2006-04-18Merge branch 'lt/logopt'Junio C Hamano1-35/+54
2006-04-17combine-diff: show diffstat with the first parent.Junio C Hamano1-5/+19
2006-04-17Log message printout cleanups (#2)Linus Torvalds1-6/+16
2006-04-17Log message printout cleanupsLinus Torvalds1-26/+21
2006-04-17cleanups: Remove unused vars from combine-diff.cSerge E. Hallyn1-10/+2
2006-04-12Merge branch 'jc/combine' into nextJunio C Hamano1-2/+2
2006-04-12combine-diff: type fix.Junio C Hamano1-2/+2
2006-04-11Merge branch 'jc/combine' into nextJunio C Hamano1-26/+37
2006-04-11combine-diff: fix hunks at the end (take #2).Junio C Hamano1-28/+21
2006-04-11combine-diff: do not lose hunks with only deletion at end.Junio C Hamano1-11/+29
2006-04-11Separate the raw diff and patch with a newlinePetr Baudis1-0/+1
2006-04-10diff-* --patch-with-rawJunio C Hamano1-0/+11
2006-04-06Match ofs/cnt types in diff interface.Junio C Hamano1-1/+2
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano1-46/+0