Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cc/find-commit-subject' | Junio C Hamano | 2010-08-18 | 7 | -49/+62 |
|\ | |||||
| * | blame: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -15/+7 |
| * | merge-recursive: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -10/+4 |
| * | bisect: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -8/+5 |
| * | revert: rename variables related to subject in get_message() | Christian Couder | 2010-07-23 | 1 | -5/+5 |
| * | revert: refactor code to find commit subject in find_commit_subject() | Christian Couder | 2010-07-23 | 3 | -12/+24 |
| * | revert: fix off by one read when searching the end of a commit subject | Christian Couder | 2010-07-23 | 2 | -2/+20 |
* | | Merge branch 'jn/maint-plug-leak' | Junio C Hamano | 2010-08-18 | 3 | -3/+13 |
|\ \ | |||||
| * | | write-tree: Avoid leak when index refers to an invalid object | Jonathan Nieder | 2010-08-11 | 1 | -1/+3 |
| * | | read-tree: stop leaking tree objects | Jonathan Nieder | 2010-08-11 | 1 | -1/+6 |
| * | | core: Stop leaking ondisk_cache_entrys | Jonathan Nieder | 2010-08-11 | 1 | -1/+4 |
* | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 17 | -21/+526 |
|\ \ \ | |||||
| * | | | Add tests for the diff.ignoreSubmodules config option | Jens Lehmann | 2010-08-09 | 2 | -3/+19 |
| * | | | Add the 'diff.ignoreSubmodules' config setting | Johannes Schindelin | 2010-08-09 | 3 | -2/+15 |
| * | | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 13 | -10/+209 |
| * | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 11 | -20/+297 |
| |/ / | |||||
* | | | Merge branch 'ml/rebase-x-strategy' | Junio C Hamano | 2010-08-18 | 3 | -1/+39 |
|\ \ \ | |||||
| * | | | rebase: support -X to pass through strategy options | Mike Lundy | 2010-08-03 | 3 | -1/+39 |
| |/ / | |||||
* | | | Merge branch 'jn/fix-abbrev' | Junio C Hamano | 2010-08-18 | 5 | -4/+3 |
|\ \ \ | |||||
| * | | | examples/commit: use --abbrev for commit summary | Jonathan Nieder | 2010-07-27 | 1 | -1/+1 |
| * | | | checkout, commit: remove confusing assignments to rev.abbrev | Jonathan Nieder | 2010-07-27 | 2 | -2/+0 |
| * | | | archive: abbreviate substituted commit ids again | Jonathan Nieder | 2010-07-27 | 2 | -1/+2 |
* | | | | Merge branch 'vs/doc-spell' | Junio C Hamano | 2010-08-18 | 9 | -16/+18 |
|\ \ \ \ | |||||
| * | | | | Documentation: spelling fixes | Ville Skyttä | 2010-07-20 | 9 | -16/+18 |
* | | | | | Merge branch 'jh/use-test-must-fail' | Junio C Hamano | 2010-08-18 | 11 | -26/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 | 11 | -26/+26 |
* | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-08-18 | 3 | -2/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add test for git clean -e. | Jared Hance | 2010-07-20 | 1 | -0/+16 |
| * | | | | | | Add -e/--exclude to git-clean. | Jared Hance | 2010-07-20 | 2 | -2/+23 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'kf/post-receive-sample-hook' | Junio C Hamano | 2010-08-18 | 1 | -2/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | post-receive-email: optional message line count limit | Kevin P. Fleming | 2010-07-16 | 1 | -2/+32 |
* | | | | | | | Merge branch 'ab/report-corrupt-object-with-type' | Junio C Hamano | 2010-08-18 | 1 | -2/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: Show the the type and path to corrupt objects | Ævar Arnfjörð Bjarmason | 2010-07-14 | 1 | -2/+11 |
* | | | | | | | | Merge branch 'jn/rebase-rename-am' | Junio C Hamano | 2010-08-18 | 5 | -202/+345 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: protect against diff.renames configuration | Junio C Hamano | 2010-07-23 | 2 | -2/+24 |
| * | | | | | | | | t3400 (rebase): whitespace cleanup | Jonathan Nieder | 2010-07-23 | 1 | -90/+92 |
| * | | | | | | | | Teach "apply --index-info" to handle rename patches | Junio C Hamano | 2010-07-23 | 2 | -2/+47 |
| * | | | | | | | | t4150 (am): futureproof against failing tests | Jonathan Nieder | 2010-07-23 | 1 | -1/+47 |
| * | | | | | | | | t4150 (am): style fix | Jonathan Nieder | 2010-07-23 | 2 | -108/+136 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jn/fast-import-subtree' | Junio C Hamano | 2010-08-18 | 3 | -11/+75 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach fast-import to import subtrees named by tree id | Jonathan Nieder | 2010-07-05 | 3 | -11/+75 |
* | | | | | | | | | Merge branch 'ar/string-list-foreach' | Junio C Hamano | 2010-08-18 | 5 | -104/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Convert the users of for_each_string_list to for_each_string_list_item macro | Alex Riesen | 2010-07-05 | 4 | -103/+64 |
| * | | | | | | | | | Add a for_each_string_list_item macro | Alex Riesen | 2010-07-05 | 1 | -1/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jh/graph-next-line' | Junio C Hamano | 2010-08-18 | 2 | -23/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Enable custom schemes for column colors in the graph API | Johan Herland | 2010-07-13 | 2 | -11/+43 |
| * | | | | | | | | | Make graph_next_line() available in the graph.h API | Johan Herland | 2010-07-13 | 2 | -12/+12 |
* | | | | | | | | | | Merge branch 'tr/xsize-bits' | Junio C Hamano | 2010-08-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | xsize_t: check whether we lose bits | Thomas Rast | 2010-07-28 | 1 | -0/+2 |
* | | | | | | | | | | | Merge branch 'tc/checkout-B' | Junio C Hamano | 2010-08-18 | 4 | -9/+218 |
|\ \ \ \ \ \ \ \ \ \ \ |