Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/run-command-use-shell' | Junio C Hamano | 2010-01-17 |
|\ | |||
| * | diff: run external diff helper with shell | Jeff King | 2010-01-05 |
| * | textconv: use shell to run helper | Jeff King | 2010-01-05 |
* | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 |
|\ \ | |||
| * | | Teach Git to respect skip-worktree bit (reading part) | Nguyễn Thái Ngọc Duy | 2009-08-23 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-12-30 |
|\ \ \ | |||
| * \ \ | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-12-30 |
| |\ \ \ | | |_|/ | |/| | | |||
| | * | | textconv: stop leaking file descriptors | Jeff King | 2009-12-30 |
| | * | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 | Junio C Hamano | 2009-05-03 |
| | |\ \ | |||
| | * \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 |
| | |\ \ \ | |||
* | | \ \ \ | Merge branch 'gb/1.7.0-diff-whitespace-only-output' | Junio C Hamano | 2009-12-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | No diff -b/-w output for all-whitespace changes | Greg Bacon | 2009-11-20 |
* | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status' | Junio C Hamano | 2009-12-26 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| * | | | | | | diff.c: fix typoes in comments | Jim Meyering | 2009-08-30 |
| * | | | | | | diff: Rename QUIET internal option to QUICK | Junio C Hamano | 2009-07-29 |
| * | | | | | | diff: change semantics of "ignore whitespace" options | Junio C Hamano | 2009-07-29 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge branch 'maint' to sync with 1.6.5.7 | Junio C Hamano | 2009-12-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | ignore unknown color configuration | Jeff King | 2009-12-16 |
| * | | | | | | Merge branch 'js/maint-diff-color-words' into maint | Junio C Hamano | 2009-11-16 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-blank-at-eof' into maint | Junio C Hamano | 2009-11-15 |
| |\ \ \ \ \ \ \ | |||
* | | | | | | | | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 |
* | | | | | | | | | emit_line(): don't emit an empty <SET><RESET> followed by a newline | Junio C Hamano | 2009-11-27 |
| |_|_|_|/ / / / |/| | | | | | | | |||
* | | | | | | | | Merge branch 'js/maint-diff-color-words' | Junio C Hamano | 2009-11-15 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | diff --color-words: bit of clean-up | Junio C Hamano | 2009-10-31 |
| * | | | | | | | diff --color-words -U0: fix the location of hunk headers | Johannes Schindelin | 2009-10-30 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'js/diff-verbose-submodule' | Junio C Hamano | 2009-10-30 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Add the --submodule option to the diff option family | Johannes Schindelin | 2009-10-19 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof | Junio C Hamano | 2009-09-15 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | diff -B: colour whitespace errors | Junio C Hamano | 2009-09-15 |
| * | | | | | | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||
| | * | | | | | | diff.c: emit_add_line() takes only the rest of the line | Junio C Hamano | 2009-09-15 |
| | * | | | | | | diff.c: split emit_line() from the first char and the rest of the line | Junio C Hamano | 2009-09-15 |
| * | | | | | | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||
| | * | | | | | | diff.c: shuffling code around | Junio C Hamano | 2009-09-14 |
| * | | | | | | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | diff --whitespace: fix blank lines at end | Junio C Hamano | 2009-09-14 |
| | * | | | | | diff --color: color blank-at-eof | Junio C Hamano | 2009-09-04 |
| | * | | | | | diff --whitespace=warn/error: fix blank-at-eof check | Junio C Hamano | 2009-09-04 |
| | * | | | | | diff --whitespace=warn/error: obey blank-at-eof | Junio C Hamano | 2009-09-04 |
| | * | | | | | diff.c: the builtin_diff() deals with only two-file comparison | Junio C Hamano | 2009-09-04 |
* | | | | | | | diff.c: stylefix | Felipe Contreras | 2009-10-11 |
| |_|/ / / / |/| | | | | | |||
* | | | | | | Style fixes, add a space after if/for/while. | Brian Gianforcaro | 2009-08-31 |
|/ / / / / | |||
* | | | | | Merge branch 'rs/grep-p' | Junio C Hamano | 2009-07-09 |
|\ \ \ \ \ | |||
| * | | | | | userdiff: add xdiff_clear_find_func() | René Scharfe | 2009-07-01 |
* | | | | | | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 |
| * | | | | | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 2009-06-27 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-09 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | diff.c: plug a memory leak in an error path | Johannes Sixt | 2009-06-08 |