| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | | 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 'js/fast-import-test-9300' | Junio C Hamano | 2012-04-27 | 1 | -34/+54 |
|\ \ \ |
|
| * | | | t9300-fast-import: avoid 'exit' in test_expect_success snippets | Johannes Sixt | 2012-04-20 | 1 | -34/+54 |
| | |/
| |/| |
|
* | | | Merge branch 'cb/http-multi-curl-auth' | Junio C Hamano | 2012-04-27 | 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' | Junio C Hamano | 2012-04-26 | 1 | -0/+30 |
|\ \ \ |
|
| * | | | fetch: describe new refs based on where it came from | Marc Branchaud | 2012-04-17 | 1 | -0/+30 |
| | |/
| |/| |
|
* | | | Merge branch 'fc/completion-tests' | Junio C Hamano | 2012-04-24 | 1 | -0/+243 |
|\ \ \ |
|
| * | | | completion: fix completion after 'git --option <TAB>' | SZEDER Gábor | 2012-04-21 | 1 | -0/+17 |
| * | | | completion: avoid trailing space for --exec-path | Jonathan Nieder | 2012-04-21 | 1 | -1/+6 |
| * | | | completion: add missing general options | Felipe Contreras | 2012-04-21 | 1 | -0/+16 |
| * | | | tests: add tests for the __gitcomp() completion helper function | SZEDER Gábor | 2012-04-21 | 1 | -0/+85 |
| * | | | tests: add initial bash completion tests | Felipe Contreras | 2012-04-15 | 1 | -0/+120 |
| | |/
| |/| |
|
* | | | Merge branch 'zj/upstream-error-message' | Junio C Hamano | 2012-04-24 | 1 | -3/+78 |
|\ \ \ |
|
| * | | | i18n: mark @{upstream} error messages for translation | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -5/+5 |
| * | | | Be more specific if upstream branch is not tracked | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -3/+3 |
| * | | | Provide better message for barnhc_wiht_tpyo@{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -1/+1 |
| * | | | Provide branch name in error message when using @{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -2/+2 |
| * | | | t1507: add tests to document @{upstream} behaviour | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -3/+78 |
| |/ / |
|
* | | | Merge branch 'it/fetch-pack-many-refs' | Junio C Hamano | 2012-04-24 | 2 | -0/+97 |
|\ \ \ |
|
| * | | | remote-curl: main test case for the OS command line overflow | Ivan Todoroski | 2012-04-10 | 1 | -0/+31 |
| * | | | fetch-pack: test cases for the new --stdin option | Ivan Todoroski | 2012-04-10 | 1 | -0/+66 |
* | | | | Merge branch 'pw/fast-import-dataref-parsing' | Junio C Hamano | 2012-04-24 | 1 | -0/+287 |
|\ \ \ \ |
|
| * | | | | fast-import: tighten parsing of datarefs | Pete Wyckoff | 2012-04-10 | 1 | -0/+287 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'hv/submodule-recurse-push' | Junio C Hamano | 2012-04-24 | 2 | -0/+127 |
|\ \ \ \ |
|
| * | | | | push: teach --recurse-submodules the on-demand option | Heiko Voigt | 2012-03-30 | 1 | -0/+94 |
| * | | | | Teach revision walking machinery to walk multiple times sequencially | Heiko Voigt | 2012-03-30 | 1 | -0/+33 |
* | | | | | Merge branch 'bw/test-fix-grep-gnuism' | Junio C Hamano | 2012-04-23 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | t9400: fix gnuism in grep | Junio C Hamano | 2012-04-19 | 1 | -2/+2 |
* | | | | | | Merge branch 'jn/more-i18ncmp' | Junio C Hamano | 2012-04-23 | 3 | -8/+8 |
|\ \ \ \ \ \ |
|
| * | | | | | | test: am of empty patch should not succeed | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 |
| * | | | | | | test: use test_i18ncmp for "Patch format detection failed" message | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 |
| * | | | | | | test: do not rely on US English tracking-info messages | Jonathan Nieder | 2012-04-14 | 2 | -6/+6 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | Merge branch 'lp/maint-diff-three-dash-with-graph' | Junio C Hamano | 2012-04-23 | 1 | -0/+290 |
|\ \ \ \ \ \ |
|
| * | | | | | | t4202: add test for "log --graph --stat -p" separator lineslp/maint-diff-three-dash-with-graph | Lucian Poston | 2012-03-20 | 1 | -0/+290 |
* | | | | | | | Merge branch 'sl/test-wc-l-line-count' | Junio C Hamano | 2012-04-23 | 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' | Junio C Hamano | 2012-04-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 1 | -1/+1 |
| |/ / / / / / |
|
* | | | | | | | Merge branch 'pw/git-p4' | Junio C Hamano | 2012-04-23 | 12 | -184/+182 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | git p4: use "git p4" directly in tests | Pete Wyckoff | 2012-04-09 | 12 | -184/+182 |
| * | | | | | | | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 | 1 | -1/+1 |
| |/ / / / / / |
|
* | | | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 | 1 | -0/+30 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 | 1 | -0/+30 |
| | |_|/ / / /
| |/| | | | | |
|