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