Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | Merge branch 'jl/submodule-diff-dirtiness' | Junio C Hamano | 2010-03-24 | |
|\ \ \ \ \ | ||||
| * | | | | | git status: Fix false positive "new commits" output for dirty submodules | Jens Lehmann | 2010-03-12 | |
| * | | | | | Refactor dirty submodule detection in diff-lib.c | Jens Lehmann | 2010-03-12 | |
* | | | | | | Merge branch 'ld/maint-diff-quiet-w' | Junio C Hamano | 2010-03-02 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||
| * | | | | | git diff --quiet -w: check and report the status | Larry D'Anna | 2010-02-15 | |
| |/ / / / | ||||
* | | | | | Merge branch 'ml/color-when' | Junio C Hamano | 2010-03-02 | |
|\ \ \ \ \ | ||||
| * | | | | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 | |
| |/ / / / | ||||
* | | | | | Merge branch 'jc/typo' | Junio C Hamano | 2010-02-16 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||
| * | | | Typofixes outside documentation area | Junio C Hamano | 2010-02-03 | |
| |/ / | ||||
* | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-02-16 | |
|\ \ \ | |/ / |/| | | ||||
| * | | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 | |
| |\ \ | ||||
| | * | | diff: make sure --output=/bad/path is caught | Larry D'Anna | 2010-02-15 | |
| | * | | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 | |
| | |\ \ | ||||
| | | * \ | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | |
| | | |\ \ | ||||
| | | | * \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 | |
| | | | |\ \ | ||||
| | | | | * \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 | |
| | | | | |\ \ | ||||
| | | | | * \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint | Junio C Hamano | 2009-04-08 | |
| | | | | |\ \ \ | ||||
| | | | | * \ \ \ | Merge branch 'jc/maint-1.6.0-keep-pack' into maint | Junio C Hamano | 2009-04-08 | |
| | | | | |\ \ \ \ | ||||
* | | | | | \ \ \ \ | Merge branch 'jl/diff-submodule-ignore' | Junio C Hamano | 2010-01-26 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Teach diff --submodule that modified submodule directory is dirty | Jens Lehmann | 2010-01-24 | |
* | | | | | | | | | | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||
| * | | | | | | | | | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'jl/submodule-diff' | Junio C Hamano | 2010-01-22 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Performance optimization for detection of modified submodules | Jens Lehmann | 2010-01-18 | |
| * | | | | | | | | | | Teach diff that modified submodule directory is dirty | Junio C Hamano | 2010-01-16 | |
* | | | | | | | | | | | 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 | |
| |/ / / / / / / / |