summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/exclusion-regression-fix'Junio C Hamano2016-02-247-12/+378
|\
| * dir.c: don't exclude whole dir prematurelyNguyễn Thái Ngọc Duy2016-02-154-10/+276
| * dir.c: support marking some patterns already matchedNguyễn Thái Ngọc Duy2016-02-152-3/+77
| * dir.c: support tracing excludeNguyễn Thái Ngọc Duy2016-02-153-0/+26
| * dir.c: fix match_pathname()Nguyễn Thái Ngọc Duy2016-02-151-1/+1
* | Merge branch 'ce/https-public-key-pinning'Junio C Hamano2016-02-242-0/+24
|\ \
| * | http: implement public key pinningce/https-public-key-pinningChristoph Egger2016-02-152-0/+23
* | | Merge branch 'bc/http-empty-auth'Junio C Hamano2016-02-242-2/+17
|\ \ \
| * | | http: add option to try authentication without usernamebc/http-empty-authbrian m. carlson2016-02-152-2/+17
| |/ /
* | | Merge branch 'sp/remote-curl-ssl-strerror'Junio C Hamano2016-02-241-2/+14
|\ \ \
| * | | remote-curl: include curl_errorstr on SSL setup failuressp/remote-curl-ssl-strerrorShawn Pearce2016-02-151-2/+14
| |/ /
* | | Merge branch 'jk/lose-name-path'Junio C Hamano2016-02-2410-142/+46
|\ \ \
| * | | list-objects: pass full pathname to callbacksjk/lose-name-pathJeff King2016-02-129-58/+26
| * | | list-objects: drop name_path entirelyJeff King2016-02-129-25/+19
| * | | list-objects: convert name_path to a strbufJeff King2016-02-123-36/+15
| * | | show_object_with_name: simplify by using path_name()Jeff King2016-02-121-34/+6
| * | | http-push: stop using name_pathJeff King2016-02-121-16/+7
* | | | Merge branch 'ew/force-ipv4'Junio C Hamano2016-02-2413-0/+95
|\ \ \ \
| * | | | connect & http: support -4 and -6 switches for remote operationsew/force-ipv4Eric Wong2016-02-1213-0/+95
* | | | | Merge branch 'nd/git-common-dir-fix'Junio C Hamano2016-02-242-1/+12
|\ \ \ \ \
| * | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fixNguyễn Thái Ngọc Duy2016-02-122-1/+12
* | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2016-02-245-33/+54
|\ \ \ \ \ \
| * | | | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecsJeff King2016-02-102-2/+12
| * | | | | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-104-31/+42
| * | | | | | checkout: reorder check_filename conditionalJeff King2016-02-101-1/+1
* | | | | | | tests: remove no-op full-svn-test targetEric Wong2016-02-231-6/+0
* | | | | | | Sync with 2.7.2Junio C Hamano2016-02-222-1/+16
|\ \ \ \ \ \ \
| * | | | | | | Git 2.7.2v2.7.2Junio C Hamano2016-02-223-2/+17
| * | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-226-10/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-221-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/clean-doc-fix' into maintJunio C Hamano2016-02-221-3/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dw/mergetool-vim-window-shuffle' into maintJunio C Hamano2016-02-221-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/git-remote-add-url-insteadof-test'Junio C Hamano2016-02-221-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5505: 'remote add x y' should work when url.y.insteadOf = xjs/git-remote-add-url-insteadof-testJohannes Schindelin2016-02-171-0/+5
* | | | | | | | | | | | | | Merge branch 'jk/config-include'Junio C Hamano2016-02-221-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-config: better document default behavior for `--include`jk/config-includeJeff King2016-02-131-1/+3
* | | | | | | | | | | | | | | Merge branch 'ew/connect-verbose'Junio C Hamano2016-02-221-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5570: add tests for "git {clone,fetch,pull} -v"ew/connect-verboseEric Wong2016-02-151-2/+20
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svnJunio C Hamano2016-02-224-14/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-svn: apply "svn.pathnameencoding" before URL encodingKazutoshi Satoda2016-02-222-1/+17
| * | | | | | | | | | | | | | | git-svn: enable "svn.pathnameencoding" on dcommitKazutoshi Satoda2016-02-222-2/+24
| * | | | | | | | | | | | | | | git-svn: hoist out utf8 prep from t9129 to lib-git-svnEric Wong2016-02-222-11/+13
* | | | | | | | | | | | | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stashSZEDER Gábor2016-02-221-2/+2
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2016-02-172-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Start preparing for 2.7.2Junio C Hamano2016-02-172-1/+28
| * | | | | | | | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-172-12/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/do-not-move-worktree-manually' into maintJunio C Hamano2016-02-173-21/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \