Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t/lib-httpd: load mod_unixdmg/httpd-tests-update-for-apache-2.4 | Michael J Gruber | 2016-02-25 | 1 | -0/+3 |
* | Eighth batch for 2.8 | Junio C Hamano | 2016-02-24 | 1 | -36/+41 |
* | Merge branch 'jc/am-i-v-fix' | Junio C Hamano | 2016-02-24 | 3 | -9/+15 |
|\ | |||||
| * | am -i: fix "v"iewjc/am-i-v-fix | Junio C Hamano | 2016-02-17 | 1 | -1/+1 |
| * | pager: factor out a helper to prepare a child process to run the pager | Junio C Hamano | 2016-02-17 | 2 | -6/+14 |
| * | pager: lose a separate argv[] | Junio C Hamano | 2016-02-16 | 1 | -3/+1 |
* | | Merge branch 'nd/worktree-add-B' | Junio C Hamano | 2016-02-24 | 2 | -4/+26 |
|\ \ | |||||
| * | | worktree add -B: do the checkout test before update branchnd/worktree-add-B | Nguyễn Thái Ngọc Duy | 2016-02-15 | 2 | -1/+17 |
| * | | worktree: fix "add -B" | Nguyễn Thái Ngọc Duy | 2016-02-15 | 2 | -3/+9 |
* | | | Merge branch 'nd/exclusion-regression-fix' | Junio C Hamano | 2016-02-24 | 7 | -12/+378 |
|\ \ \ | |||||
| * | | | dir.c: don't exclude whole dir prematurely | Nguyễn Thái Ngọc Duy | 2016-02-15 | 4 | -10/+276 |
| * | | | dir.c: support marking some patterns already matched | Nguyễn Thái Ngọc Duy | 2016-02-15 | 2 | -3/+77 |
| * | | | dir.c: support tracing exclude | Nguyễn Thái Ngọc Duy | 2016-02-15 | 3 | -0/+26 |
| * | | | dir.c: fix match_pathname() | Nguyễn Thái Ngọc Duy | 2016-02-15 | 1 | -1/+1 |
* | | | | Merge branch 'ce/https-public-key-pinning' | Junio C Hamano | 2016-02-24 | 2 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | http: implement public key pinningce/https-public-key-pinning | Christoph Egger | 2016-02-15 | 2 | -0/+23 |
* | | | | | Merge branch 'bc/http-empty-auth' | Junio C Hamano | 2016-02-24 | 2 | -2/+17 |
|\ \ \ \ \ | |||||
| * | | | | | http: add option to try authentication without usernamebc/http-empty-auth | brian m. carlson | 2016-02-15 | 2 | -2/+17 |
| |/ / / / | |||||
* | | | | | Merge branch 'sp/remote-curl-ssl-strerror' | Junio C Hamano | 2016-02-24 | 1 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | remote-curl: include curl_errorstr on SSL setup failuressp/remote-curl-ssl-strerror | Shawn Pearce | 2016-02-15 | 1 | -2/+14 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/lose-name-path' | Junio C Hamano | 2016-02-24 | 10 | -142/+46 |
|\ \ \ \ \ | |||||
| * | | | | | list-objects: pass full pathname to callbacksjk/lose-name-path | Jeff King | 2016-02-12 | 9 | -58/+26 |
| * | | | | | list-objects: drop name_path entirely | Jeff King | 2016-02-12 | 9 | -25/+19 |
| * | | | | | list-objects: convert name_path to a strbuf | Jeff King | 2016-02-12 | 3 | -36/+15 |
| * | | | | | show_object_with_name: simplify by using path_name() | Jeff King | 2016-02-12 | 1 | -34/+6 |
| * | | | | | http-push: stop using name_path | Jeff King | 2016-02-12 | 1 | -16/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ew/force-ipv4' | Junio C Hamano | 2016-02-24 | 13 | -0/+95 |
|\ \ \ \ \ | |||||
| * | | | | | connect & http: support -4 and -6 switches for remote operationsew/force-ipv4 | Eric Wong | 2016-02-12 | 13 | -0/+95 |
* | | | | | | Merge branch 'nd/git-common-dir-fix' | Junio C Hamano | 2016-02-24 | 2 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fix | Nguyễn Thái Ngọc Duy | 2016-02-12 | 2 | -1/+12 |
* | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2016-02-24 | 5 | -33/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecs | Jeff King | 2016-02-10 | 2 | -2/+12 |
| * | | | | | | | check_filename: tighten dwim-wildcard ambiguity | Jeff King | 2016-02-10 | 4 | -31/+42 |
| * | | | | | | | checkout: reorder check_filename conditional | Jeff King | 2016-02-10 | 1 | -1/+1 |
* | | | | | | | | tests: remove no-op full-svn-test target | Eric Wong | 2016-02-23 | 1 | -6/+0 |
* | | | | | | | | Sync with 2.7.2 | Junio C Hamano | 2016-02-22 | 2 | -1/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.7.2v2.7.2 | Junio C Hamano | 2016-02-22 | 3 | -2/+17 |
| * | | | | | | | | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-02-22 | 6 | -10/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pw/completion-stash' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mm/clean-doc-fix' into maint | Junio C Hamano | 2016-02-22 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dw/mergetool-vim-window-shuffle' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/stripspace-optstring' into maint | Junio C Hamano | 2016-02-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/git-remote-add-url-insteadof-test' | Junio C Hamano | 2016-02-22 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t5505: 'remote add x y' should work when url.y.insteadOf = xjs/git-remote-add-url-insteadof-test | Johannes Schindelin | 2016-02-17 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | Merge branch 'jk/config-include' | Junio C Hamano | 2016-02-22 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | git-config: better document default behavior for `--include`jk/config-include | Jeff King | 2016-02-13 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | Merge branch 'ew/connect-verbose' | Junio C Hamano | 2016-02-22 | 1 | -2/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t5570: add tests for "git {clone,fetch,pull} -v"ew/connect-verbose | Eric Wong | 2016-02-15 | 1 | -2/+20 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn | Junio C Hamano | 2016-02-22 | 4 | -14/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-svn: apply "svn.pathnameencoding" before URL encoding | Kazutoshi Satoda | 2016-02-22 | 2 | -1/+17 |