summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* version-gen: cleanupfc/git-version-genFelipe Contreras2013-09-131-14/+21
* Sync with maint for l10n updatesJunio C Hamano2013-09-121-11/+11
|\
| * Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-111-11/+11
| |\
| | * l10n: de.po: use "das Tag" instead of "der Tag"Ralf Thielow2013-09-081-11/+11
* | | Update draft release notes to 1.8.5 for the third batch of topicsJunio C Hamano2013-09-121-0/+4
* | | Merge branch 'jc/pager-configuration-doc'Junio C Hamano2013-09-121-16/+14
|\ \ \
| * | | config: rewrite core.pager documentationjc/pager-configuration-docJunio C Hamano2013-08-291-16/+14
* | | | Merge branch 'mm/remote-helpers-doc'Junio C Hamano2013-09-121-0/+6
|\ \ \ \
| * | | | Documentation/remote-helpers: document common use-case for private refmm/remote-helpers-docMatthieu Moy2013-08-261-0/+6
* | | | | Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'Junio C Hamano2013-09-121-6/+0
|\ \ \ \ \
| * | | | | remove dead pastebin link from pack-heuristics documentmn/doc-pack-heu-remove-dead-pastebinMichal Nazarewicz2013-08-231-6/+0
* | | | | | Merge branch 'mm/fast-import-feature-doc'Junio C Hamano2013-09-121-2/+2
|\ \ \ \ \ \
| * | | | | | Documentation/fast-import: clarify summary for `feature` commandmm/fast-import-feature-docMatthieu Moy2013-08-251-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mm/mediawiki-dumb-push-fix'Junio C Hamano2013-09-126-4/+34
|\ \ \ \ \ \
| * | | | | | git-remote-mediawiki: no need to update private ref in non-dumb pushmm/mediawiki-dumb-push-fixMatthieu Moy2013-09-031-1/+0
| * | | | | | git-remote-mediawiki: use no-private-update capability on dumb pushMatthieu Moy2013-09-031-0/+3
| * | | | | | transport-helper: add no-private-update capabilityMatthieu Moy2013-09-034-2/+22
| * | | | | | git-remote-mediawiki: add test and check Makefile targetsMatthieu Moy2013-08-291-1/+9
* | | | | | | Merge branch 'jc/commit-is-spelled-with-two-ems'Junio C Hamano2013-09-125-11/+11
|\ \ \ \ \ \ \
| * | | | | | | typofix: cherry is spelled with two arsjc/commit-is-spelled-with-two-emsJunio C Hamano2013-09-052-2/+2
| * | | | | | | typofix: commit is spelled with two emsJunio C Hamano2013-09-043-9/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/config-int-range-check'Junio C Hamano2013-09-125-24/+83
|\ \ \ \ \ \ \
| * | | | | | | git-config: always treat --int as 64-bit internallyJeff King2013-09-094-3/+29
| * | | | | | | config: make numeric parsing errors more clearJeff King2013-09-093-9/+16
| * | | | | | | config: set errno in numeric git_parse_* functionsJeff King2013-09-091-4/+14
| * | | | | | | config: properly range-check integer valuesJeff King2013-09-091-6/+6
| * | | | | | | config: factor out integer parsing from range checksJeff King2013-09-091-6/+22
* | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-09-111-0/+32
* | | | | | | | Merge branch 'jc/ls-files-killed-optim'Junio C Hamano2013-09-114-17/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optimEric Sunshine2013-08-232-9/+24
| * | | | | | | | t3010: update to demonstrate "ls-files -k" optimization pitfallsJunio C Hamano2013-08-151-3/+9
| * | | | | | | | ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-153-3/+31
| * | | | | | | | dir.c: use the cache_* macro to access the current indexJunio C Hamano2013-08-151-6/+5
* | | | | | | | | Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano2013-09-112-2/+117
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-252-1/+31
| * | | | | | | | | t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-251-0/+24
| * | | | | | | | | t3404: make tests more self-containedEric Sunshine2013-08-251-2/+63
* | | | | | | | | | Merge branch 'rt/rebase-p-no-merge-summary'Junio C Hamano2013-09-112-1/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-212-1/+25
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tf/gitweb-ss-tweak'Junio C Hamano2013-09-112-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: make search help link less uglytf/gitweb-ss-tweakTony Finch2013-08-201-2/+2
| * | | | | | | | | | gitweb: omit the repository owner when it is unsetTony Finch2013-08-201-1/+1
| * | | | | | | | | | gitweb: vertically centre contents of page footerTony Finch2013-08-201-1/+2
| * | | | | | | | | | gitweb: ensure OPML text fits inside its boxTony Finch2013-08-201-2/+1
* | | | | | | | | | | Merge branch 'sb/mailmap-freeing-NULL-is-ok'Junio C Hamano2013-09-111-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mailmap: remove redundant check for freeing memorysb/mailmap-freeing-NULL-is-okStefan Beller2013-08-201-2/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/xread-in-full'Junio C Hamano2013-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stream_to_pack: xread does not guarantee to read all requested bytesjs/xread-in-fullJohannes Sixt2013-08-201-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'es/rebase-i-respect-core-commentchar'Junio C Hamano2013-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase -i: fix cases ignoring core.commentchares/rebase-i-respect-core-commentcharEric Sunshine2013-08-181-1/+1