summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-024-6/+130
|\
| * t4052: work around shells unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek2012-04-271-2/+4
| * Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graphJunio C Hamano2012-04-271-0/+1
| |\
| * | Prevent graph_width of stat width from falling below minLucian Poston2012-04-182-8/+12
| * | t4052: Test diff-stat output with minimum columnsLucian Poston2012-04-181-0/+28
| * | t4052: Adjust --graph --stat output for prefixesLucian Poston2012-04-161-9/+25
| * | Adjust stat width calculations to take --graph output into accountLucian Poston2012-04-161-1/+1
| * | Add output_prefix_length to diff_optionsLucian Poston2012-04-162-0/+4
| * | t4052: test --stat output with --graphZbigniew Jędrzejewski-Szmek2012-04-161-4/+74
* | | Merge branch 'zj/mksh-columns-breakage'Junio C Hamano2012-05-021-0/+1
|\ \ \ | | |/ | |/|
| * | test-lib: skip test with COLUMNS=1 under mkshZbigniew Jędrzejewski-Szmek2012-04-271-0/+1
* | | Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-0253-194/+192
|\ \ \
| * | | docs: stop using asciidoc no-inline-literalJeff King2012-04-2653-194/+192
* | | | Merge branch 'nd/i18n'Junio C Hamano2012-05-0217-384/+499
|\ \ \ \
| * | | | help: replace underlining "help -a" headers using hyphens with a blank lineNguyễn Thái Ngọc Duy2012-04-253-16/+5
| * | | | i18n: bundle: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-17/+21
| * | | | i18n: index-pack: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-57/+68
| * | | | i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy2012-04-241-12/+20
| * | | | i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-83/+91
| * | | | i18n: remote: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-106/+121
| * | | | i18n: make warn_dangling_symref() automatically append \nNguyễn Thái Ngọc Duy2012-04-243-4/+5
| * | | | i18n: help: mark strings for translationNguyễn Thái Ngọc Duy2012-04-245-38/+47
| * | | | i18n: mark relative dates for translationJonathan Nieder2012-04-243-46/+62
| * | | | strbuf: convenience format functions with \n automatically appendedNguyễn Thái Ngọc Duy2012-04-242-0/+40
| * | | | Makefile: feed all header files to xgettextNguyễn Thái Ngọc Duy2012-04-231-17/+31
* | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-026-31/+157
|\ \ \ \ \
| * | | | | push.default doc: explain simple after upstreamJunio C Hamano2012-04-241-4/+4
| * | | | | push: document the future default change for push.default (matching -> simple)Matthieu Moy2012-04-241-2/+6
| * | | | | t5570: use explicit push refspecClemens Buchacher2012-04-241-16/+14
| * | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-245-5/+98
| * | | | | t5528-push-default.sh: add helper functionsMatthieu Moy2012-04-241-7/+27
| * | | | | Undocument deprecated alias 'push.default=tracking'Matthieu Moy2012-04-241-1/+0
| * | | | | Documentation: explain push.default option a bit moreMatthieu Moy2012-04-241-3/+15
| |/ / / /
* | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-029-91/+300
|\ \ \ \ \
| * | | | | index-v4: document the entry formatJunio C Hamano2012-04-271-0/+13
| * | | | | unpack-trees: preserve the index file version of originalJunio C Hamano2012-04-271-0/+1
| * | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-042-1/+19
| * | | | | read-cache.c: write prefix-compressed names in the indexJunio C Hamano2012-04-042-10/+58
| * | | | | read-cache.c: read prefix-compressed names in index on-disk version v4Junio C Hamano2012-04-031-7/+51
| * | | | | read-cache.c: move code to copy incore to ondisk cache to a helper functionJunio C Hamano2012-04-031-9/+17
| * | | | | read-cache.c: move code to copy ondisk to incore cache to a helper functionJunio C Hamano2012-04-031-19/+25
| * | | | | read-cache.c: report the header version we do not understandJunio C Hamano2012-04-031-2/+4
| * | | | | read-cache.c: make create_from_disk() report number of bytes it consumedJunio C Hamano2012-04-031-3/+6
| * | | | | read-cache.c: allow unaligned mapping of the index fileJunio C Hamano2012-04-031-12/+32
| * | | | | cache.h: hide on-disk index detailsJunio C Hamano2012-04-032-48/+54
| * | | | | varint: make it available outside the context of packJunio C Hamano2012-04-033-0/+40
* | | | | | Merge branch 'master' of https://github.com/git-l10n/git-poJunio C Hamano2012-05-013-931/+1069
|\ \ \ \ \ \
| * | | | | | l10n: Update German translationRalf Thielow2012-05-021-345/+399
| * | | | | | Merge l10n updates from branch 'maint' into masterJiang Xin2012-05-021-717/+984
| |\ \ \ \ \ \
| * | | | | | | l10n: Update Simplified Chinese translationJiang Xin2012-04-301-306/+351
View Lorry Controller Status