summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-05-05Git 2.6.7v2.6.7Junio C Hamano4-3/+16
2017-05-05Merge branch 'maint-2.5' into maint-2.6Junio C Hamano4-3/+29
2017-05-05Git 2.5.6v2.5.6Junio C Hamano4-3/+16
2017-05-05Merge branch 'maint-2.4' into maint-2.5Junio C Hamano3-2/+15
2017-05-05Git 2.4.12v2.4.12Junio C Hamano4-3/+16
2017-05-05Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4Junio C Hamano1-1/+1
2017-05-05shell: disallow repo names beginning with dashJeff King1-1/+1
2016-03-17Git 2.6.6v2.6.6Junio C Hamano4-3/+15
2016-03-17Merge branch 'maint-2.5' into maint-2.6Junio C Hamano16-148/+110
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
2016-01-04Git 2.6.5v2.6.5Junio C Hamano3-2/+22
2016-01-04Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2-2/+30
2016-01-04Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2-1/+23
2016-01-04Merge branch 'jk/ident-loosen-getpwuid' into maintJunio C Hamano3-24/+40
2016-01-04Merge branch 'jk/send-email-ssl-errors' into maintJunio C Hamano1-0/+7
2016-01-04Merge branch 'sg/completion-no-column' into maintJunio C Hamano1-0/+1
2015-12-21t1401: test reflog creation for git-symbolic-refJeff King1-0/+16
2015-12-21symbolic-ref: propagate error code from create_symref()Jeff King2-1/+7
2015-12-17revision.c: propagate tag names from pending arrayJeff King2-2/+30
2015-12-16Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano1-2/+1
2015-12-16credential-store: don't pass strerror to die_errno()SZEDER Gábor1-2/+1
2015-12-15Update draft release notes to 2.6.5Junio C Hamano1-0/+14
2015-12-15Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano1-1/+1
2015-12-15Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano1-4/+27
2015-12-15Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano3-17/+165
2015-12-15Merge branch 'jk/prune-mtime' into maintJunio C Hamano1-2/+2
2015-12-14ident: fix undefined variable when NO_IPV6 is setJeff King1-1/+1
2015-12-14ident: loosen getpwuid error in non-strict modeJeff King1-8/+22
2015-12-11completion: remove 'git column' from porcelain commandsSZEDER Gábor1-0/+1
2015-12-11Prepare for 2.6.5Junio C Hamano2-1/+26
2015-12-11Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano1-1/+3
2015-12-11Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano4-5/+8
2015-12-11Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano1-1/+1
2015-12-11Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano1-1/+4
2015-12-11Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano1-1/+1
2015-12-11Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano1-16/+8
2015-12-11Merge branch 'rs/pop-commit' into maintJunio C Hamano10-92/+31
2015-12-11Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2-74/+124
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano4-16/+31
2015-12-11send-email: enable SSL level 1 debug outputJohn Keeping1-0/+7
2015-12-10ident: keep a flag for bogus default_emailJeff King1-7/+12
2015-12-10ident: make xgetpwuid_self() a static local helperJeff King3-15/+12
2015-12-10Documentation/git-update-index: add missing opts to synopsisChristian Couder1-0/+1
2015-12-10git-p4: add option to keep empty commitsLars Schneider3-17/+165
2015-12-08Git 2.6.4v2.6.4Junio C Hamano3-2/+18
2015-12-08Merge branch 'rs/status-detached-head-memcmp' into maintJunio C Hamano1-5/+4
2015-12-08Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano7-13/+69
2015-12-08Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2-7/+31
2015-12-08Merge branch 'jk/interpret-trailers-outside-a-repository' into maintJunio C Hamano1-1/+1
2015-12-08Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano3-2/+16
2015-12-07revision.c: fix possible null pointer arithmeticStefan Naewe1-1/+3
2015-12-04t3404: fix quoting of redirect for some versions of bashCharles Bailey1-1/+1
2015-12-04git-check-ref-format.txt: typo, s/avoids/avoid/Nguyễn Thái Ngọc Duy1-1/+1
2015-12-04document submodule sync --recursiveStefan Beller1-1/+4
2015-12-04Prepare for 2.6.4Junio C Hamano2-1/+49
2015-12-04Merge branch 'da/difftool' into maintJunio C Hamano2-3/+20
2015-12-04Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano6-22/+78
2015-12-01verify_pack: do not ignore return value of verification functionDavid Turner1-1/+1
2015-12-01Make error message after failing commit_lock_file() less confusingSZEDER Gábor4-5/+8
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2-35/+38
2015-12-01Merge branch 'dk/check-ignore-docs' into maintJeff King1-5/+5
2015-12-01Merge branch 'ld/p4-detached-head' into maintJeff King2-9/+36
2015-12-01Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2-1/+8
2015-12-01Merge branch 'mg/doc-word-diff-example' into maintJeff King1-0/+3
2015-12-01Merge branch 'cb/ssl-config-pathnames' into maintJeff King1-2/+2
2015-12-01Merge branch 'dk/t5813-unc-paths' into maintJeff King1-2/+2
2015-12-01Merge branch 'dk/rerere-train-quoting' into maintJeff King1-1/+1
2015-12-01Merge branch 'cb/hook-sigpipe' into maintJeff King3-20/+27
2015-12-01Merge branch 'fm/shell-path-whitespace' into maintJeff King1-1/+1
2015-12-01Merge branch 'ar/doc-env-variable-format' into maintJeff King1-6/+6
2015-12-01Merge branch 'pt/http-socks-proxy' into maintJeff King1-0/+11
2015-12-01Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maintJeff King1-1/+7
2015-11-28wt-status: correct and simplify check for detached HEADRené Scharfe1-5/+4
2015-11-28ident.c: add support for IPv6Elia Pinto1-4/+27
2015-11-24http: treat config options sslCAPath and sslCAInfo as pathsCharles Bailey1-2/+2
2015-11-24Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber1-0/+3
2015-11-24filter-branch: deal with object name vs. pathname ambiguity in tree-filterSZEDER Gábor2-1/+8
2015-11-24check-ignore: correct documentation about outputDennis Kaarsemaker1-5/+5
2015-11-24Documentation/git-update-index: add missing opts to synopsysChristian Couder1-0/+1
2015-11-24git-p4: clean up after p4 submit failureGIRARD Etienne2-35/+38
2015-11-24bash prompt: indicate dirty index even on orphan branchesSZEDER Gábor2-5/+4
2015-11-24bash prompt: remove a redundant 'git diff' optionSZEDER Gábor1-1/+1
2015-11-24bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor1-3/+28
2015-11-24git-p4: work with a detached headLuke Diamand2-8/+17
2015-11-24git-p4: add option to system() to return subshell statusLuke Diamand1-2/+4
2015-11-24git-p4: add failing test for submit from detached headLuke Diamand1-0/+16
2015-11-20remote-http(s): support SOCKS proxiesPat Thoyts1-0/+11
2015-11-20t5813: avoid creating urls that break on cygwinDennis Kaarsemaker1-2/+2
2015-11-20Escape Git's exec path in contrib/rerere-train.sh scriptDaniel Knittl-Frank1-1/+1
2015-11-16allow hooks to ignore their standard input streamClemens Buchacher3-20/+27
2015-11-13rebase-i-exec: Allow space in SHELL_PATHFredrik Medley1-1/+1
2015-11-11Documentation: make environment variable formatting more consistentАндрей Рыбак1-6/+6
2015-11-06configure.ac: use $LIBS not $CFLAGS when testing -lpthreadRainer M. Canavan1-1/+7
2015-11-05Git 2.6.3v2.6.3Junio C Hamano4-3/+115
2015-11-05Merge branch 'rs/daemon-plug-child-leak' into maintJunio C Hamano4-6/+18
2015-11-05Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2-35/+43
2015-11-05Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maintJunio C Hamano1-1/+1
2015-11-05Merge branch 'js/misc-fixes' into maintJunio C Hamano5-6/+12
2015-11-05Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano3-7/+4
2015-11-05Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano5-89/+144
2015-11-05Merge branch 'js/imap-send-curl-compilation-fix' into maintJunio C Hamano1-0/+4
2015-11-05Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2-6/+34
2015-11-05Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano4-8/+66
2015-11-05Merge branch 'sa/send-email-smtp-batch-data-limit' into maintJunio C Hamano1-1/+5
2015-11-05sha1: allow limiting the size of the data passed to SHA1_Update()Atousa Pahlevan Duprat5-0/+44
2015-11-05sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat3-13/+25
2015-11-04Merge branch 'xf/user-manual-ff' into maintJunio C Hamano1-5/+5
2015-11-04Merge branch 'xf/user-manual-markup' into maintJunio C Hamano11-11/+11
2015-11-04Merge branch 'jc/everyday-markup' into maintJunio C Hamano1-1/+1
2015-11-04Merge branch 'jc/em-dash-in-doc' into maintJunio C Hamano6-6/+6
2015-11-04Merge branch 'es/worktree-add' into maintJunio C Hamano1-1/+1
2015-11-04gc: remove garbage .idx files from pack dirDoug Kelly2-1/+22
2015-11-04t5304: test cleaning pack garbageDoug Kelly1-0/+21
2015-11-03Merge branch 'mk/blame-error-message' into maintJunio C Hamano1-1/+1
2015-11-03Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano3-1/+38
2015-11-03Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano4-60/+35
2015-11-03Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano1-16/+33
2015-11-03Merge branch 'jc/usage-stdin' into maintJunio C Hamano25-41/+64
2015-11-03Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2-3/+3
2015-11-03Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano1-1/+3
2015-11-03Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano5-17/+42
2015-11-03Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano1-1/+55
2015-11-03Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2-11/+66
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2-0/+24
2015-11-03Merge branch 'js/clone-dissociate' into maintJunio C Hamano4-23/+62
2015-11-03Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2-8/+62
2015-11-03Merge branch 'tk/stripspace' into maintJunio C Hamano9-103/+118
2015-11-03Merge branch 'jk/repository-extension' into maintJunio C Hamano8-12/+209
2015-11-02daemon: plug memory leakRené Scharfe1-0/+1
2015-11-02run-command: factor out child_process_clear()René Scharfe3-6/+17
2015-11-01show-branch: use argv_array for default argumentsRené Scharfe1-16/+8
2015-11-01wt-status: use skip_prefix() to get rid of magic string length constantsRené Scharfe1-21/+15
2015-11-01wt-status: don't skip a magical number of characters blindlyRené Scharfe1-1/+1
2015-11-01wt-status: avoid building bogus branch name with detached HEADRené Scharfe2-7/+10
2015-11-01wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe1-8/+5
2015-11-01t7060: add test for status --branch on a detached HEADRené Scharfe1-0/+14
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar2-3/+20
2015-10-29merge-file: clamp exit code to maximum 127Jeff King3-1/+38
2015-10-28rebase-i: work around Windows CRLF line endingsJunio C Hamano2-1/+13
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin1-0/+12
2015-10-28add_submodule_odb: initialize alt_odb list earlierJeff King1-1/+1
2015-10-26merge: detect delete/modechange conflictJeff King3-2/+37
2015-10-26t6031: generalize for recursive and resolve strategiesJeff King2-56/+77
2015-10-26t6031: move triple-rename test to t3030Jeff King2-31/+30
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe10-92/+31
2015-10-26Correct fscanf formatting string for I64u valuesWaldek Maleska2-1/+5
2015-10-26Silence GCC's "cast of pointer to integer of a different size" warningJohannes Schindelin3-4/+6
2015-10-26Squelch warning about an integer overflowJohannes Schindelin1-1/+1
2015-10-26imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availableJohannes Schindelin1-0/+4
2015-10-26blame: fix option name in error messageMax Kirillov1-1/+1
2015-10-26user-manual: fix the description of fast-forwardXue Fuqiao1-5/+5
2015-10-24add: simplify -u/-A without pathspecJunio C Hamano3-7/+4
2015-10-22Documentation: AsciiDoc spells em-dash as double-dashes, not tripleJunio C Hamano6-6/+6
2015-10-22Documentation: match undefline with the text in old release notesJunio C Hamano5-5/+5
2015-10-22Documentation: match underline with the textJunio C Hamano5-5/+5
2015-10-22Documentation/everyday: match undefline with the textJunio C Hamano1-1/+1
2015-10-22Documentation: fix header markupXue Fuqiao1-1/+1
2015-10-21name-hash: don't reuse cache_entry in dir_entryDavid Turner4-60/+35
2015-10-21configure.ac: detect ssl need with libcurlRemi Pommarel1-0/+10
2015-10-21Makefile: make curl-config path configurableRemi Pommarel2-2/+19
2015-10-21Makefile: link libcurl before zlibRemi Pommarel1-4/+5
2015-10-20Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2-1/+20
2015-10-20Merge branch 'rd/test-path-utils' into maintJunio C Hamano2-2/+5
2015-10-20Merge branch 'jc/doc-gc-prune-now' into maintJunio C Hamano1-2/+5
2015-10-20Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2-1/+15
2015-10-19t7063: fix flaky untracked-cache testDavid Turner1-1/+3
2015-10-18Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-1583/+1967
2015-10-18worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma1-1/+1
2015-10-16usage: do not insist that standard input must come from a fileJunio C Hamano25-41/+64
2015-10-16Git 2.6.2v2.6.2Junio C Hamano4-3/+69
2015-10-16Merge branch 'cc/quote-comments' into maintJunio C Hamano1-5/+6
2015-10-16Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano1-0/+0
2015-10-16Merge branch 'tk/doc-interpret-trailers-grammo' into maintJunio C Hamano1-1/+1
2015-10-16Merge branch 'tk/typofix-connect-unknown-proto-error' into maintJunio C Hamano1-1/+1
2015-10-16Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maintJunio C Hamano2-2/+2
2015-10-16Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2-3/+2
2015-10-16Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2-5/+35
2015-10-16Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano3-23/+1
2015-10-16Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano1-0/+1
2015-10-16Merge branch 'js/icase-wt-detection' into maintJunio C Hamano1-1/+10
2015-10-16Merge branch 'pt/am-builtin' into maintJunio C Hamano1-1/+12
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2-0/+19
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2-35/+46
2015-10-16Merge branch 'dt/log-follow-config' into maintJunio C Hamano2-4/+10
2015-10-16Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maintJunio C Hamano3-14/+34
2015-10-16Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano3-3/+12
2015-10-16Merge branch 'jk/make-findstring-makeflags-fix' into maintJunio C Hamano1-2/+2
2015-10-16Merge branch 'jw/make-arflags-customizable' into maintJunio C Hamano1-3/+6
2015-10-16Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2-10/+49
2015-10-16Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2-1/+14