summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-gitweb-test-use-sane-perl'Junio C Hamano2012-05-023-3/+3
|\
| * Consistently use perl from /usr/bin/ for scriptsZbigniew Jędrzejewski-Szmek2012-05-012-2/+2
| * t/gitweb-lib: use $PERL_PATH to run gitwebJeff King2012-05-011-1/+1
* | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-0215-24/+24
|\ \
| * | remove blank filename in error messagePete Wyckoff2012-04-301-1/+1
| * | remove superfluous newlines in error messagesPete Wyckoff2012-04-3015-24/+24
* | | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-0277-353/+400
|\ \ \
| * | | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-3077-353/+400
* | | | Merge branch 'pw/p4-various'Junio C Hamano2012-05-024-35/+308
|\ \ \ \
| * | | | git p4: submit files with wildcardsPete Wyckoff2012-04-303-28/+185
| * | | | git p4: fix writable file after rename or copyPete Wyckoff2012-04-303-5/+20
| * | | | git p4: test submitPete Wyckoff2012-04-301-0/+92
| * | | | git p4: bring back files in deleted client directoryPete Wyckoff2012-04-302-5/+14
| | |/ / | |/| |
* | | | Merge branch 'jc/rerere-train'Junio C Hamano2012-05-021-1/+1
|\ \ \ \
| * | | | contrib/rerere-train: use installed git-sh-setupJunio C Hamano2012-04-301-1/+1
* | | | | Merge branch 'ab/i18n'Junio C Hamano2012-05-022-45/+44
|\ \ \ \ \
| * | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-7/+6
| * | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-29/+23
| * | | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-9/+15
| | |_|/ / | |/| | |
* | | | | 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