summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SQUASH???mk/http-backend-content-lengthJunio C Hamano2017-11-274-13/+13
* t5560-http-backend-noserver.sh: add CONTENT_LENGTH casesMax Kirillov2017-11-273-0/+41
* SQUASH???Junio C Hamano2017-11-271-4/+3
* http-backend: respect CONTENT_LENGTH as specified by rfc3875Florian Manschwetus2017-11-273-2/+51
* A bit more fixes for 2.15.1Junio C Hamano2017-11-271-0/+5
* Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-277-23/+52
|\
| * reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-087-6/+35
| * builtin/merge-base: free commit listsMartin Ågren2017-11-081-18/+18
* | Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-273-19/+29
|\ \
| * | bisect: fix memory leak when returning best elementMartin Ågren2017-11-061-1/+5
| * | bisect: fix off-by-one error in `best_bisection_sorted()`Martin Ågren2017-11-061-3/+4
| * | bisect: fix memory leak in `find_bisection()`Martin Ågren2017-11-061-1/+3
| * | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-063-14/+17
| |/
* | Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
|\ \
| * | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fixRené Scharfe2017-11-121-39/+20
* | | Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-271-8/+13
|\ \ \
| * | | doc/SubmittingPatches: correct subject guidancead/submitting-patches-title-decorationAdam Dinwoodie2017-11-111-8/+13
| | |/ | |/|
* | | Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-271-2/+13
|\ \ \
| * | | imap-send: handle missing response codes gracefullyrs/imap-send-next-arg-fixRené Scharfe2017-11-031-1/+1
| * | | imap-send: handle NULL return of next_arg()René Scharfe2017-11-031-1/+12
* | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3
* | | | Almost ready for 2.15.1Junio C Hamano2017-11-211-0/+12
* | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-211-29/+16
|\ \ \ \
| * | | | sequencer.c: check return value of close() in rewrite_file()rs/sequencer-rewrite-file-cleanupSimon Ruderich2017-11-021-1/+2
| * | | | sequencer: use O_TRUNC to truncate filesRené Scharfe2017-11-011-3/+1
| * | | | sequencer: factor out rewrite_file()René Scharfe2017-11-011-29/+17
| | |/ / | |/| |
* | | | Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-212-5/+7
|\ \ \ \
| * | | | t4201: make use of abbreviation in the test more robustcb/t4201-robustifyCharles Bailey2017-11-132-5/+7
| | |/ / | |/| |
* | | | Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-2144-103/+69
|\ \ \ \
| * \ \ \ Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updatetz/fsf-address-updateJunio C Hamano2017-11-091-2/+1
| |\ \ \ \
| | * | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-091-2/+1
| * | | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-0943-101/+68
| | |_|/ / | |/| | |
* | | | | Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-211-1/+1
|\ \ \ \ \
| * | | | | rebase -i: fix comment typoad/rebase-i-serie-typofixAdam Dinwoodie2017-11-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-11-211-1/+3
|\ \ \ \ \
| * | | | | link_alt_odb_entries: make empty input a noopjk/info-alternates-fixJeff King2017-11-131-1/+3
* | | | | | Merge branch 'ab/pcre-v2' into maintJunio C Hamano2017-11-212-3/+4
|\ \ \ \ \ \
| * | | | | | grep: fix NO_LIBPCRE1_JIT to fully disable JITCharles Bailey2017-11-132-3/+4
* | | | | | | Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano2017-11-213-6/+6
|\ \ \ \ \ \ \
| * | | | | | | wrapper.c: consistently quote filenames in error messagessr/wrapper-quote-filenamesSimon Ruderich2017-11-063-6/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2017-11-212-1/+20
|\ \ \ \ \ \ \
| * | | | | | | wt-status: actually ignore submodules when requestedbw/status-ignore-submodules-from-configbw/rebase-i-ignored-submodule-fixBrandon Williams2017-11-072-1/+20
* | | | | | | | Start preparation for 2.15.1Junio C Hamano2017-11-153-2/+70
* | | | | | | | Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-151-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | mailmap: use Kaartic Sivaraam's new addressks/mailmapKaartic Sivaraam2017-11-031-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-151-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fix typos in 2.15.0 release notesjm/relnotes-2.15-typofixJean Carlo Machado2017-11-061-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-154-9/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-024-9/+6
* | | | | | | | | Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-153-0/+88
|\ \ \ \ \ \ \ \ \