Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ct/advise-push-default' into maint | Junio C Hamano | 2012-05-11 | 2 | -2/+2 |
|\ | |||||
| * | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 | 2 | -2/+2 |
* | | Merge branch 'js/fast-import-test-9300' into maint | Junio C Hamano | 2012-05-11 | 1 | -34/+54 |
|\ \ | |||||
| * | | t9300-fast-import: avoid 'exit' in test_expect_success snippets | Johannes Sixt | 2012-04-20 | 1 | -34/+54 |
* | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint | Junio C Hamano | 2012-05-11 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge branch 'sl/test-wc-l-line-count' into maint | Junio C Hamano | 2012-05-11 | 19 | -74/+65 |
|\ \ \ | |||||
| * | | | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 2012-04-11 | 19 | -74/+65 |
| |/ / | |||||
* | | | Merge branch 'rl/show-empty-prefix' into maint | Junio C Hamano | 2012-05-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'mm/include-userpath' into maint | Junio C Hamano | 2012-05-10 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge branch 'bw/test-fix-grep-gnuism' into maint | Junio C Hamano | 2012-05-10 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | t9400: fix gnuism in grep | Junio C Hamano | 2012-04-19 | 1 | -2/+2 |
* | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' into maint | Junio C Hamano | 2012-05-10 | 2 | -0/+28 |
|\ \ \ \ | |||||
| * | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 | 2 | -0/+28 |
* | | | | | Merge branch 'jk/maint-push-progress' into maint | Junio C Hamano | 2012-05-10 | 1 | -2/+25 |
|\ \ \ \ \ | |||||
| * | | | | | t5541: test more combinations of --progress | Jeff King | 2012-05-01 | 1 | -2/+25 |
* | | | | | | Merge branch 'lp/diffstat-with-graph' into maint | Junio C Hamano | 2012-05-10 | 2 | -4/+121 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | test-lib: skip test with COLUMNS=1 under mksh | Zbigniew Jędrzejewski-Szmek | 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 'jk/maint-gitweb-test-use-sane-perl' into maint | Junio C Hamano | 2012-05-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/gitweb-lib: use $PERL_PATH to run gitweb | Jeff King | 2012-05-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'js/daemon-test-race-fix' into maint | Junio C Hamano | 2012-05-07 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5570: fix forwarding of git-daemon messages via cat | Johannes Sixt | 2012-04-27 | 1 | -11/+11 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/maint-config-bogus-section' into maint | Junio C Hamano | 2012-05-07 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: reject bogus section names for --rename-section | Jeff King | 2012-04-25 | 1 | -0/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'pw/t5800-import-race-fix' into maint | Junio C Hamano | 2012-05-07 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-remote-testgit: fix race when spawning fast-import | Pete Wyckoff | 2012-04-24 | 1 | -0/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/merge-reduce-parents-early' into maint | Junio C Hamano | 2012-05-03 | 3 | -8/+69 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fmt-merge-msg: discard needless merge parents | Junio C Hamano | 2012-04-18 | 1 | -1/+30 |
| * | | | | | | | | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 | 3 | -3/+3 |
| * | | | | | | | | merge tests: octopus with redundant parents | Michał Kiedrowicz | 2012-04-17 | 3 | -7/+39 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cb/http-multi-curl-auth' into maint | Junio C Hamano | 2012-05-03 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix http auth with multiple curl handles | Jeff King | 2012-04-10 | 1 | -5/+5 |
| * | | | | | | | | http auth fails with multiple curl handles | Clemens Buchacher | 2012-04-10 | 1 | -10/+15 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint | Junio C Hamano | 2012-05-03 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: describe new refs based on where it came from | Marc Branchaud | 2012-04-17 | 1 | -0/+30 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pw/fast-import-dataref-parsing' into maint | Junio C Hamano | 2012-05-01 | 1 | -0/+287 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-import: tighten parsing of datarefs | Pete Wyckoff | 2012-04-10 | 1 | -0/+287 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'jn/maint-fast-import-empty-ls' into maint | Junio C Hamano | 2012-03-26 | 1 | -0/+39 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ms/maint-config-error-at-eol-linecount' into maint | Junio C Hamano | 2012-03-26 | 1 | -0/+31 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 | 2 | -3/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'it/fetch-pack-many-refs' into maint | Junio C Hamano | 2012-05-01 | 2 | -0/+97 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | remote-curl: main test case for the OS command line overflow | Ivan Todoroski | 2012-04-10 | 1 | -0/+31 |