summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-071-2/+2
* Tell multi-parent diff about core.symlinks.Johannes Sixt2007-03-031-0/+10
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-3/+3
* diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering2007-02-271-3/+3
* diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-251-4/+21
* combine-diff: special case --unified=0Junio C Hamano2007-02-031-4/+30
* Merge branch 'jc/combined'Junio C Hamano2006-10-261-4/+8
|\
| * combine-diff: honour --no-commit-idJunio C Hamano2006-10-261-3/+3
| * combine-diff: fix hunk_comment_line logic.Junio C Hamano2006-10-261-1/+5
* | Merge branch 'jc/combined'Junio C Hamano2006-10-261-5/+43
|\ \ | |/
| * combine-diff: a few more finishing touches.Junio C Hamano2006-10-261-5/+43
* | diff --numstatJunio C Hamano2006-10-131-3/+6
|/
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-5/+5
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-2/+2
* make inline is_null_sha1 globalDavid Rientjes2006-08-151-2/+2
* Remove combine-diff.c::uninteresting()Junio C Hamano2006-08-141-9/+2
* Fix type of combine-diff.c::show_patch_diff()Junio C Hamano2006-08-131-7/+5
* combine-diff: use colorJunio C Hamano2006-08-101-16/+34
* 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
View Lorry Controller Status