Age | Commit message (Expand) | Author | Files | Lines |
2007-02-25 | diff --cc: fix display of symlink conflicts during a merge. | Junio C Hamano | 1 | -4/+21 |
2007-02-03 | combine-diff: special case --unified=0 | Junio C Hamano | 1 | -4/+30 |
2006-10-26 | Merge branch 'jc/combined' | Junio C Hamano | 1 | -4/+8 |
2006-10-26 | combine-diff: honour --no-commit-id | Junio C Hamano | 1 | -3/+3 |
2006-10-26 | combine-diff: fix hunk_comment_line logic. | Junio C Hamano | 1 | -1/+5 |
2006-10-26 | Merge branch 'jc/combined' | Junio C Hamano | 1 | -5/+43 |
2006-10-26 | combine-diff: a few more finishing touches. | Junio C Hamano | 1 | -5/+43 |
2006-10-13 | diff --numstat | Junio C Hamano | 1 | -3/+6 |
2006-08-23 | Convert memcpy(a,b,20) to hashcpy(a,b). | Shawn Pearce | 1 | -5/+5 |
2006-08-17 | Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. | David Rientjes | 1 | -2/+2 |
2006-08-15 | make inline is_null_sha1 global | David Rientjes | 1 | -2/+2 |
2006-08-14 | Remove combine-diff.c::uninteresting() | Junio C Hamano | 1 | -9/+2 |
2006-08-13 | Fix type of combine-diff.c::show_patch_diff() | Junio C Hamano | 1 | -7/+5 |
2006-08-10 | combine-diff: use color | Junio C Hamano | 1 | -16/+34 |
2006-07-25 | Substitute xmalloc()+memset(0) with xcalloc(). | Peter Eriksen | 1 | -2/+1 |
2006-07-10 | Fix more typos, primarily in the code | Pavel Roskin | 1 | -1/+1 |
2006-07-05 | Merge branch 'th/diff' | Junio C Hamano | 1 | -34/+34 |
2006-06-28 | combine-diff.c: type sanity. | Junio C Hamano | 1 | -1/+1 |
2006-06-28 | combine-diff.c: type sanity | Junio C Hamano | 1 | -14/+15 |
2006-06-27 | Fix some more diff options changes. | Junio C Hamano | 1 | -9/+15 |
2006-06-26 | Add msg_sep to diff_options | Timo Hirvonen | 1 | -3/+4 |
2006-06-26 | Merge with_raw, with_stat and summary variables to output_format | Timo Hirvonen | 1 | -31/+24 |
2006-05-14 | git diff: support "-U" and "--unified" options properly | Linus Torvalds | 1 | -0/+1 |
2006-04-29 | built-in diff: assorted updates. | Junio C Hamano | 1 | -17/+30 |
2006-04-18 | Merge branch 'lt/logopt' | Junio C Hamano | 1 | -35/+54 |
2006-04-17 | combine-diff: show diffstat with the first parent. | Junio C Hamano | 1 | -5/+19 |
2006-04-17 | Log message printout cleanups (#2) | Linus Torvalds | 1 | -6/+16 |
2006-04-17 | Log message printout cleanups | Linus Torvalds | 1 | -26/+21 |
2006-04-17 | cleanups: Remove unused vars from combine-diff.c | Serge E. Hallyn | 1 | -10/+2 |
2006-04-12 | Merge branch 'jc/combine' into next | Junio C Hamano | 1 | -2/+2 |
2006-04-12 | combine-diff: type fix. | Junio C Hamano | 1 | -2/+2 |
2006-04-11 | Merge branch 'jc/combine' into next | Junio C Hamano | 1 | -26/+37 |
2006-04-11 | combine-diff: fix hunks at the end (take #2). | Junio C Hamano | 1 | -28/+21 |
2006-04-11 | combine-diff: do not lose hunks with only deletion at end. | Junio C Hamano | 1 | -11/+29 |
2006-04-11 | Separate the raw diff and patch with a newline | Petr Baudis | 1 | -0/+1 |
2006-04-10 | diff-* --patch-with-raw | Junio C Hamano | 1 | -0/+11 |
2006-04-06 | Match ofs/cnt types in diff interface. | Junio C Hamano | 1 | -1/+2 |
2006-04-05 | combine-diff: move the code to parse hunk-header into common library. | Junio C Hamano | 1 | -46/+0 |
2006-04-05 | combine-diff: refactor built-in xdiff interface. | Junio C Hamano | 1 | -45/+7 |
2006-04-04 | combine-diff: use built-in xdiff. | Junio C Hamano | 1 | -102/+136 |
2006-04-04 | Use blob_, commit_, tag_, and tree_type throughout. | Peter Eriksen | 1 | -1/+2 |
2006-03-29 | tree/diff header cleanup. | Junio C Hamano | 1 | -1/+1 |
2006-02-27 | combine-diff: Honour -z option correctly. | Mark Wooding | 1 | -2/+2 |
2006-02-27 | combine-diff: Honour --full-index. | Mark Wooding | 1 | -4/+6 |
2006-02-13 | combine-diff: diff-files fix. | Junio C Hamano | 1 | -4/+5 |
2006-02-10 | combine-diff: Record diff status a bit more faithfully | Junio C Hamano | 1 | -7/+25 |
2006-02-10 | find_unique_abbrev() simplification. | Junio C Hamano | 1 | -12/+3 |
2006-02-09 | combine-diff: move formatting logic to show_combined_diff() | Junio C Hamano | 1 | -27/+58 |
2006-02-09 | combined-diff: use diffcore before intersecting paths. | Junio C Hamano | 1 | -1/+2 |
2006-02-09 | diff-tree -c raw output | Linus Torvalds | 1 | -3/+52 |