summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-02-17wt-status.c: set commitable bit if there is a meaningful merge.Libravatar Stephen P. Smith2-0/+21
2015-09-28Git 2.4.10Libravatar Junio C Hamano4-3/+22
2015-09-28Sync with 2.3.10Libravatar Junio C Hamano27-28/+446
2015-09-28Git 2.3.10Libravatar Junio C Hamano4-3/+22
2015-09-28Merge branch 'jk/xdiff-memory-limits' into maint-2.3Libravatar Junio C Hamano11-26/+57
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesLibravatar Jeff King1-1/+2
2015-09-28xdiff: reject files larger than ~1GBLibravatar Jeff King3-1/+14
2015-09-28react to errors in xdi_diffLibravatar Jeff King7-24/+41
2015-09-28Merge branch 'jk/transfer-limit-redirection' into maint-2.3Libravatar Junio C Hamano6-15/+78
2015-09-28Merge branch 'jk/transfer-limit-protocol' into maint-2.3Libravatar Junio C Hamano13-1/+306
2015-09-25http: limit redirection depthLibravatar Blake Burkhart3-0/+8
2015-09-25http: limit redirection to protocol-whitelistLibravatar Blake Burkhart4-5/+27
2015-09-25transport: refactor protocol whitelist codeLibravatar Jeff King2-10/+43
2015-09-23submodule: allow only certain protocols for submodule fetchesLibravatar Jeff King2-0/+52
2015-09-23transport: add a protocol-whitelist environment variableLibravatar Jeff King11-1/+254
2015-09-04Git 2.4.9Libravatar Junio C Hamano4-3/+13
2015-09-04Sync with 2.3.9Libravatar Junio C Hamano7-26/+49
2015-09-04Git 2.3.9Libravatar Junio C Hamano4-3/+13
2015-09-04Sync with 2.2.3Libravatar Junio C Hamano6-25/+38
2015-09-04Git 2.2.3Libravatar Junio C Hamano4-3/+13
2015-09-04Merge branch 'jk/long-paths' into maint-2.2Libravatar Junio C Hamano4-24/+27
2015-09-04show-branch: use a strbuf for reflog descriptionsLibravatar Jeff King1-2/+4
2015-09-04read_info_alternates: handle paths larger than PATH_MAXLibravatar Jeff King1-6/+3
2015-09-04notes: use a strbuf in add_non_noteLibravatar Jeff King1-9/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXLibravatar Jeff King1-7/+10
2015-08-03Git 2.4.8Libravatar Junio C Hamano4-5/+25
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintLibravatar Junio C Hamano2-1/+26
2015-08-03Merge branch 'ss/clone-guess-dir-name-simplify' into maintLibravatar Junio C Hamano1-13/+6
2015-08-03Merge branch 'sg/completion-commit-cleanup' into maintLibravatar Junio C Hamano1-1/+1
2015-08-03Merge branch 'pt/am-abort-fix' into maintLibravatar Junio C Hamano2-8/+104
2015-08-03Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintLibravatar Junio C Hamano3-7/+83
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintLibravatar Junio C Hamano2-5/+28
2015-07-27Git 2.4.7Libravatar Junio C Hamano4-3/+57
2015-07-27Merge branch 'jk/pretty-encoding-doc' into maintLibravatar Junio C Hamano1-1/+4
2015-07-27Merge branch 'tb/checkout-doc' into maintLibravatar Junio C Hamano1-1/+5
2015-07-27Merge branch 'ls/hint-rev-list-count' into maintLibravatar Junio C Hamano2-0/+2
2015-07-27Merge branch 'mm/branch-doc-updates' into maintLibravatar Junio C Hamano1-2/+6
2015-07-27Merge branch 'jc/fsck-retire-require-eoh' into maintLibravatar Junio C Hamano1-4/+13
2015-07-27Merge branch 'et/http-proxyauth' into maintLibravatar Junio C Hamano1-2/+2
2015-07-27Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintLibravatar Junio C Hamano1-0/+1
2015-07-27Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maintLibravatar Junio C Hamano2-3/+4
2015-07-27Merge branch 'kb/config-unmap-before-renaming' into maintLibravatar Junio C Hamano1-0/+3
2015-07-27Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintLibravatar Junio C Hamano2-1/+7
2015-07-27Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintLibravatar Junio C Hamano1-52/+47
2015-07-27Merge branch 'jk/fix-refresh-utime' into maintLibravatar Junio C Hamano1-1/+9
2015-07-27Merge branch 'cb/rebase-am-exit-code' into maintLibravatar Junio C Hamano1-1/+1
2015-07-27Merge branch 'jk/index-pack-reduce-recheck' into maintLibravatar Junio C Hamano3-3/+14
2015-07-15Git 2.4.6Libravatar Junio C Hamano4-3/+27
2015-07-15Merge branch 'mm/describe-doc' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintLibravatar Junio C Hamano1-0/+4