summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-03-17Git 2.5.5v2.5.5Junio C Hamano4-3/+15
2016-03-17Merge branch 'maint-2.4' into maint-2.5Junio C Hamano15-147/+97
2016-03-17Git 2.4.11v2.4.11Junio C Hamano4-3/+15
2016-03-17Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano13-146/+84
2016-03-16list-objects: pass full pathname to callbacksJeff King9-58/+26
2016-03-16list-objects: drop name_path entirelyJeff King9-25/+19
2016-03-16list-objects: convert name_path to a strbufJeff King3-36/+15
2016-03-16show_object_with_name: simplify by using path_name()Jeff King1-34/+6
2016-03-16http-push: stop using name_pathJeff King1-16/+7
2016-03-16tree-diff: catch integer overflow in combine_diff_path allocationJeff King2-4/+4
2016-03-16add helpers for detecting size_t overflowJeff King1-0/+34
2015-09-28Git 2.5.4v2.5.4Junio C Hamano4-3/+22
2015-09-28Sync with 2.4.10Junio C Hamano28-29/+466
2015-09-28Git 2.4.10v2.4.10Junio C Hamano4-3/+22
2015-09-28Sync with 2.3.10Junio C Hamano27-28/+446
2015-09-28Git 2.3.10v2.3.10Junio C Hamano4-3/+22
2015-09-28Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano11-26/+57
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King1-1/+2
2015-09-28xdiff: reject files larger than ~1GBJeff King3-1/+14
2015-09-28react to errors in xdi_diffJeff King7-24/+41
2015-09-28Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano6-15/+78
2015-09-28Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano13-1/+306
2015-09-25http: limit redirection depthBlake Burkhart3-0/+8
2015-09-25http: limit redirection to protocol-whitelistBlake Burkhart4-5/+27
2015-09-25transport: refactor protocol whitelist codeJeff King2-10/+43
2015-09-23submodule: allow only certain protocols for submodule fetchesJeff King2-0/+52
2015-09-23transport: add a protocol-whitelist environment variableJeff King11-1/+254
2015-09-17Git 2.5.3v2.5.3Junio C Hamano4-3/+21
2015-09-17Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2-32/+282
2015-09-17Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano1-0/+3
2015-09-17Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano1-1/+1
2015-09-17Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano1-1/+1
2015-09-09am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexJohannes Schindelin1-1/+1
2015-09-04Git 2.5.2v2.5.2Junio C Hamano4-3/+67
2015-09-04Sync with 2.4.9Junio C Hamano8-27/+60
2015-09-04Git 2.4.9v2.4.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.3.9Junio C Hamano7-26/+49
2015-09-04Git 2.3.9v2.3.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.2.3Junio C Hamano6-25/+38
2015-09-04Git 2.2.3v2.2.3Junio C Hamano4-3/+13
2015-09-04Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano4-24/+27
2015-09-04show-branch: use a strbuf for reflog descriptionsJeff King1-2/+4
2015-09-04read_info_alternates: handle paths larger than PATH_MAXJeff King1-6/+3
2015-09-04notes: use a strbuf in add_non_noteJeff King1-9/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXJeff King1-7/+10
2015-09-03Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano1-12/+4
2015-09-03Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2-1/+30
2015-09-03Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2-3/+39
2015-09-03Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano3-5/+15
2015-09-03Merge branch 'rs/archive-zip-many' into maintJunio C Hamano2-5/+134
2015-09-03Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2-2/+2
2015-09-03Merge branch 'ss/fix-config-fd-leak' into maintJunio C Hamano1-1/+4
2015-09-03Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2-1/+1
2015-09-03Merge branch 'po/po-readme' into maintJunio C Hamano1-0/+19
2015-09-03Merge branch 'sg/t3020-typofix' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'as/docfix-reflog-expire-unreachable' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'nd/fixup-linked-gitdir' into maintJunio C Hamano1-2/+2
2015-09-03Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano4-0/+9
2015-09-03Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano5-12/+43
2015-09-03Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'sg/help-group' into maintJunio C Hamano3-52/+52
2015-09-03Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano1-4/+4
2015-09-03Merge branch 'jh/strbuf-read-use-read-in-full' into maintJunio C Hamano1-5/+5
2015-09-03Merge branch 'jk/long-error-messages' into maintJunio C Hamano3-29/+21
2015-09-03Merge branch 'cb/open-noatime-clear-errno' into maintJunio C Hamano1-1/+4
2015-09-03Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano1-8/+6
2015-08-31trailer: support multiline titleChristian Couder2-4/+25
2015-08-31t7300: fix broken && chainsErik Elfström1-12/+4
2015-08-31log: diagnose empty HEAD more clearlyJeff King2-1/+30
2015-08-31commit: don't rewrite shared index unnecessarilyDavid Turner3-5/+15
2015-08-28git-submodule: remove extraneous space from error messageAlex Henrie1-1/+1
2015-08-28Git 2.5.1v2.5.1Junio C Hamano3-2/+19
2015-08-28Mingw: verify both ends of the pipe () callJose F. Morales1-1/+1
2015-08-28archive-zip: support more than 65535 entriesRené Scharfe2-4/+91
2015-08-28archive-zip: use a local variable to store the creator versionRené Scharfe1-2/+4
2015-08-28t5004: test ZIP archives with many entriesRené Scharfe1-0/+40
2015-08-26trailer: retitle a test and correct an in-comment messageChristian Couder2-2/+3
2015-08-26git-svn doc: mention "svn-remote.<name>.include-paths"Brett Randall1-0/+3
2015-08-25Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2-1/+108
2015-08-25Merge branch 'jk/test-with-x' into maintJunio C Hamano1-2/+11
2015-08-25Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano1-2/+6
2015-08-25Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano1-1/+1
2015-08-25pull: pass upload_pack only when it was givenJunio C Hamano1-1/+1
2015-08-25generate-cmdlist: re-implement as shell scriptEric Sunshine3-52/+52
2015-08-25setup: update the right file in multiple checkoutsNguyễn Thái Ngọc Duy1-2/+2
2015-08-24rev-list: make it obvious that we do not support notesJeff King4-0/+9
2015-08-24config: silence warnings for command names with invalid keysJeff King5-12/+43
2015-08-21wt-status: move #include "pathspec.h" to the headerSZEDER Gábor2-1/+1
2015-08-21trailer: ignore first line of messageChristian Couder2-2/+16
2015-08-21Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab1-1/+1
2015-08-20t3020: fix typo in test descriptionSZEDER Gábor1-1/+1
2015-08-20ps_matched: xcalloc() takes nmemb and then element sizeJunio C Hamano2-2/+2
2015-08-19Start preparing for 2.5.1Junio C Hamano2-1/+50
2015-08-19Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano1-2/+0
2015-08-19Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano1-1/+0
2015-08-19Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2-117/+9
2015-08-19Merge branch 'nd/export-worktree' into maintJunio C Hamano2-0/+19
2015-08-19Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano1-12/+17
2015-08-19Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano3-68/+92
2015-08-19Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano1-0/+15
2015-08-19Merge branch 'cb/uname-in-untracked' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2-0/+56
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2-1/+5
2015-08-19untracked cache: fix entry invalidationNguyễn Thái Ngọc Duy2-13/+83
2015-08-19untracked-cache: fix subdirectory handlingDavid Turner2-7/+79
2015-08-19t7063: use --force-untracked-cache to speed up a bitNguyễn Thái Ngọc Duy1-1/+1
2015-08-17po/README: Update directions for l10n contributorsPhilip Oakley1-0/+19
2015-08-14config: close config file handle in case of errorSven Strickroth1-1/+4
2015-08-12git_open_noatime: return with errno=0 on successClemens Buchacher1-1/+4
2015-08-11t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt1-1/+1
2015-08-11vreportf: avoid intermediate bufferJeff King1-3/+12
2015-08-11vreportf: report to arbitrary filehandlesJeff King3-29/+12
2015-08-10strbuf_read(): skip unnecessary strbuf_grow() at eofJim Hill1-5/+5
2015-08-10clone: use computed length in guess_dir_nameJeff King2-7/+8
2015-08-10clone: add tests for output directoryJeff King1-0/+106
2015-08-07test-lib: disable trace when test is not verboseJeff King1-2/+6
2015-08-07test-lib: turn off "-x" tracing during chain-lint checkJeff King1-0/+5
2015-08-05tests: fix cleanup after tests in t1509-root-worktreePatrick Steinhardt1-1/+1
2015-08-05tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt1-4/+4
2015-08-03transport-helper: die on errors reading refs.Stefan Beller1-2/+6
2015-08-03Sync with 2.4.8Junio C Hamano3-4/+24
2015-08-03Git 2.4.8v2.4.8Junio C Hamano4-5/+25
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2-1/+26
2015-08-03Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano1-13/+6
2015-08-03Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano1-1/+1
2015-08-03Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2-8/+104
2015-08-03Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano3-7/+83
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2-5/+28
2015-07-31untracked-cache: support sparse checkoutDavid Turner2-14/+122
2015-07-31add: remove dead codeStefan Beller1-2/+0
2015-07-30pull.sh: quote $upload_pack when passing it to git-fetchMatthieu Moy1-1/+1
2015-07-29parse-options: align curly braces for all optionsStefan Beller1-1/+1
2015-07-28get_remote_group(): use skip_prefix()Michael Haggerty1-2/+1
2015-07-28get_remote_group(): eliminate superfluous call to strcspn()Michael Haggerty1-2/+2
2015-07-28get_remote_group(): rename local variable "space" to "wordlen"Michael Haggerty1-5/+5
2015-07-28get_remote_group(): handle remotes with single-character namesMichael Haggerty1-2/+1
2015-07-28Documentation/git-tools: retire manually-maintained listEric Sunshine1-81/+7
2015-07-28Documentation/git-tools: drop references to defunct toolsEric Sunshine1-31/+0
2015-07-28Documentation/git-tools: fix item text formattingEric Sunshine1-67/+67
2015-07-28Documentation/git-tools: improve discoverability of Git wikiEric Sunshine1-6/+3
2015-07-28typofix for index-format.txtThomas Ackermann1-1/+1
2015-07-27Git 2.5v2.5.0Junio C Hamano2-1/+6
2015-07-27Sync with 2.4.7Junio C Hamano2-1/+55
2015-07-27Git 2.4.7v2.4.7Junio C Hamano4-3/+57
2015-07-27Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano1-1/+4
2015-07-27Merge branch 'tb/checkout-doc' into maintJunio C Hamano1-1/+5
2015-07-27Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2-0/+2
2015-07-27Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano1-2/+6
2015-07-27Merge branch 'jc/fsck-retire-require-eoh' into maintJunio C Hamano1-4/+13
2015-07-27Merge branch 'et/http-proxyauth' into maintJunio C Hamano1-2/+2
2015-07-27Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintJunio C Hamano1-0/+1
2015-07-27Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maintJunio C Hamano2-3/+4
2015-07-27Merge branch 'kb/config-unmap-before-renaming' into maintJunio C Hamano1-0/+3
2015-07-27Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2-1/+7
2015-07-27Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano1-52/+47
2015-07-27Merge branch 'jk/fix-refresh-utime' into maintJunio C Hamano1-1/+9
2015-07-27Merge branch 'cb/rebase-am-exit-code' into maintJunio C Hamano1-1/+1
2015-07-27Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano3-3/+14
2015-07-25Documentation/git: drop outdated Cogito referenceEric Sunshine1-1/+1
2015-07-24RelNotes: am.threeWay does not exist (yet)Junio C Hamano1-2/+0
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano4-41/+2
2015-07-23contrib/subtree: ignore log.date configurationDavid Aguilar2-1/+5
2015-07-22receive-pack: crash when checking with non-exist HEADJiang Xin1-1/+1
2015-07-21builtin/send-pack.c: respect user.signingkeyJunio C Hamano1-0/+3
2015-07-21Git 2.5.0-rc3v2.5.0-rc3Junio C Hamano1-1/+1
2015-07-21unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner2-0/+56
2015-07-21Merge branch 'tf/gitweb-typofix'Junio C Hamano1-1/+1
2015-07-21Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-2680/+3179
2015-07-20l10n: ca.po: update translationAlex Henrie1-187/+204
2015-07-17untracked: fix detection of uname(2) failureCharles Bailey1-1/+1
2015-07-17Merge branch 'jk/still-interesting'Junio C Hamano1-2/+2
2015-07-17Merge branch 'es/worktree-add'Junio C Hamano2-5/+6
2015-07-17Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceEric Sunshine1-1/+1
2015-07-16worktree: caution that this is still experimentalJunio C Hamano1-2/+3
2015-07-16Documentation/git-worktree: fix stale "git checkout --to" referencesEric Sunshine1-2/+2
2015-07-16Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-199/+241
2015-07-15Sync with 2.4.6Junio C Hamano2-1/+25
2015-07-15Git 2.4.6v2.4.6Junio C Hamano4-3/+27
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-1/+6
2015-07-15Merge branch 'mm/describe-doc' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano1-0/+4
2015-07-15Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano4-29/+29
2015-07-15Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano1-1/+3
2015-07-15Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano1-14/+20
2015-07-15Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2-6/+14
2015-07-15l10n: de.po: translate 9 new messagesRalf Thielow1-199/+241
2015-07-15l10n: Updated Bulgarian translation of git (2359t,0f,0u)Alexander Shopov1-190/+208
2015-07-15rev-parse --parseopt: allow [*=?!] in argument hintsIlya Bobyr3-68/+92
2015-07-15l10n: zh_CN: for git v2.5.0 l10n round 2Jiang Xin1-199/+201
2015-07-15l10n: sv.po: Update Swedish translation (2359t0f0u)Peter Krefting1-186/+216
2015-07-15Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/gitJiang Xin1-199/+252