summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/columns'Junio C Hamano2012-05-034-0/+325
|\
| * tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+44
| * status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+24
| * branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+77
| * column: add dense layout supportNguyễn Thái Ngọc Duy2012-04-271-0/+48
| * t9002: work around shells that are unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek2012-04-271-2/+3
| * column: add columnar layoutNguyễn Thái Ngọc Duy2012-04-271-0/+86
| * Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+45
* | Merge branch 'jk/maint-gitweb-test-use-sane-perl'Junio C Hamano2012-05-021-1/+1
|\ \
| * | t/gitweb-lib: use $PERL_PATH to run gitwebJeff King2012-05-011-1/+1
* | | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-0275-341/+360
|\ \ \
| * | | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-3075-341/+360
* | | | Merge branch 'pw/p4-various'Junio C Hamano2012-05-023-5/+242
|\ \ \ \
| * | | | git p4: submit files with wildcardsPete Wyckoff2012-04-302-0/+139
| * | | | git p4: fix writable file after rename or copyPete Wyckoff2012-04-302-5/+8
| * | | | git p4: test submitPete Wyckoff2012-04-301-0/+92
| * | | | git p4: bring back files in deleted client directoryPete Wyckoff2012-04-301-2/+5
* | | | | Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-021-4/+120
|\ \ \ \ \
| * | | | | 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-181-7/+7
| * | | | | 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
| * | | | | 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 'mm/simple-push'Junio C Hamano2012-05-022-23/+85
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | t5570: use explicit push refspecClemens Buchacher2012-04-241-16/+14
| * | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-0/+44
| * | | | | t5528-push-default.sh: add helper functionsMatthieu Moy2012-04-241-7/+27
* | | | | | Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-304-3/+206
|\ \ \ \ \ \
| * | | | | | git p4: fix unit testsLuke Diamand2012-04-251-1/+1
| * | | | | | git p4: Squash P4EDITOR in test harnessLuke Diamand2012-04-241-0/+1
| * | | | | | git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-241-2/+2
| * | | | | | git p4: import/export of labels to/from p4Luke Diamand2012-04-111-0/+202
| * | | | | | git p4: Fixing script editor checksLuke Diamand2012-04-111-2/+2
* | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-1/+24
|\ \ \ \ \ \ \
| * | | | | | | git-cherry-pick: Add test to validate new optionsNeil Horman2012-04-241-1/+24
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-config-bogus-section'Junio C Hamano2012-04-301-0/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | config: reject bogus section names for --rename-sectionJeff King2012-04-251-0/+8
| |/ / / / /
* | | | | | Merge branch 'js/daemon-test-race-fix'Junio C Hamano2012-04-291-11/+11
|\ \ \ \ \ \
| * | | | | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-271-11/+11
| |/ / / / /
* | | | | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-291-0/+8
|\ \ \ \ \ \
| * | | | | | config: expand tildes in include.path variableJeff King2012-04-291-0/+8
| |/ / / / /
* | | | | | Merge branch 'pw/t5800-import-race-fix'Junio C Hamano2012-04-291-0/+13
|\ \ \ \ \ \
| * | | | | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-241-0/+13
| |/ / / / /
* | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-291-0/+14
|\ \ \ \ \ \
| * | | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-111-0/+14
| |/ / / / /
* | | | | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-273-7/+68
|\ \ \ \ \ \
| * | | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-1/+30