summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Makefile: make hard/symbolic links for non-builtins tooBrandon Casey2010-07-251-3/+6
| * | | | | Makefile: link builtins residing in bin directory to main git binary tooBrandon Casey2010-07-251-0/+6
| |/ / / /
* | | | | Merge branch 'tr/rfc-reset-doc' into maintJunio C Hamano2010-08-201-169/+178
|\ \ \ \ \
| * | | | | Documentation/reset: move "undo permanently" example behind "make topic"Thomas Rast2010-07-191-13/+13
| * | | | | Documentation/reset: reorder examples to match descriptionThomas Rast2010-07-191-23/+23
| * | | | | Documentation/reset: promote 'examples' one section upThomas Rast2010-07-191-107/+109
| * | | | | Documentation/reset: separate options by modeThomas Rast2010-07-191-26/+33
| * | | | | Documentation/git-reset: reorder modes for soft-mixed-hard progressionThomas Rast2010-07-191-6/+6
* | | | | | xmalloc: include size in the failure messageMatthieu Moy2010-08-201-1/+2
* | | | | | Git 1.7.2.2v1.7.2.2Junio C Hamano2010-08-194-3/+26
* | | | | | Merge branch 'tr/xsize-bits' into maintJunio C Hamano2010-08-191-0/+2
|\ \ \ \ \ \
| * | | | | | xsize_t: check whether we lose bitsThomas Rast2010-07-281-0/+2
* | | | | | | Merge branch 'jc/sha1-name-find-fix' into maintJunio C Hamano2010-08-191-10/+11
|\ \ \ \ \ \ \
| * | | | | | | sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano2010-08-021-10/+11
* | | | | | | | Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintJunio C Hamano2010-08-181-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | smart-http: Don't deadlock on server failureShawn O. Pearce2010-08-061-2/+3
* | | | | | | | push: mention "git pull" in error message for non-fast forwardsMatthieu Moy2010-08-121-2/+2
* | | | | | | | Standardize do { ... } while (0) styleJonathan Nieder2010-08-124-10/+10
* | | | | | | | t/t7003: replace \t with literal tab in sed expressionBrandon Casey2010-08-121-1/+1
* | | | | | | | index-pack: Don't follow replace refs.Nelson Elhage2010-08-122-0/+8
* | | | | | | | post-receive-email: remove spurious commas in email subjectMatthieu Moy2010-08-111-1/+1