Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-11-18 | 1 | -11/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstream | Torstein Hegge | 2013-11-18 | 1 | -11/+13 | |
* | | | | | | | | | | | | | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-11-06 | 4 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t: replace pulls with merges | Felipe Contreras | 2013-10-31 | 4 | -4/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'bw/solaris-sed-tr-test-portability' | Junio C Hamano | 2013-11-04 | 2 | -14/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t4015: simplify sed command that is not even seen by sedbw/solaris-sed-tr-test-portability | Junio C Hamano | 2013-11-04 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | Avoid difference in tr semantics between System V and BSD | Ben Walton | 2013-10-30 | 1 | -12/+18 | |
| * | | | | | | | | | | | | | | | | Change sed i\ usage to something Solaris' sed can handle | Ben Walton | 2013-10-28 | 1 | -2/+4 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs' | Junio C Hamano | 2013-11-04 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix '\%o' for printf from coreutilsjk/duplicate-objects-in-packs | Kacper Kornet | 2013-10-31 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/wrap-perl-used-in-tests' | Junio C Hamano | 2013-11-04 | 29 | -54/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t: use perl instead of "$PERL_PATH" where applicablejk/wrap-perl-used-in-tests | Jeff King | 2013-10-29 | 28 | -50/+50 | |
| * | | | | | | | | | | | | | | | | | t: provide a perl() function which uses $PERL_PATH | Jeff King | 2013-10-29 | 2 | -4/+12 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/test-prereq-perl-doc' | Junio C Hamano | 2013-11-04 | 1 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | t/README: tests can use perl even with NO_PERLjn/test-prereq-perl-doc | Jonathan Nieder | 2013-10-28 | 1 | -4/+11 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/tests-windows-port-fix' | Junio C Hamano | 2013-11-01 | 6 | -14/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | tests: undo special treatment of CRLF for Windowsjs/tests-windows-port-fix | Johannes Sixt | 2013-10-28 | 3 | -9/+0 | |
| * | | | | | | | | | | | | | | | | | Windows: a test_cmp that is agnostic to random LF <> CRLF conversions | Johannes Sixt | 2013-10-28 | 2 | -0/+67 | |
| * | | | | | | | | | | | | | | | | | t5300-pack-object: do not compare binary data using test_cmp | Johannes Sixt | 2013-10-28 | 1 | -5/+5 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/test-help-format-windows-port-fix' | Junio C Hamano | 2013-11-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmljs/test-help-format-windows-port-fix | Johannes Sixt | 2013-10-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/reset-p-current-head-fix' | Junio C Hamano | 2013-11-01 | 2 | -6/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | reset: pass real rev name to add--interactivejk/reset-p-current-head-fix | Jeff King | 2013-10-25 | 2 | -6/+9 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/for-each-ref-skip-parsing' | Junio C Hamano | 2013-11-01 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsing | Jeff King | 2013-10-30 | 1 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-11-01 | 1 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mv | Jens Lehmann | 2013-10-13 | 1 | -0/+26 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/valgrind-test-fix' | Junio C Hamano | 2013-10-30 | 1 | -99/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Revert "test-lib: allow prefixing a custom string before "ok N" etc."tr/valgrind-test-fix | Thomas Rast | 2013-10-22 | 1 | -15/+12 | |
| * | | | | | | | | | | | | | | | | | | Revert "test-lib: support running tests under valgrind in parallel" | Thomas Rast | 2013-10-22 | 1 | -84/+22 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-10-30 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | Nguyễn Thái Ngọc Duy | 2013-10-22 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-10-30 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-other | Jonathan Nieder | 2013-10-18 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix' | Junio C Hamano | 2013-10-30 | 2 | -0/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fix | Matthieu Moy | 2013-10-18 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --" | Matthieu Moy | 2013-10-18 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/t3600-nul-sha1-fix' | Junio C Hamano | 2013-10-30 | 1 | -7/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t3600: fix broken "choking git rm" testsg/t3600-nul-sha1-fix | SZEDER Gábor | 2013-10-16 | 1 | -7/+4 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/upload-pack-send-symref' | Junio C Hamano | 2013-10-30 | 3 | -14/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | t5570: Update for clone-progress-to-stderr branchjc/upload-pack-send-symref | Brian Gernhardt | 2013-10-22 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref | Junio C Hamano | 2013-10-22 | 3 | -5/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t5570: Update for symref capability | Brian Gernhardt | 2013-10-22 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | clone: test the new HEAD detection logic | Junio C Hamano | 2013-09-17 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | connect: annotate refs with their symref information in get_remote_head() | Junio C Hamano | 2013-09-17 | 1 | -11/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | t5505: fix "set-head --auto with ambiguous HEAD" test | Junio C Hamano | 2013-09-17 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/http-auth-redirects' | Junio C Hamano | 2013-10-30 | 3 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | remote-curl: rewrite base url from info/refs redirects | Jeff King | 2013-10-14 | 3 | -1/+15 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Sync with v1.8.4.2 | Junio C Hamano | 2013-10-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr' into maint | Junio C Hamano | 2013-10-28 | 3 | -5/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |