summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-08gitignore: document that unignoring a directory unignores everything in itJunio C Hamano1-1/+37
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-03documentation: fix some typosThomas Ackermann2-2/+2
2016-03-03t0001: fix GIT_* environment variable check under --valgrindJohannes Sixt1-11/+9
2016-03-02Documentation: reword rebase summaryStefan Beller1-1/+1
2016-03-02Mark win32's pthread_exit() as NORETURNJohannes Schindelin1-1/+1
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-28config.mak.uname: use clang for Mac OS X 10.6Torsten Bögershausen1-0/+3
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
2016-02-22harden REALLOC_ARRAY and xcalloc against size_t overflowJeff King2-1/+5
2016-02-22Sync with 2.7.2Junio C Hamano2-1/+16
2016-02-22Merge branch 'js/git-remote-add-url-insteadof-test'Junio C Hamano1-0/+5
2016-02-22Merge branch 'jk/config-include'Junio C Hamano1-1/+3
2016-02-22Merge branch 'ew/connect-verbose'Junio C Hamano1-2/+20
2016-02-22Git 2.7.2v2.7.2Junio C Hamano3-2/+17
2016-02-22Merge branch 'nd/ita-cleanup' into maintJunio C Hamano6-10/+6
2016-02-22Merge branch 'pw/completion-stash' into maintJunio C Hamano1-2/+2
2016-02-22Merge branch 'mm/clean-doc-fix' into maintJunio C Hamano1-3/+1
2016-02-22Merge branch 'dw/mergetool-vim-window-shuffle' into maintJunio C Hamano1-2/+2
2016-02-22Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano1-1/+1
2016-02-22merge-strategies.txt: fix typoFelipe Gonçalves Assis1-2/+2
2016-02-22diff: clarify textconv interfaceJeff King3-1/+24
2016-02-22Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svnJunio C Hamano4-14/+54
2016-02-22Merge branch 'pw/completion-stash'Junio C Hamano1-2/+2
2016-02-22completion: fix mis-indentation in _git_stash()SZEDER Gábor1-2/+2
2016-02-22config: rename git_config_set_or_die to git_config_setPatrick Steinhardt10-67/+67
2016-02-22config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt7-39/+40
2016-02-22compat: die when unable to set core.precomposeunicodePatrick Steinhardt1-1/+2
2016-02-22sequencer: die on config error when saving replay optsPatrick Steinhardt1-11/+11
2016-02-22init-db: die on config errors when initializing empty repoPatrick Steinhardt1-10/+10
2016-02-22clone: die on config error in cmd_clonePatrick Steinhardt1-4/+4
2016-02-22remote: die on config error when manipulating remotesPatrick Steinhardt1-27/+12
2016-02-22remote: die on config error when setting/adding branchesPatrick Steinhardt1-17/+9
2016-02-22remote: die on config error when setting URLPatrick Steinhardt2-5/+15
2016-02-22submodule--helper: die on config error when cloning modulePatrick Steinhardt1-2/+2
2016-02-22submodule: die on config error when linking modulesPatrick Steinhardt1-5/+3
2016-02-22branch: die on config error when editing branch descriptionPatrick Steinhardt1-3/+2
2016-02-22branch: die on config error when unsetting upstreamPatrick Steinhardt2-2/+9
2016-02-22branch: report errors in tracking branch setupPatrick Steinhardt3-16/+46
2016-02-22config: add '--show-origin' option to print the origin of a config valueLars Schneider3-5/+191
2016-02-22config: add 'origin_type' to config_source structLars Schneider5-18/+40
2016-02-21git.c: simplify stripping extension of a file in handle_builtin()Alexander Kuleshov2-15/+15
2016-02-22git-svn: apply "svn.pathnameencoding" before URL encodingKazutoshi Satoda2-1/+17
2016-02-22git-svn: enable "svn.pathnameencoding" on dcommitKazutoshi Satoda2-2/+24
2016-02-22git-svn: hoist out utf8 prep from t9129 to lib-git-svnEric Wong2-11/+13
2016-02-20tests: rename work-tree tests to *work-tree*Michael J Gruber3-0/+0
2016-02-19exec_cmd.c: use find_last_dir_sep() for code simplificationAlexander Kuleshov1-4/+2
2016-02-19rename git_config_from_buf to git_config_from_memLars Schneider3-4/+4
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationJeff King2-4/+4
2016-02-19add helpers for detecting size_t overflowJeff King1-0/+34
2016-02-19reflog_expire_cfg: NUL-terminate pattern fieldJeff King1-5/+3
2016-02-17ref-filter: introduce objectname_atom_parser()Karthik Nayak1-11/+24
2016-02-17ref-filter: introduce contents_atom_parser()Karthik Nayak1-29/+50
2016-02-17ref-filter: introduce remote_ref_atom_parser()Karthik Nayak1-42/+61
2016-02-17ref-filter: align: introduce long-form syntaxKarthik Nayak3-9/+63
2016-02-17ref-filter: introduce align_atom_parser()Karthik Nayak1-51/+40
2016-02-17ref-filter: introduce parse_align_position()Karthik Nayak1-6/+15
2016-02-17ref-filter: introduce color_atom_parser()Karthik Nayak1-9/+16
2016-02-17ref-filter: introduce parsing functions for each valid atomKarthik Nayak1-4/+10
2016-02-17ref-filter: introduce struct used_atomKarthik Nayak1-17/+18
2016-02-17ref-filter: bump 'used_atom' and related code to the topKarthik Nayak1-15/+15
2016-02-17ref-filter: use string_list_split over strbuf_splitJeff King1-18/+11
2016-02-17t: do not hide Git's exit code in tests using 'nul_to_q'Lars Schneider2-3/+6
2016-02-17merge-recursive: more consistent interfaceFelipe Gonçalves Assis2-5/+10
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis3-0/+14