summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-033-9/+3
* builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-031-1/+4
* Prepare for 1.7.2.3Junio C Hamano2010-09-012-1/+47
* Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano2010-09-012-0/+38
|\
| * pack-refs: remove newly empty directoriesGreg Price2010-07-072-0/+38
* | Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano2010-09-014-11/+41
|\ \
| * | rerere: fix overeager gcSZEDER Gábor2010-07-143-9/+34
| * | mingw_utime(): handle NULL times parameterSZEDER Gábor2010-07-121-2/+7
* | | Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano2010-09-011-1/+8
|\ \ \
| * | | fix >4GiB source delta assertion failureNicolas Pitre2010-08-211-1/+8
* | | | Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-014-7/+56
|\ \ \ \
| * | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-144-7/+56
* | | | | Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano2010-09-012-1/+5
|\ \ \ \ \
| * | | | | submodule sync: Update "submodule.<name>.url"David Aguilar2010-08-182-1/+5
| |/ / / /
* | | | | Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano2010-09-012-0/+71
|\ \ \ \ \
| * | | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-122-2/+11
| * | | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-121-0/+62
* | | | | | Merge branch 'maint-1.7.1' into maintJunio C Hamano2010-08-291-5/+5
|\ \ \ \ \ \
| * | | | | | t0003: add missing && at end of linesMatthieu Moy2010-08-291-5/+5
* | | | | | | for-each-ref: fix objectname:short bugJay Soffian2010-08-261-1/+2
* | | | | | | tree-walk: Correct bitrotted comment about tree_entry()Elijah Newren2010-08-251-1/+4
* | | | | | | Fix 'git log' early pager startup error caseLinus Torvalds2010-08-252-9/+4
* | | | | | | parse-options: clarify PARSE_OPT_NOARG descriptionJonathan Nieder2010-08-241-1/+1
* | | | | | | t3302 (notes): Port to SolarisJonathan Nieder2010-08-241-1/+1
* | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-2217-26/+26
| |_|_|/ / / |/| | | | |
* | | | | | t7403: add missing &&'sJens Lehmann2010-08-211-2/+2
* | | | | | Tell ignore file about generate files in /gitweb/staticMark Rada2010-08-211-1/+1
* | | | | | Merge branch 'jc/maint-follow-rename-fix' into maintJunio C Hamano2010-08-205-18/+41
|\ \ \ \ \ \
| * | | | | | log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason2010-08-151-1/+13
| * | | | | | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-134-16/+27
| * | | | | | diff --follow: do not waste cycles while recursingJunio C Hamano2010-08-131-1/+1
* | | | | | | Merge branch 'jn/maint-plug-leak' into maintJunio C Hamano2010-08-203-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 'jn/fix-abbrev' into maintJunio C Hamano2010-08-205-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' into maintJunio C Hamano2010-08-209-16/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: spelling fixesVille Skyttä2010-07-209-16/+18
* | | | | | | | | Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-205-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/doc-pull' into maintJunio C Hamano2010-08-201-11/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: flesh out “git pull” descriptionJonathan Nieder2010-08-021-11/+54
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bc/use-more-hardlinks-in-install' into maintJunio C Hamano2010-08-201-3/+12
|\ \ \ \ \ \ \ \ \