summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fc/trivial'Junio C Hamano2013-09-174-16/+12
|\
| * pull: use $curr_branch_short moreRené Scharfe2013-09-081-3/+2
| * add: trivial style cleanupFelipe Contreras2013-08-301-5/+5
| * reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
| * branch: trivial style fixFelipe Contreras2013-08-301-1/+1
| * reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
* | Merge branch 'fc/fast-export'Junio C Hamano2013-09-171-40/+47
|\ \
| * | fast-export: refactor get_tags_and_duplicates()fc/fast-exportFelipe Contreras2013-09-031-30/+38
| * | fast-export: make extra_refs globalFelipe Contreras2013-09-031-11/+10
* | | Merge branch 'ab/gitweb-author-initials'Junio C Hamano2013-09-171-0/+1
|\ \ \
| * | | gitweb: Fix the author initials in blame for non-ASCII namesab/gitweb-author-initialsÆvar Arnfjörð Bjarmason2013-08-301-0/+1
* | | | Merge branch 'jk/has-sha1-file-retry-packed'Junio C Hamano2013-09-171-1/+4
|\ \ \ \
| * | | | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packedJeff King2013-08-301-1/+4
| | |/ / | |/| |
* | | | Merge branch 'jk/write-broken-index-with-nul-sha1'Junio C Hamano2013-09-173-4/+63
|\ \ \ \
| * | | | write_index: optionally allow broken null sha1sjk/write-broken-index-with-nul-sha1Jeff King2013-08-283-4/+63
| | |/ / | |/| |
* | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-09-171-2/+2
|\ \ \ \
| * | | | documentation: clarify notes for clean.requireForceJiang Xin2013-08-281-2/+2
* | | | | Merge branch 'tb/precompose-autodetect-fix'Junio C Hamano2013-09-174-7/+4
|\ \ \ \ \
| * | | | | Set core.precomposeunicode to true on e.g. HFS+tb/precompose-autodetect-fixTorsten Bögershausen2013-08-274-7/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'kk/tests-with-no-perl'Junio C Hamano2013-09-173-44/+67
|\ \ \ \ \
| * | | | | reset test: modernize stylekk/tests-with-no-perlJonathan Nieder2013-08-241-7/+24
| * | | | | t/t7106-reset-unborn-branch.sh: Add PERL prerequisiteKacper Kornet2013-08-241-1/+1
| * | | | | add -i test: use skip_all instead of repeated PERL prerequisiteJonathan Nieder2013-08-241-35/+41
| * | | | | Make test "using invalid commit with -C" more strictKacper Kornet2013-08-241-1/+1
| |/ / / /
* | | | | Merge branch 'ap/commit-author-mailmap'Junio C Hamano2013-09-172-1/+18
|\ \ \ \ \
| * | | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-242-1/+18
* | | | | | Merge branch 'jk/free-tree-buffer'Junio C Hamano2013-09-1710-23/+24
|\ \ \ \ \ \
| * | | | | | clear parsed flag when we free tree buffersjk/free-tree-bufferJeff King2013-06-0610-23/+24
* | | | | | | Merge branch 'maint'Junio C Hamano2013-09-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t7406-submodule-update: add missing &&Tay Ray Chuan2013-09-171-1/+1
* | | | | | | | 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
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |