summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-187-49/+62
|\
| * blame: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-15/+7
| * merge-recursive: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-10/+4
| * bisect: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-8/+5
| * revert: rename variables related to subject in get_message()Christian Couder2010-07-231-5/+5
| * revert: refactor code to find commit subject in find_commit_subject()Christian Couder2010-07-233-12/+24
| * revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-232-2/+20
* | Merge branch 'jn/maint-plug-leak'Junio C Hamano2010-08-183-3/+13
|\ \
| * | write-tree: Avoid leak when index refers to an invalid objectJonathan Nieder2010-08-111-1/+3
| * | read-tree: stop leaking tree objectsJonathan Nieder2010-08-111-1/+6
| * | core: Stop leaking ondisk_cache_entrysJonathan Nieder2010-08-111-1/+4
* | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-1817-21/+526
|\ \ \
| * | | Add tests for the diff.ignoreSubmodules config optionJens Lehmann2010-08-092-3/+19
| * | | Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin2010-08-093-2/+15
| * | | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-0913-10/+209
| * | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-0911-20/+297
| |/ /
* | | Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-183-1/+39
|\ \ \
| * | | rebase: support -X to pass through strategy optionsMike Lundy2010-08-033-1/+39
| |/ /
* | | Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-185-4/+3
|\ \ \
| * | | examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-271-1/+1
| * | | checkout, commit: remove confusing assignments to rev.abbrevJonathan Nieder2010-07-272-2/+0
| * | | archive: abbreviate substituted commit ids againJonathan Nieder2010-07-272-1/+2
* | | | Merge branch 'vs/doc-spell'Junio C Hamano2010-08-189-16/+18
|\ \ \ \
| * | | | Documentation: spelling fixesVille Skyttä2010-07-209-16/+18
* | | | | Merge branch 'jh/use-test-must-fail'Junio C Hamano2010-08-1811-26/+26
|\ \ \ \ \
| * | | | | Convert "! git" to "test_must_fail git"Jared Hance2010-07-2011-26/+26
* | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-183-2/+39
|\ \ \ \ \ \
| * | | | | | Add test for git clean -e.Jared Hance2010-07-201-0/+16
| * | | | | | Add -e/--exclude to git-clean.Jared Hance2010-07-202-2/+23
| |/ / / / /
* | | | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-08-181-2/+32
|\ \ \ \ \ \
| * | | | | | post-receive-email: optional message line count limitKevin P. Fleming2010-07-161-2/+32
* | | | | | | Merge branch 'ab/report-corrupt-object-with-type'Junio C Hamano2010-08-181-2/+11
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: Show the the type and path to corrupt objectsÆvar Arnfjörð Bjarmason2010-07-141-2/+11
* | | | | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-185-202/+345
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: protect against diff.renames configurationJunio C Hamano2010-07-232-2/+24
| * | | | | | | | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-231-90/+92
| * | | | | | | | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-232-2/+47
| * | | | | | | | t4150 (am): futureproof against failing testsJonathan Nieder2010-07-231-1/+47
| * | | | | | | | t4150 (am): style fixJonathan Nieder2010-07-232-108/+136
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jn/fast-import-subtree'Junio C Hamano2010-08-183-11/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach fast-import to import subtrees named by tree idJonathan Nieder2010-07-053-11/+75
* | | | | | | | | Merge branch 'ar/string-list-foreach'Junio C Hamano2010-08-185-104/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-054-103/+64
| * | | | | | | | | Add a for_each_string_list_item macroAlex Riesen2010-07-051-1/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jh/graph-next-line'Junio C Hamano2010-08-182-23/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable custom schemes for column colors in the graph APIJohan Herland2010-07-132-11/+43
| * | | | | | | | | Make graph_next_line() available in the graph.h APIJohan Herland2010-07-132-12/+12
* | | | | | | | | | Merge branch 'tr/xsize-bits'Junio C Hamano2010-08-181-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xsize_t: check whether we lose bitsThomas Rast2010-07-281-0/+2
* | | | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-184-9/+218
|\ \ \ \ \ \ \ \ \ \ \