Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/columns' | Junio C Hamano | 2012-05-03 | 4 | -0/+325 |
|\ | |||||
| * | tag: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+44 |
| * | status: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+24 |
| * | branch: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+77 |
| * | column: add dense layout support | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+48 |
| * | t9002: work around shells that are unable to set COLUMNS to 1 | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -2/+3 |
| * | column: add columnar layout | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+86 |
| * | Add column layout skeleton and git-column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+45 |
* | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' | Junio C Hamano | 2012-05-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | t/gitweb-lib: use $PERL_PATH to run gitweb | Jeff King | 2012-05-01 | 1 | -1/+1 |
* | | | Merge branch 'zj/diff-stat-smaller-num-columns' | Junio C Hamano | 2012-05-02 | 75 | -341/+360 |
|\ \ \ | |||||
| * | | | diff --stat: use less columns for change counts | Zbigniew Jędrzejewski-Szmek | 2012-04-30 | 75 | -341/+360 |
* | | | | Merge branch 'pw/p4-various' | Junio C Hamano | 2012-05-02 | 3 | -5/+242 |
|\ \ \ \ | |||||
| * | | | | git p4: submit files with wildcards | Pete Wyckoff | 2012-04-30 | 2 | -0/+139 |
| * | | | | git p4: fix writable file after rename or copy | Pete Wyckoff | 2012-04-30 | 2 | -5/+8 |
| * | | | | git p4: test submit | Pete Wyckoff | 2012-04-30 | 1 | -0/+92 |
| * | | | | git p4: bring back files in deleted client directory | Pete Wyckoff | 2012-04-30 | 1 | -2/+5 |
* | | | | | Merge branch 'lp/diffstat-with-graph' | Junio C Hamano | 2012-05-02 | 1 | -4/+120 |
|\ \ \ \ \ | |||||
| * | | | | | t4052: work around shells unable to set COLUMNS to 1 | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -2/+4 |
| * | | | | | Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph | Junio C Hamano | 2012-04-27 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Prevent graph_width of stat width from falling below min | Lucian Poston | 2012-04-18 | 1 | -7/+7 |
| * | | | | | t4052: Test diff-stat output with minimum columns | Lucian Poston | 2012-04-18 | 1 | -0/+28 |
| * | | | | | t4052: Adjust --graph --stat output for prefixes | Lucian Poston | 2012-04-16 | 1 | -9/+25 |
| * | | | | | t4052: test --stat output with --graph | Zbigniew Jędrzejewski-Szmek | 2012-04-16 | 1 | -4/+74 |
* | | | | | | Merge branch 'zj/mksh-columns-breakage' | Junio C Hamano | 2012-05-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | test-lib: skip test with COLUMNS=1 under mksh | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -0/+1 |
* | | | | | | Merge branch 'mm/simple-push' | Junio C Hamano | 2012-05-02 | 2 | -23/+85 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | t5570: use explicit push refspec | Clemens Buchacher | 2012-04-24 | 1 | -16/+14 |
| * | | | | | push: introduce new push.default mode "simple" | Matthieu Moy | 2012-04-24 | 1 | -0/+44 |
| * | | | | | t5528-push-default.sh: add helper functions | Matthieu Moy | 2012-04-24 | 1 | -7/+27 |
* | | | | | | Merge branch 'ld/git-p4-tags-and-labels' | Junio C Hamano | 2012-04-30 | 4 | -3/+206 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git p4: fix unit tests | Luke Diamand | 2012-04-25 | 1 | -1/+1 |
| * | | | | | | git p4: Squash P4EDITOR in test harness | Luke Diamand | 2012-04-24 | 1 | -0/+1 |
| * | | | | | | git p4: fix-up "import/export of labels to/from p4" | Luke Diamand | 2012-04-24 | 1 | -2/+2 |
| * | | | | | | git p4: import/export of labels to/from p4 | Luke Diamand | 2012-04-11 | 1 | -0/+202 |
| * | | | | | | git p4: Fixing script editor checks | Luke Diamand | 2012-04-11 | 1 | -2/+2 |
* | | | | | | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-04-30 | 1 | -1/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-cherry-pick: Add test to validate new options | Neil Horman | 2012-04-24 | 1 | -1/+24 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/maint-config-bogus-section' | Junio C Hamano | 2012-04-30 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | config: reject bogus section names for --rename-section | Jeff King | 2012-04-25 | 1 | -0/+8 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'js/daemon-test-race-fix' | Junio C Hamano | 2012-04-29 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5570: fix forwarding of git-daemon messages via cat | Johannes Sixt | 2012-04-27 | 1 | -11/+11 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mm/include-userpath' | Junio C Hamano | 2012-04-29 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 1 | -0/+8 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'pw/t5800-import-race-fix' | Junio C Hamano | 2012-04-29 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-remote-testgit: fix race when spawning fast-import | Pete Wyckoff | 2012-04-24 | 1 | -0/+13 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' | Junio C Hamano | 2012-04-29 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 1 | -0/+14 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 | 3 | -7/+68 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fmt-merge-msg: discard needless merge parents | Junio C Hamano | 2012-04-18 | 1 | -1/+30 |