aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAge
...
* Support 'diff=pgm' attributeJunio C Hamano2007-04-22
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-07
* Tell multi-parent diff about core.symlinks.Johannes Sixt2007-03-03
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering2007-02-27
* diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-25
* combine-diff: special case --unified=0Junio C Hamano2007-02-03
* Merge branch 'jc/combined'Junio C Hamano2006-10-26
|\
| * combine-diff: honour --no-commit-idJunio C Hamano2006-10-26
| * combine-diff: fix hunk_comment_line logic.Junio C Hamano2006-10-26
* | Merge branch 'jc/combined'Junio C Hamano2006-10-26
|\ \ | |/
| * combine-diff: a few more finishing touches.Junio C Hamano2006-10-26
* | diff --numstatJunio C Hamano2006-10-13
|/
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-17
* make inline is_null_sha1 globalDavid Rientjes2006-08-15
* Remove combine-diff.c::uninteresting()Junio C Hamano2006-08-14
* Fix type of combine-diff.c::show_patch_diff()Junio C Hamano2006-08-13
* combine-diff: use colorJunio C Hamano2006-08-10
* Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen2006-07-25
* Fix more typos, primarily in the codePavel Roskin2006-07-10
* Merge branch 'th/diff'Junio C Hamano2006-07-05
|\
| * combine-diff.c: type sanity.Junio C Hamano2006-06-28
| * Fix some more diff options changes.Junio C Hamano2006-06-27
| * Add msg_sep to diff_optionsTimo Hirvonen2006-06-26
| * Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-26
* | combine-diff.c: type sanityJunio C Hamano2006-06-28
|/
* git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-14
* built-in diff: assorted updates.Junio C Hamano2006-04-29
* Merge branch 'lt/logopt'Junio C Hamano2006-04-18
|\
| * combine-diff: show diffstat with the first parent.Junio C Hamano2006-04-17
| * Log message printout cleanups (#2)Linus Torvalds2006-04-17
| * Log message printout cleanupsLinus Torvalds2006-04-17
* | cleanups: Remove unused vars from combine-diff.cSerge E. Hallyn2006-04-17
|/
* Merge branch 'jc/combine' into nextJunio C Hamano2006-04-12
|\
| * combine-diff: type fix.Junio C Hamano2006-04-12
* | Merge branch 'jc/combine' into nextJunio C Hamano2006-04-11
|\ \ | |/
| * combine-diff: fix hunks at the end (take #2).Junio C Hamano2006-04-11
| * combine-diff: do not lose hunks with only deletion at end.Junio C Hamano2006-04-11
* | Separate the raw diff and patch with a newlinePetr Baudis2006-04-11
* | diff-* --patch-with-rawJunio C Hamano2006-04-10
|/
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-06
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-05
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-05
* combine-diff: use built-in xdiff.Junio C Hamano2006-04-04
* Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen2006-04-04
* tree/diff header cleanup.Junio C Hamano2006-03-29
* combine-diff: Honour -z option correctly.Mark Wooding2006-02-27
* combine-diff: Honour --full-index.Mark Wooding2006-02-27
* combine-diff: diff-files fix.Junio C Hamano2006-02-13