summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* l10n: Improve zh_CN translation for msg "not something we can merge"Thynson2012-03-091-1/+1
* l10n: Improve zh_CN trans for msg that cannot fast-forwardThynson2012-03-091-1/+1
* l10n: Update zh_CN translation for 1.7.10-rc0Jiang Xin2012-03-081-169/+177
* Update Swedish translation (732t0f0u).Peter Krefting2012-03-082-1396/+1767
* po/sv.po: add Swedish translationPeter Krefting2012-03-081-0/+3492
* l10n: Update git.pot (1 new message)Jiang Xin2012-03-081-169/+175
* Merge v1.7.10-rc0 for git l10n updateJiang Xin2012-03-0872-683/+2034
|\
| * Git 1.7.10-rc0v1.7.10-rc0Junio C Hamano2012-03-072-6/+58
| * Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-077-10/+170
| |\
| | * ctype.c: Fix a sparse warningjc/pickaxe-ignore-caseRamsay Jones2012-03-042-3/+3
| | * pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-284-2/+128
| | * grep: use static trans-case tableJunio C Hamano2012-02-283-8/+42
| * | Merge branch 'jh/threadable-symlink-check'Junio C Hamano2012-03-062-2/+28
| |\ \
| | * | Add threaded versions of functions in symlinks.c.jh/threadable-symlink-checkJared Hance2012-03-022-2/+28
| * | | Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-062-86/+111
| |\ \ \
| | * | | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-012-5/+2
| | * | | t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano2012-03-011-7/+39
| | * | | t4011: modernise styleJunio C Hamano2012-03-011-86/+82
| * | | | Merge branch 'th/mergetools-deltawalker'Junio C Hamano2012-03-061-0/+21
| |\ \ \ \
| | * | | | mergetools: add a plug-in to support DeltaWalkerTim Henigan2012-03-051-0/+21
| * | | | | Merge branch 'cn/pull-rebase-message'Junio C Hamano2012-03-064-29/+24
| |\ \ \ \ \
| | * | | | | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-044-29/+24
| | |/ / / /
| * | | | | Merge branch 'sl/modern-t0000'Junio C Hamano2012-03-061-274/+289
| |\ \ \ \ \
| | * | | | | t0000: modernise stylesl/modern-t0000Stefano Lattarini2012-03-021-274/+289
| * | | | | | Merge branch 'nl/http-proxy-auth'Junio C Hamano2012-03-061-1/+3
| |\ \ \ \ \ \
| | * | | | | | http: support proxies that require authenticationnl/http-proxy-authNelson Benitez Leon2012-03-021-1/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'tr/maint-bundle-boundary'Junio C Hamano2012-03-062-23/+36
| |\ \ \ \ \ \
| | * | | | | | bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundaryThomas Rast2012-03-012-1/+16
| | * | | | | | t5510: ensure we stay in the toplevel test dirThomas Rast2012-03-011-8/+10
| | * | | | | | t5510: refactor bundle->pack conversionThomas Rast2012-03-011-14/+10
| * | | | | | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-069-33/+335
| |\ \ \ \ \ \ \
| | * | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-018-8/+32
| | * | | | | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-014-2/+30
| | * | | | | | | diff --stat: add a test for output with COLUMNS=40Zbigniew Jędrzejewski-Szmek2012-03-011-0/+19
| | * | | | | | | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-013-44/+76
| | * | | | | | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-012-4/+5
| | * | | | | | | log --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-012-2/+3
| | * | | | | | | show --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-012-2/+4
| | * | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-013-3/+16
| | * | | | | | | diff --stat: tests for long filenames and big change countsJunio C Hamano2012-03-011-0/+182
| | | | | | | | |
| | | \ \ \ \ \ \
| | *-. \ \ \ \ \ \ Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano2012-02-244-29/+58
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2012-03-062-2/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | t5704: fix nonportable sed/grep usagesThomas Rast2012-03-061-2/+2
| | * | | | | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-061-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
| * | | | | | | | | | | | | perf: compare diff algorithmsThomas Rast2012-03-061-0/+29
| * | | | | | | | | | | | | Sync with 1.7.9.3Junio C Hamano2012-03-052-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Git 1.7.9.3v1.7.9.3Junio C Hamano2012-03-052-2/+3
| | * | | | | | | | | | | | Merge branch 'jc/doc-merge-options' into maintJunio C Hamano2012-03-051-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \