aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* diff.c: fix a graph output bugBo Yang2010-07-08
* Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-30
|\
| * Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-25
* | Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-30
|\ \ | |/
| * Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-11
* | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-27
|\ \
| * | textconv: make the API publicAxel Bonnet2010-06-11
* | | Merge branch 'maint'Junio C Hamano2010-06-22
|\ \ \
| * \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-22
| |\ \ \
| * \ \ \ Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-21
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano2010-06-18
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-06
* | | | | | Merge branch 'by/diff-graph'Junio C Hamano2010-06-18
|\ \ \ \ \ \
| * | | | | | Make --color-words work well with --graphBo Yang2010-05-31
| * | | | | | Emit a whole line in one goBo Yang2010-05-31
| * | | | | | diff.c: Output the text graph padding before each diff lineBo Yang2010-05-31
| * | | | | | Add a prefix output callback to diff outputBo Yang2010-05-31
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano2010-06-18
|\ \ \ \ \ \
| * | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland2010-05-31
| |/ / / / /
* | | | | | Merge branch 'ec/diff-noprefix-config'Junio C Hamano2010-06-18
|\ \ \ \ \ \
| * | | | | | diff: add configuration option for disabling diff prefixes.Eli Collins2010-05-18
* | | | | | | Merge branch 'bw/diff-metainfo-color'Junio C Hamano2010-06-13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff: fix coloring of extended diff headersBert Wesarg2010-05-19
* | | | | | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | git diff too slow for a fileRené Scharfe2010-05-02
* | | | | | Merge branch 'by/log-follow'Junio C Hamano2010-05-21
|\ \ \ \ \ \
| * | | | | | Make diffcore_std only can run once before a diff_flushBo Yang2010-05-07
| * | | | | | Add a macro DIFF_QUEUE_CLEAR.Bo Yang2010-05-07
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-21
|\ \ \ \ \ \
| * | | | | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-14
* | | | | | | diff-options: make --patch a synonym for -pWill Palmer2010-05-18
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-08
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | diff: avoid useless filespec populationJeff King2010-04-02
| * | | | | diff: cache textconv outputJeff King2010-04-02
| * | | | | textconv: refactor calls to run_textconvJeff King2010-04-02
* | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-04
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04
| | |_|/ | |/| |
| * | | Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-22
| |\ \ \
| * \ \ \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-09
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano2010-04-18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | diff: use large integers for diffstat calculationsJeff King2010-04-17
* | | | | | Merge early parts of jk/cached-textconvJunio C Hamano2010-04-08
|\ \ \ \ \ \
| * | | | | | diff.c: work around pointer constness warningsJunio C Hamano2010-04-08
| | |_|_|/ / | |/| | | |
| * | | | | fix textconv leak in emit_rewrite_diffJeff King2010-04-01
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-06
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-24
| |/ /
* | | Sync with 1.7.0.4Junio C Hamano2010-03-31
|\ \ \ | | |/ | |/|
| * | diff: fix textconv error zombiesJohannes Sixt2010-03-30
| * | Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-04
| |\ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 11:01:37 +0000