aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAge
* 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
* combine-diff: Record diff status a bit more faithfullyJunio C Hamano2006-02-10
* find_unique_abbrev() simplification.Junio C Hamano2006-02-10
* combine-diff: move formatting logic to show_combined_diff()Junio C Hamano2006-02-09
* combined-diff: use diffcore before intersecting paths.Junio C Hamano2006-02-09
* diff-tree -c raw outputLinus Torvalds2006-02-09
* combine-diff: do not punt on removed or added files.Junio C Hamano2006-02-06
* combine-diff: show mode changes as well.Junio C Hamano2006-02-06
* combine-diff: do not send NULL to printfJunio C Hamano2006-02-06
* combine-diff: remove misguided --show-empty hack.Junio C Hamano2006-02-05
* combine-diff: finishing touches to git-diff-tree --ccJunio C Hamano2006-02-02
* combine-diff: cleanup.Junio C Hamano2006-02-02
* combine-diff: show parent line numbers as well.Junio C Hamano2006-02-02
* combine-diff: add a bit more comments.Junio C Hamano2006-02-02
* combine-diff: fix placement of deletion.Junio C Hamano2006-02-02
* combine-diff: add safety check to --cc.Junio C Hamano2006-02-02
* combine-diff: update --cc "uninteresting hunks" logic.Junio C Hamano2006-02-02
* combine-diff: reuse diff from the same blob.Junio C Hamano2006-02-02
* diff-files: -c and --cc options.Junio C Hamano2006-01-28
* combine-diff: better hunk splitting.Junio C Hamano2006-01-28
* diff-tree --cc: squelch header generation on empty patch.Junio C Hamano2006-01-28
* combine-diff: extend --cc logic to Octopus.Junio C Hamano2006-01-28