summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-03-16Git 2.8-rc3v2.8.0-rc3Junio C Hamano2-1/+18
2016-03-16Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2-6/+14
2016-03-16Sync with maintJunio C Hamano0-0/+0
2016-03-16Merge branch 'jc/sane-grep'Junio C Hamano5-4/+17
2016-03-16Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano3-5/+6
2016-03-16git-svn: fix URL canonicalization during init w/ SVN 1.7+Eric Wong2-7/+9
2016-03-16Merge branch 'jk/path-name-safety-2.7' into maintJunio C Hamano10-142/+46
2016-03-16t9117: test specifying full url to git svn init -TAdam Dinwoodie1-0/+6
2016-03-16Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7Junio C Hamano10-142/+46
2016-03-16Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6Junio C Hamano13-146/+84
2016-03-16Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5Junio 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
2016-03-15RelNotes for 2.8.0: typofixJunio C Hamano1-14/+10
2016-03-15Merge branch 'svn-glob' of git://bogomips.org/git-svnJunio C Hamano5-13/+258
2016-03-15Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-11003/+12830
2016-03-16l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin1-2/+6
2016-03-16l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin1-1/+5
2016-03-16Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin9-11003/+12822
2016-03-16l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin1-20/+121
2016-03-15git-svn: shorten glob error messageEric Wong4-11/+18
2016-03-15git-svn: loosen config globs limitationsVictor Leschuk3-5/+243
2016-03-14l10n: fr.po v2.8.0 round 2Jean-Noel Avila1-31/+134
2016-03-14Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano1-2/+2
2016-03-14wt-status: allow "ahead " to be picked up by l10nMichael J Gruber1-2/+2
2016-03-13Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-24/+121
2016-03-13l10n: ru.po: update Russian translationDimitriy Ryazantcev1-24/+121
2016-03-13l10n: ko: Update Korean translationChangwoo Ryu1-17/+118
2016-03-12l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin1-14/+111
2016-03-12Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin9-10936/+12256
2016-03-12l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin1-1353/+1527
2016-03-10rebase-i: clarify "is this commit relevant?" testJunio C Hamano1-1/+2
2016-03-10sane_grep: pass "-a" if grep accepts itJunio C Hamano4-3/+15
2016-03-10Git 2.8-rc2v2.8.0-rc2Junio C Hamano2-5/+6
2016-03-10Sync with 2.7.3Junio C Hamano2-1/+64
2016-03-10Git 2.7.3v2.7.3Junio C Hamano4-3/+66
2016-03-10Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano1-1/+1
2016-03-10Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano1-0/+12
2016-03-10Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano1-2/+7
2016-03-10Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2-15/+15
2016-03-10Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano1-4/+2
2016-03-10Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano4-0/+207
2016-03-10Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2-0/+14
2016-03-10Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2-8/+27
2016-03-10Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2-13/+17
2016-03-10Merge branch 'mm/push-simple-doc' into maintJunio C Hamano1-0/+7
2016-03-10Merge branch 'jk/tighten-alloc' into maintJunio C Hamano91-482/+441
2016-03-10Merge branch 'jk/more-comments-on-textconv' into maintJunio C Hamano3-1/+24
2016-03-10Merge branch 'jk/no-diff-emit-common' into maintJunio C Hamano4-57/+3
2016-03-10Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano3-9/+15
2016-03-10Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2-1/+12
2016-03-10Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano5-33/+54
2016-03-10Merge branch 'jk/epipe-in-async' into maintJunio C Hamano6-3/+25
2016-03-10Merge branch 'ps/config-error' into maintJunio C Hamano13-105/+159
2016-03-10Merge branch 'mg/work-tree-tests' into maintJunio C Hamano3-0/+0
2016-03-10Merge branch 'sp/remote-curl-ssl-strerror' into maintJunio C Hamano1-2/+14
2016-03-10Merge branch 'jx/http-no-proxy'Junio C Hamano1-0/+6
2016-03-10Merge branch 'jc/exclusion-doc'Junio C Hamano1-1/+37
2016-03-10Merge branch 'js/close-packs-before-gc'Junio C Hamano1-4/+6
2016-03-10Merge branch 'sb/rebase-summary'Junio C Hamano1-1/+1
2016-03-09Disown ssh+git and git+sshCarlos Martín Nieto3-5/+6
2016-03-08gitignore: document that unignoring a directory unignores everything in itJunio C Hamano1-1/+37
2016-03-05l10n: de.po: translate 48 new messagesRalf Thielow1-1360/+1545
2016-03-05l10n: de.po: translate "command" as "Befehl"Ralf Thielow1-40/+40
2016-03-05l10n: de.po: fix interactive rebase messageRalf Thielow1-2/+2
2016-03-05l10n: de.po: add space to abbreviation "z. B."Ralf Thielow1-3/+3
2016-03-05l10n: de.po: fix typoChristoph Hoopmann1-1/+1
2016-03-05l10n: TEAMS: update Ralf Thielow's email addressRalf Thielow1-1/+1
2016-03-05Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-1358/+1537
2016-03-05Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin1-1402/+1583
2016-03-04Git 2.8-rc1v2.8.0-rc1Junio C Hamano2-1/+13
2016-03-04Merge branch 'nd/clear-gitenv-upon-use-of-alias'Junio C Hamano1-11/+9
2016-03-04Merge branch 'js/pthread-exit-emu-windows'Junio C Hamano1-1/+1
2016-03-04Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano4-32/+9
2016-03-04Merge branch 'jk/tighten-alloc'Junio C Hamano1-1/+1
2016-03-04Merge branch 'nd/i18n-2.8.0'Junio C Hamano4-21/+21
2016-03-04Merge branch 'tb/avoid-gcc-on-darwin-10-6'Junio C Hamano1-0/+3
2016-03-04Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano4-0/+207
2016-03-04Merge branch 'mg/httpd-tests-update-for-apache-2.4'Junio C Hamano1-0/+3
2016-03-04t5510: do not leave changed cwdMichael J Gruber1-4/+6
2016-03-04Merge branch 'js/mingw-tests'Junio C Hamano1-1/+7
2016-03-04t9700: fix test for perl older than 5.14Jeff King1-1/+7
2016-03-04l10n: sv.po: Update Swedish translation (2509t0f0u)Peter Krefting1-1355/+1534
2016-03-04l10n: sv.po: Fix inconsistent translation of "progress meter"Peter Krefting1-4/+4
2016-03-03documentation: fix some typosThomas Ackermann2-2/+2
2016-03-03t0001: fix GIT_* environment variable check under --valgrindJohannes Sixt1-11/+9
2016-03-03l10n: ko.po: Update Korean translationChangwoo Ryu1-1402/+1583
2016-03-02Documentation: reword rebase summaryStefan Beller1-1/+1
2016-03-02Mark win32's pthread_exit() as NORETURNJohannes Schindelin1-1/+1
2016-03-02l10n: ru.po: update Russian translationDimitriy Ryazantcev1-1380/+1503
2016-03-01run-command: do not pass child process data into callbacksStefan Beller4-32/+9
2016-02-29trailer.c: mark strings for translationNguyễn Thái Ngọc Duy1-1/+1
2016-02-29ref-filter.c: mark strings for translationNguyễn Thái Ngọc Duy1-14/+14
2016-02-29builtin/clone.c: mark strings for translationNguyễn Thái Ngọc Duy1-5/+5
2016-02-29builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy1-1/+1
2016-02-29http: honor no_http env variable to bypass proxyJiang Xin1-0/+6
2016-02-29compat/mingw: brown paper bag fix for 50a6c8eJeff King1-1/+1
2016-02-29Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-1356/+1538
2016-02-29l10n: vi.po (2509t): Updated Vietnamese translationTran Ngoc Quan1-1356/+1538
2016-02-28config.mak.uname: use clang for Mac OS X 10.6Torsten Bögershausen1-0/+3
2016-02-28l10n: fr.po v2.8.0 round 1 2509tJean-Noel Avila1-1361/+1535
2016-02-28l10n: fr.po: Correct case in sentenceAudric Schiltknecht1-1/+1
2016-02-28l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)Jiang Xin1-1320/+1442
2016-02-27sha1_file.c: mark strings for translationNguyễn Thái Ngọc Duy1-3/+3
2016-02-26Git 2.8-rc0v2.8.0-rc0Junio C Hamano2-1/+96
2016-02-26Merge branch 'mm/readme-markdown'Junio C Hamano2-26/+32
2016-02-26Merge branch 'ma/update-hooks-sample-typofix'Junio C Hamano1-1/+1
2016-02-26Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano3-1/+18
2016-02-26Merge branch 'dt/initial-ref-xn-commit-doc'Junio C Hamano1-0/+12
2016-02-26Merge branch 'js/config-set-in-non-repository'Junio C Hamano2-0/+14
2016-02-26Merge branch 'jk/epipe-in-async'Junio C Hamano6-3/+25
2016-02-26Merge branch 'mm/push-default-warning'Junio C Hamano1-34/+0
2016-02-26Merge branch 'fa/merge-recursive-no-rename'Junio C Hamano5-4/+337
2016-02-26Merge branch 'sb/submodule-fetch-nontip'Junio C Hamano1-3/+26
2016-02-26Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2-8/+27
2016-02-26Merge branch 'tb/conversion'Junio C Hamano2-232/+272
2016-02-26Merge branch 'jk/grep-binary-workaround-in-test'Junio C Hamano2-13/+17
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano1-2/+7
2016-02-26Merge branch 'mm/push-simple-doc'Junio C Hamano1-0/+7
2016-02-26Merge branch 'jg/credential-cache-chdir-to-sockdir'Junio C Hamano2-15/+25
2016-02-26Merge branch 'ps/config-error'Junio C Hamano13-105/+159
2016-02-26Merge branch 'mg/work-tree-tests'Junio C Hamano3-0/+0
2016-02-26Merge branch 'ls/config-origin'Junio C Hamano8-26/+237
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano91-482/+441
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano3-1/+24
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano4-57/+3
2016-02-26Merge branch 'ak/git-strip-extension-from-dashed-command'Junio C Hamano2-15/+15
2016-02-26Merge branch 'ak/extract-argv0-last-dir-sep'Junio C Hamano1-4/+2
2016-02-26Merge branch 'kn/ref-filter-atom-parsing'Junio C Hamano3-192/+304
2016-02-26Merge branch 'tg/git-remote'Junio C Hamano5-65/+81
2016-02-25t/lib-httpd: load mod_unixdMichael J Gruber1-0/+3
2016-02-25t5504: handle expected output from SIGPIPE deathJeff King1-1/+4
2016-02-25test_must_fail: report number of unexpected signalJeff King1-1/+1
2016-02-25fetch-pack: ignore SIGPIPE in sideband demuxerJeff King1-1/+5
2016-02-25write_or_die: handle EPIPE in async threadsJeff King3-0/+15
2016-02-25add DEVELOPER makefile knob to check for acknowledged warningsLars Schneider3-1/+18
2016-02-25refs: document transaction semanticsDavid Turner1-0/+12
2016-02-25use_pack: handle signed off_t overflowJeff King2-1/+3
2016-02-25nth_packed_object_offset: bounds-check extended offsetJeff King4-1/+27
2016-02-25t5313: test bounds-checks of corrupted/malicious pack/idx filesJeff King1-0/+179
2016-02-25git config: report when trying to modify a non-existing repo configJohannes Schindelin2-0/+14
2016-02-25push: remove "push.default is unset" warning messageMatthieu Moy1-34/+0
2016-02-25README.md: move down historical explanation about the nameMatthieu Moy1-11/+13
2016-02-25README.md: don't call git stupid in the titleMatthieu Moy1-2/+2
2016-02-25README.md: move the link to git-scm.com upMatthieu Moy1-3/+3
2016-02-25README.md: add hyperlinks on filenamesMatthieu Moy1-6/+13
2016-02-25README: use markdown syntaxMatthieu Moy2-6/+3
2016-02-25templates/hooks: fix minor typo in the sample update-hookMartin Amdisen1-1/+1
2016-02-24submodule: try harder to fetch needed sha1 by direct fetching sha1Stefan Beller1-3/+26
2016-02-24t3034: test deprecated interfaceFelipe Gonçalves Assis1-0/+46
2016-02-24t3034: test option to disable renamesFelipe Gonçalves Assis1-0/+28
2016-02-24t3034: add rename threshold testsFelipe Gonçalves Assis2-1/+239
2016-02-24submodule helper list: respect correct path prefixStefan Beller2-8/+27
2016-02-24Eighth batch for 2.8Junio C Hamano1-36/+41
2016-02-24Merge branch 'jc/am-i-v-fix'Junio C Hamano3-9/+15
2016-02-24Merge branch 'nd/worktree-add-B'Junio C Hamano2-4/+26
2016-02-24Merge branch 'nd/exclusion-regression-fix'Junio C Hamano7-12/+378
2016-02-24Merge branch 'ce/https-public-key-pinning'Junio C Hamano2-0/+24
2016-02-24Merge branch 'bc/http-empty-auth'Junio C Hamano2-2/+17
2016-02-24Merge branch 'sp/remote-curl-ssl-strerror'Junio C Hamano1-2/+14
2016-02-24Merge branch 'jk/lose-name-path'Junio C Hamano10-142/+46
2016-02-24Merge branch 'ew/force-ipv4'Junio C Hamano13-0/+95
2016-02-24Merge branch 'nd/git-common-dir-fix'Junio C Hamano2-1/+12
2016-02-24Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano5-33/+54
2016-02-24merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis1-1/+3
2016-02-23t9200: avoid grep on non-ASCII dataJohn Keeping1-1/+1
2016-02-23t8005: avoid grep on non-ASCII dataJohn Keeping1-12/+16
2016-02-23credential-cache--daemon: change to the socket dir on startupJon Griffiths1-0/+9
2016-02-23Documentation/git-push: document that 'simple' is the defaultMatthieu Moy1-0/+7
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt1-2/+7
2016-02-23credential-cache--daemon: disallow relative socket pathJon Griffiths2-1/+4
2016-02-23credential-cache--daemon: refactor check_socket_directoryJon Griffiths1-15/+13
2016-02-23tests: remove no-op full-svn-test targetEric Wong1-6/+0
2016-02-23convert.c: correct attr_action()Torsten Bögershausen2-16/+35
2016-02-22xdiff: drop XDL_EMIT_COMMONJeff King2-19/+0
2016-02-22merge-tree: drop generate_common strategyJeff King1-36/+2
2016-02-22merge-one-file: use empty blob for add/add baseJeff King1-2/+1
2016-02-22ewah: convert to REALLOC_ARRAY, etcJeff King3-19/+8
2016-02-22convert ewah/bitmap code to use xmallocJeff King4-30/+11
2016-02-22diff_populate_gitlink: use a strbufJeff King1-8/+8
2016-02-22transport_anonymize_url: use xstrfmtJeff King1-5/+3
2016-02-22git-compat-util: drop mempcpy compat codeJeff King1-9/+0
2016-02-22sequencer: simplify memory allocation of get_messageJeff King1-19/+10
2016-02-22test-path-utils: fix normalize_path_copy output buffer sizeJeff King1-11/+4
2016-02-22fetch-pack: simplify add_sought_entryJeff King1-18/+9
2016-02-22fast-import: simplify allocation in start_packfileJeff King1-4/+1
2016-02-22write_untracked_extension: use FLEX_ALLOC helperJeff King1-5/+4
2016-02-22prepare_{git,shell}_cmd: use argv_arrayJeff King3-53/+39
2016-02-22use st_add and st_mult for allocation size computationJeff King25-53/+56
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King17-82/+35
2016-02-22use xmallocz to avoid size arithmeticJeff King15-25/+17
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King34-64/+75
2016-02-22convert manual allocations to argv_arrayJeff King7-76/+43
2016-02-22argv-array: add detach functionJeff King3-0/+19
2016-02-22add helpers for allocating flex-array structsJeff King1-0/+62