summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-098-10/+10
* Almost ready for 2.8.3Junio C Hamano2016-05-061-0/+9
* Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-063-11/+133
|\
| * t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * submodule update: align reporting path for custom command executionStefan Beller2016-03-302-5/+28
| * submodule status: correct path handling in recursive submodulesStefan Beller2016-03-302-0/+22
| * submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-302-1/+34
| * submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-302-3/+23
* | Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-065-28/+21
|\ \
| * | configure: remove checking for HMAC_CTX_cleanupky/imap-send-openssl-1.1.0Kazuki Yamaguchi2016-04-083-13/+0
| * | imap-send: avoid deprecated TLSv1_method()Kazuki Yamaguchi2016-04-081-5/+4
| * | imap-send: check NULL return of SSL_CTX_new()Kazuki Yamaguchi2016-04-081-0/+4
| * | imap-send: use HMAC() function provided by OpenSSLKazuki Yamaguchi2016-04-082-10/+13
* | | Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
|\ \ \
| * | | replace --edit: respect core.editorjs/replace-edit-use-editor-configurationJohannes Schindelin2016-04-201-0/+1
| |/ /
* | | Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
|\ \ \
| * | | builtin/apply: free patch when parse_chunk() failscc/applyChristian Couder2016-04-011-1/+3
| * | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-011-0/+7
| * | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-221-6/+0
| * | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-221-8/+5
* | | | Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano2016-05-061-1/+1
|\ \ \ \
| * | | | for-each-ref: fix description of '--contains' in manpagekn/for-each-tag-branchSZEDER Gábor2016-03-301-1/+1
* | | | | git-multimail: update to release 1.3.0Matthieu Moy2016-05-038-143/+476
* | | | | 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
|\ \ \ \ \
| * | | | | t3404: use write_scriptjk/use-write-script-moreJunio C Hamano2016-04-121-4/+3
| * | | | | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-111-5/+5
| * | | | | t5532: use write_scriptJeff King2016-04-101-9/+12
* | | | | | Merge branch 'jc/xstrfmt-null-with-prec-0' into maintJunio C Hamano2016-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | setup.c: do not feed NULL to "%.*s" even with precision 0jc/xstrfmt-null-with-prec-0Junio C Hamano2016-04-071-1/+1
* | | | | | | Merge branch 'ew/send-email-drop-data-dumper' into maintJunio C Hamano2016-05-021-1/+0
|\ \ \ \ \ \ \
| * | | | | | | send-email: do not load Data::Dumperew/send-email-drop-data-dumperEric Wong2016-04-061-1/+0
* | | | | | | | Merge branch 'ad/cygwin-wants-rename' into maintJunio C Hamano2016-05-021-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMESad/cygwin-wants-renameAdam Dinwoodie2015-08-071-0/+1
* | | | | | | | | Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano2016-05-021-7/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git_config_set_multivar_in_file: handle "unset" errorsjk/do-not-printf-NULLJeff King2016-04-101-2/+6
| * | | | | | | | | git_config_set_multivar_in_file: all non-zero returns are errorsJeff King2016-04-101-1/+1
| * | | | | | | | | config: lower-case first word of error stringsJeff King2016-04-101-5/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/http-socks5h' into maintJunio C Hamano2016-05-021-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: differentiate socks5:// and socks5h://jc/http-socks5hJunio C Hamano2016-04-101-1/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/imap-send' into maintJunio C Hamano2016-05-021-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | imap-send: fix CRAM-MD5 response calculationky/imap-sendKazuki Yamaguchi2016-04-131-1/+1
| * | | | | | | | | imap-send: check for NOLOGIN capability only when using LOGIN commandKazuki Yamaguchi2016-04-131-5/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-022-3/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-072-6/+6
| * | | | | | | | | commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie2016-04-071-0/+20
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-022-23/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule--helper, module_clone: catch fprintf failuresb/submodule-helper-clone-regression-fixStefan Beller2016-04-011-2/+2
| * | | | | | | | | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-011-5/+4