Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ld/maint-diff-quiet-w' | Junio C Hamano | 2010-03-02 | 1 | -0/+23 |
|\ | |||||
| * | git diff --quiet -w: check and report the status | Larry D'Anna | 2010-02-15 | 1 | -0/+23 |
* | | Merge branch 'ml/color-when' | Junio C Hamano | 2010-03-02 | 1 | -0/+9 |
|\ \ | |||||
| * | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 | 1 | -0/+9 |
| |/ | |||||
* | | Merge branch 'jc/typo' | Junio C Hamano | 2010-02-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Typofixes outside documentation area | Junio C Hamano | 2010-02-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-02-16 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 | 1 | -0/+2 |
| |\ | |||||
| | * | diff: make sure --output=/bad/path is caught | Larry D'Anna | 2010-02-15 | 1 | -0/+2 |
| | * | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | 1 | -0/+2 |
| | | |\ | |||||
| | | | * | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 | 1 | -0/+2 |
| | | | |\ | |||||
| | | | | * | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 | 1 | -0/+2 |
| | | | | |\ | |||||
| | | | | * \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint | Junio C Hamano | 2009-04-08 | 1 | -1/+9 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merge branch 'jc/maint-1.6.0-keep-pack' into maint | Junio C Hamano | 2009-04-08 | 1 | -1/+1 |
| | | | | |\ \ \ | |||||
* | | | | | \ \ \ | Merge branch 'jl/diff-submodule-ignore' | Junio C Hamano | 2010-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Teach diff --submodule that modified submodule directory is dirty | Jens Lehmann | 2010-01-24 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -0/+17 |
* | | | | | | | | | | Merge branch 'jl/submodule-diff' | Junio C Hamano | 2010-01-22 | 1 | -5/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Performance optimization for detection of modified submodules | Jens Lehmann | 2010-01-18 | 1 | -4/+11 |
| * | | | | | | | | | | Teach diff that modified submodule directory is dirty | Junio C Hamano | 2010-01-16 | 1 | -2/+7 |
* | | | | | | | | | | | Merge branch 'jk/run-command-use-shell' | Junio C Hamano | 2010-01-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | diff: run external diff helper with shell | Jeff King | 2010-01-05 | 1 | -1/+1 |
| * | | | | | | | | | | textconv: use shell to run helper | Jeff King | 2010-01-05 | 1 | -0/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Teach Git to respect skip-worktree bit (reading part) | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-12-30 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | textconv: stop leaking file descriptors | Jeff King | 2009-12-30 | 1 | -0/+2 |
| | * | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | * | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -1/+9 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
* | | | | | | | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output' | Junio C Hamano | 2009-12-26 | 1 | -8/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | No diff -b/-w output for all-whitespace changes | Greg Bacon | 2009-11-20 | 1 | -8/+27 |
* | | | | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status' | Junio C Hamano | 2009-12-26 | 1 | -5/+33 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | diff.c: fix typoes in comments | Jim Meyering | 2009-08-30 | 1 | -2/+2 |
| * | | | | | | | | | diff: Rename QUIET internal option to QUICK | Junio C Hamano | 2009-07-29 | 1 | -2/+2 |
| * | | | | | | | | | diff: change semantics of "ignore whitespace" options | Junio C Hamano | 2009-07-29 | 1 | -3/+31 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'maint' to sync with 1.6.5.7 | Junio C Hamano | 2009-12-16 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | ignore unknown color configuration | Jeff King | 2009-12-16 | 1 | -1/+3 |
| * | | | | | | | | Merge branch 'js/maint-diff-color-words' into maint | Junio C Hamano | 2009-11-16 | 1 | -8/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-blank-at-eof' into maint | Junio C Hamano | 2009-11-15 | 1 | -145/+262 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 1 | -3/+40 |
* | | | | | | | | | | | emit_line(): don't emit an empty <SET><RESET> followed by a newline | Junio C Hamano | 2009-11-27 | 1 | -6/+7 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'js/maint-diff-color-words' | Junio C Hamano | 2009-11-15 | 1 | -8/+12 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | diff --color-words: bit of clean-up | Junio C Hamano | 2009-10-31 | 1 | -14/+12 |
| * | | | | | | | | | diff --color-words -U0: fix the location of hunk headers | Johannes Schindelin | 2009-10-30 | 1 | -0/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'js/diff-verbose-submodule' | Junio C Hamano | 2009-10-30 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add the --submodule option to the diff option family | Johannes Schindelin | 2009-10-19 | 1 | -0/+18 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 | 1 | -145/+262 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | |