summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n: fix auto detection of gettext scheme for shell scriptsjc/i18n-shell-script-gettextJunio C Hamano2012-03-121-1/+1
* p4000: use -3000 when promising -3000Thomas Rast2012-03-091-1/+1
* Update draft release notes to 1.7.10Junio C Hamano2012-03-081-10/+28
* Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-082-3/+3
|\
| * fix deletion of .git/objects sub-directories in git-prune/repackkb/maint-prune-rmdir-closedirKarsten Blees2012-03-072-3/+3
* | Merge branch 'jl/maint-submodule-relative'Junio C Hamano2012-03-083-29/+68
|\ \
| * | submodules: fix ambiguous absolute paths under Windowsjl/maint-submodule-relativeJohannes Sixt2012-03-041-0/+3
| * | submodules: refactor computation of relative gitdir pathJens Lehmann2012-03-042-24/+23
| * | submodules: always use a relative path from gitdir to work treeJens Lehmann2012-03-042-0/+38
| * | submodules: always use a relative path to gitdirJens Lehmann2012-03-042-7/+6
* | | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'Junio C Hamano2012-03-081-9/+9
|\ \ \
| * | | gitweb: Fix fixed string (non-regexp) project searchjn/maint-do-not-match-with-unsanitized-searchtextJakub Narebski2012-03-061-8/+8
* | | | Merge branch 'vr/branch-doc'Junio C Hamano2012-03-081-9/+10
|\ \ \ \
| * | | | Documentation/git-branch: add default for --containsvr/branch-docVincent van Ravesteijn2012-03-061-2/+3
| * | | | Documentation/git-branch: fix a typoVincent van Ravesteijn2012-03-061-1/+1
| * | | | Documentation/git-branch: cleanupsVincent van Ravesteijn2012-03-061-6/+6
* | | | | perf: export some important test-lib variablesThomas Rast2012-03-082-1/+14
* | | | | perf: load test-lib-functions from the correct directoryThomas Rast2012-03-082-1/+6
* | | | | 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