summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'nd/remove-unused'Junio C Hamano2016-05-034-27/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | wrapper.c: delete dead function git_mkstemps()nd/remove-unusedNguyễn Thái Ngọc Duy2016-04-222-19/+0
| * | | | | | | | | | | | | | | | dir.c: remove dead function fnmatch_icase()Nguyễn Thái Ngọc Duy2016-04-222-8/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref'Junio C Hamano2016-05-032-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-222-7/+14
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit'Junio C Hamano2016-05-034-42/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commitJan Durovec2016-04-193-0/+120
| * | | | | | | | | | | | | | | | git-p4: clean-up code style in testsJan Durovec2016-04-192-42/+42
* | | | | | | | | | | | | | | | | Merge branch 'en/merge-fixes'Junio C Hamano2016-05-031-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixesElijah Newren2016-04-121-3/+3
| * | | | | | | | | | | | | | | | | merge-recursive: remove duplicate codeElijah Newren2016-04-121-2/+0
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-05-021-0/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Start preparing for 2.8.3Junio C Hamano2016-05-021-0/+61
| * | | | | | | | | | | | | | | | | Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-023-18/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/xstrfmt-null-with-prec-0' into maintJunio C Hamano2016-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/send-email-drop-data-dumper' into maintJunio C Hamano2016-05-021-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/cygwin-wants-rename' into maintJunio C Hamano2016-05-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano2016-05-021-7/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/http-socks5h' into maintJunio C Hamano2016-05-021-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/imap-send' into maintJunio C Hamano2016-05-021-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-022-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-022-23/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-022-7/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano2016-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-026-3/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-022-8/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-027-114/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/send-email-readable-message-id' into maintJunio C Hamano2016-05-021-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.9Junio C Hamano2016-04-291-0/+44
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.8.2Junio C Hamano2016-04-292-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8.2v2.8.2Junio C Hamano2016-04-294-3/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano2016-04-292-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano2016-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano2016-04-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano2016-04-291-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-292-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-292-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-292-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/msvc' into maintJunio C Hamano2016-04-293-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'st/verify-tag'Junio C Hamano2016-04-296-61/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tag -v: verify directly rather than exec-ing verify-tagSantiago Torres2016-04-221-7/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: move tag verification code to tag.cSantiago Torres2016-04-223-54/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: prepare verify_tag for libificationSantiago Torres2016-04-221-9/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: update variable name and typeSantiago Torres2016-04-191-5/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7030: test verifying multiple tagsSantiago Torres2016-04-181-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/verify-tag.c: ignore SIGPIPE in gpg-interfaceSantiago Torres2016-04-062-3/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/win32-mmap'Junio C Hamano2016-04-291-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap(win32): avoid expensive fstat() calljs/win32-mmapJohannes Schindelin2016-04-221-9/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin2016-04-221-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | win32mmap: set errno appropriatelyJohannes Schindelin2016-04-221-2/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |