summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-061-85/+110
|\
| * diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-011-4/+1
| * 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 'cn/pull-rebase-message'Junio C Hamano2012-03-061-4/+2
|\ \
| * | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-4/+2
* | | Merge branch 'sl/modern-t0000'Junio C Hamano2012-03-061-274/+289
|\ \ \
| * | | t0000: modernise stylesl/modern-t0000Stefano Lattarini2012-03-021-274/+289
* | | | Merge branch 'tr/maint-bundle-boundary'Junio C Hamano2012-03-061-22/+35
|\ \ \ \
| * | | | bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundaryThomas Rast2012-03-011-0/+15
| * | | | 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-061-0/+220
|\ \ \ \ \
| * | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+6
| * | | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-0/+6
| * | | | | 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-011-8/+8
| * | | | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-4/+4
| * | | | | log --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-2/+2
| * | | | | show --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-2/+2
| * | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-2/+9
| * | | | | diff --stat: tests for long filenames and big change countsJunio C Hamano2012-03-011-0/+182
* | | | | | Merge branch 'maint'Junio C Hamano2012-03-061-2/+2
|\ \ \ \ \ \
| * | | | | | t5704: fix nonportable sed/grep usagesThomas Rast2012-03-061-2/+2
* | | | | | | perf: compare diff algorithmsThomas Rast2012-03-061-0/+29
* | | | | | | Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-041-0/+15
|\ \ \ \ \ \ \
| * | | | | | | test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-043-28/+13
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-041-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2012-03-041-0/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano2012-03-041-0/+86
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano2012-03-041-24/+23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | t0300: work around bug in dash 0.5.6Michael J Gruber2012-03-021-1/+4
| * | | | | | | | | | t5512 (ls-remote): modernize styleTom Grennan2012-03-021-23/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/shStefano Lattarini2012-03-021-4/+5
| * | | | | | | | | Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano2012-02-271-0/+9
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | parse-options: typo check for unknown switchesRené Scharfe2012-03-041-0/+10
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-011-5/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-281-5/+1
* | | | | | | | | | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-011-2/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parse-options: allow positivation of options starting, with no-René Scharfe2012-02-261-1/+1
| * | | | | | | | | | | test-parse-options: convert to OPT_BOOL()René Scharfe2012-02-261-2/+58
* | | | | | | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano2012-03-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexpJakub Narebski2012-02-281-0/+10
* | | | | | | | | | | | Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* | | | | | | | | | | | Merge branch 'ph/cherry-pick-advice-refinement'Junio C Hamano2012-02-281-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-221-0/+14
* | | | | | | | | | | | | Merge branch 'jb/required-filter'Junio C Hamano2012-02-281-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-171-0/+37