Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 |
|\ | |||
| * | t1005: add test for "read-tree --reset -u A B" | Junio C Hamano | 2013-11-04 |
| * | t1005: reindent | Junio C Hamano | 2013-11-04 |
* | | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint | Junio C Hamano | 2013-12-17 |
|\ \ | |||
| * | | sha1_loose_object_info(): do not return success on missing object | Junio C Hamano | 2013-11-06 |
* | | | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 |
|\ \ \ | |||
| * | | | diff: restrict pathspec limitations to diff b/f case only | Nguyễn Thái Ngọc Duy | 2013-11-20 |
* | | | | Sync with 1.8.4.5 | Junio C Hamano | 2013-12-02 |
|\ \ \ \ | |||
| * | | | | submodule: do not copy unknown update mode from .gitmodules | Junio C Hamano | 2013-12-02 |
| * | | | | Merge branch 'jn/test-prereq-perl-doc' into maint | Junio C Hamano | 2013-11-08 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jc/upload-pack-send-symref' into maint | Junio C Hamano | 2013-11-08 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/http-auth-redirects' into maint | Junio C Hamano | 2013-11-08 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'mm/checkout-auto-track-fix' into maint | Junio C Hamano | 2013-11-07 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jk/split-broken-ident' into maint | Junio C Hamano | 2013-11-07 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/revision-range-unpeel' into maint | Junio C Hamano | 2013-11-07 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | t5570: Update for clone-progress-to-stderr branch | Brian Gernhardt | 2013-10-30 |
* | | | | | | | | | | Merge branch 'nd/literal-pathspecs' | Junio C Hamano | 2013-11-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses | Nguyễn Thái Ngọc Duy | 2013-10-28 |
* | | | | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-11-18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | branch: fix --verbose output column alignment | Torstein Hegge | 2013-11-18 |
* | | | | | | | | | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-11-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t: replace pulls with merges | Felipe Contreras | 2013-10-31 |
* | | | | | | | | | | | | | Merge branch 'bw/solaris-sed-tr-test-portability' | Junio C Hamano | 2013-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t4015: simplify sed command that is not even seen by sed | Junio C Hamano | 2013-11-04 |
| * | | | | | | | | | | | | | Avoid difference in tr semantics between System V and BSD | Ben Walton | 2013-10-30 |
| * | | | | | | | | | | | | | Change sed i\ usage to something Solaris' sed can handle | Ben Walton | 2013-10-28 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs' | Junio C Hamano | 2013-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Fix '\%o' for printf from coreutils | Kacper Kornet | 2013-10-31 |
* | | | | | | | | | | | | | | Merge branch 'jk/wrap-perl-used-in-tests' | Junio C Hamano | 2013-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t: use perl instead of "$PERL_PATH" where applicable | Jeff King | 2013-10-29 |
| * | | | | | | | | | | | | | | t: provide a perl() function which uses $PERL_PATH | Jeff King | 2013-10-29 |
* | | | | | | | | | | | | | | | Merge branch 'jn/test-prereq-perl-doc' | Junio C Hamano | 2013-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | t/README: tests can use perl even with NO_PERL | Jonathan Nieder | 2013-10-28 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'js/tests-windows-port-fix' | Junio C Hamano | 2013-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | tests: undo special treatment of CRLF for Windows | Johannes Sixt | 2013-10-28 |
| * | | | | | | | | | | | | | | Windows: a test_cmp that is agnostic to random LF <> CRLF conversions | Johannes Sixt | 2013-10-28 |
| * | | | | | | | | | | | | | | t5300-pack-object: do not compare binary data using test_cmp | Johannes Sixt | 2013-10-28 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'js/test-help-format-windows-port-fix' | Junio C Hamano | 2013-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html | Johannes Sixt | 2013-10-30 |
* | | | | | | | | | | | | | | | Merge branch 'jk/reset-p-current-head-fix' | Junio C Hamano | 2013-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | reset: pass real rev name to add--interactive | Jeff King | 2013-10-25 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'jk/for-each-ref-skip-parsing' | Junio C Hamano | 2013-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | for-each-ref: avoid loading objects to print %(objectname) | Jeff King | 2013-10-30 |
* | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | mv: Fix spurious warning when moving a file in presence of submodules | Jens Lehmann | 2013-10-13 |
* | | | | | | | | | | | | | | | | Merge branch 'tr/valgrind-test-fix' | Junio C Hamano | 2013-10-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | Revert "test-lib: allow prefixing a custom string before "ok N" etc." | Thomas Rast | 2013-10-22 |
| * | | | | | | | | | | | | | | | | Revert "test-lib: support running tests under valgrind in parallel" | Thomas Rast | 2013-10-22 |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-10-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | Nguyễn Thái Ngọc Duy | 2013-10-22 |