summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-253-196/+604
|\
| * rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-062-1/+37
| * rerere: split code to call ll_merge() furtherJunio C Hamano2016-04-061-16/+31
| * rerere: move code related to "forget" togetherJunio C Hamano2016-04-061-97/+97
| * rerere: gc and clearJunio C Hamano2016-04-062-45/+123
| * rerere: do use multiple variantsJunio C Hamano2016-03-152-39/+61
| * t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-151-0/+74
| * rerere: allow multiple variants to existJunio C Hamano2016-03-152-22/+106
| * rerere: delay the recording of preimageJunio C Hamano2016-03-151-27/+25
| * rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-152-18/+41
| * rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano2016-02-081-3/+29
| * rerere: split conflict ID furtherJunio C Hamano2016-02-082-6/+58
* | Sixth batch for post 2.8 cycleJunio C Hamano2016-04-221-0/+44
* | Merge branch 'ad/cygwin-wants-rename'Junio C Hamano2016-04-221-0/+1
|\ \
| * | config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMESad/cygwin-wants-renameAdam Dinwoodie2015-08-071-0/+1
* | | Merge branch 'jk/use-write-script-more'Junio C Hamano2016-04-223-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 'jk/do-not-printf-NULL'Junio C Hamano2016-04-221-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'Junio C Hamano2016-04-221-1/+4
|\ \ \ \
| * | | | http: differentiate socks5:// and socks5h://jc/http-socks5hJunio C Hamano2016-04-101-1/+4
* | | | | Merge branch 'ky/imap-send-openssl-1.1.0'Junio C Hamano2016-04-225-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 'ky/imap-send'Junio C Hamano2016-04-221-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 'jc/xstrfmt-null-with-prec-0'Junio C Hamano2016-04-221-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 'ad/commit-have-m-option'Junio C Hamano2016-04-222-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 'ew/send-email-drop-data-dumper'Junio C Hamano2016-04-221-1/+0
|\ \ \ \ \ \ \
| * | | | | | | send-email: do not load Data::Dumperew/send-email-drop-data-dumperEric Wong2016-04-061-1/+0
| |/ / / / / /
* | | | | | | Merge branch 'ew/send-email-readable-message-id'Junio C Hamano2016-04-221-2/+3
|\ \ \ \ \ \ \
| * | | | | | | send-email: more meaningful Message-IDew/send-email-readable-message-idEric Wong2016-04-061-2/+3
| |/ / / / / /
* | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix'Junio C Hamano2016-04-222-24/+57
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-012-15/+15
| * | | | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-311-4/+0
| * | | | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-311-4/+4
| * | | | | | | recursive submodules: test for relative pathsStefan Beller2016-03-311-0/+41
* | | | | | | | Fifth batch for post 2.8 cycleJunio C Hamano2016-04-181-0/+12
View Lorry Controller Status