Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 1 | -9/+2 |
|\ | |||||
| * | Fix buffer overflow in git diff | Dmitry Potapov | 2008-07-16 | 1 | -9/+2 |
* | | Merge branch 'qq/maint' | Junio C Hamano | 2008-07-05 | 1 | -6/+2 |
|\ \ | |/ | |||||
| * | diff.c: Use 'git_config_string' to get 'diff.external' | Brian Hetro | 2008-07-05 | 1 | -6/+2 |
* | | Merge branch 'jc/checkdiff' | Junio C Hamano | 2008-07-01 | 1 | -20/+75 |
|\ \ | |||||
| * | | diff --check: detect leftover conflict markers | Junio C Hamano | 2008-06-26 | 1 | -0/+35 |
| * | | Teach "diff --check" about new blank lines at end | Junio C Hamano | 2008-06-26 | 1 | -2/+15 |
| * | | checkdiff: pass diff_options to the callback | Junio C Hamano | 2008-06-26 | 1 | -10/+11 |
| * | | check_and_emit_line(): rename and refactor | Junio C Hamano | 2008-06-26 | 1 | -7/+6 |
| * | | diff --check: explain why we do not care whether old side is binary | Junio C Hamano | 2008-06-26 | 1 | -2/+9 |
* | | | show_stats(): fix stats width calculation | Olivier Marin | 2008-06-28 | 1 | -6/+6 |
|/ / | |||||
* | | Merge branch 'maint' | Junio C Hamano | 2008-06-26 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | diff --check: do not discard error status upon seeing a good line | Junio C Hamano | 2008-06-26 | 1 | -3/+5 |
* | | Merge branch 'jk/test' | Junio C Hamano | 2008-06-22 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | avoid trailing whitespace in zero-change diffstat lines | Jeff King | 2008-06-14 | 1 | -1/+2 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-06-16 | 1 | -2/+4 |
|\ \ | |||||
| * | | diff.c: fix emit_line() again not to add extra line | Junio C Hamano | 2008-06-16 | 1 | -2/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-06-16 | 1 | -0/+4 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | diff: reset color before printing newline | SZEDER Gábor | 2008-06-16 | 1 | -0/+4 |
* | | Merge branch 'js/config-cb'v1.5.6-rc0 | Junio C Hamano | 2008-05-25 | 1 | -4/+4 |
|\ \ | |||||
| * | | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 | 1 | -4/+4 |
* | | | diff options: Introduce --ignore-submodules | Johannes Schindelin | 2008-05-15 | 1 | -0/+9 |
* | | | Merge branch 'jk/renamelimit' (early part) | Junio C Hamano | 2008-05-14 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | bump rename limit defaults | Jeff King | 2008-05-03 | 1 | -1/+1 |
* | | | Remove dead code: show_log() sep argument and diff_options.msg_sep | Adam Simpkins | 2008-05-03 | 1 | -1/+0 |
|/ / | |||||
* | | diff: make --dirstat binary-file safe | Junio C Hamano | 2008-04-09 | 1 | -23/+60 |
|/ | |||||
* | Write diff output to a file in struct diff_options | Daniel Barkalow | 2008-03-14 | 1 | -140/+166 |
* | diff: make sure work tree side is shown as 0{40} when different | Junio C Hamano | 2008-03-02 | 1 | -5/+2 |
* | Clean up find_unique_abbrev() callers | Junio C Hamano | 2008-03-01 | 1 | -2/+0 |
* | Merge branch 'jm/free' | Junio C Hamano | 2008-02-27 | 1 | -6/+3 |
|\ | |||||
| * | Avoid unnecessary "if-before-free" tests. | Jim Meyering | 2008-02-22 | 1 | -6/+3 |
* | | Merge branch 'jc/diff-relative' | Junio C Hamano | 2008-02-27 | 1 | -17/+87 |
|\ \ | |||||
| * | | diff --relative: help working in a bare repository | Junio C Hamano | 2008-02-13 | 1 | -0/+4 |
| * | | diff --relative: output paths as relative to the current subdirectory | Junio C Hamano | 2008-02-13 | 1 | -17/+83 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-02-26 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Use a single implementation and API for copy_file() | Daniel Barkalow | 2008-02-25 | 1 | -4/+4 |
* | | | | Merge branch 'lt/dirstat' | Junio C Hamano | 2008-02-24 | 1 | -1/+94 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | diff --dirstat: saner handling of binary and unmerged files | Junio C Hamano | 2008-02-24 | 1 | -1/+6 |
| * | | | Add "--dirstat" for some directory statistics | Linus Torvalds | 2008-02-12 | 1 | -1/+89 |
* | | | | diff: fix java funcname pattern for solaris | Jeff King | 2008-02-20 | 1 | -1/+1 |
* | | | | Add color.ui variable which globally enables colorization if set | Matthias Kestenholz | 2008-02-18 | 1 | -3/+3 |
* | | | | Merge branch 'sp/safecrlf' | Junio C Hamano | 2008-02-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | safecrlf: Add mechanism to warn about irreversible crlf conversions | Steffen Prohaska | 2008-02-06 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2008-02-16 | 1 | -14/+6 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | diff: Fix miscounting of --check output | Junio C Hamano | 2008-02-15 | 1 | -2/+2 |
| * | | diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver" | Christian Couder | 2008-02-15 | 1 | -5/+2 |
| * | | diff.c: remove useless check for value != NULL | Christian Couder | 2008-02-15 | 1 | -7/+2 |
| * | | diff.c: replace a 'strdup' with 'xstrdup'. | Christian Couder | 2008-02-15 | 1 | -1/+1 |
| * | | diff.c: fixup garding of config parser from value=NULL | Junio C Hamano | 2008-02-15 | 1 | -1/+1 |
* | | | Merge branch 'lt/in-core-index' | Junio C Hamano | 2008-02-11 | 1 | -9/+14 |
|\ \ \ | |/ / |/| | |