summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-12-22Git 2.7-rc2v2.7.0-rc2Junio C Hamano2-1/+4
2015-12-22Merge branch 'js/emu-write-epipe-on-windows'Junio C Hamano2-0/+20
2015-12-22push: don't mark options of recurse-submodules for translationRalf Thielow1-1/+1
2015-12-21Update release notes to 2.7Junio C Hamano1-2/+29
2015-12-21Merge branch 'bc/format-patch-null-from-line'Junio C Hamano7-1/+28
2015-12-21Merge branch 'jk/ident-loosen-getpwuid'Junio C Hamano3-24/+40
2015-12-21Merge branch 'jk/send-email-ssl-errors'Junio C Hamano1-0/+7
2015-12-21Merge branch 'sg/completion-no-column'Junio C Hamano1-0/+1
2015-12-21Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano7-27/+294
2015-12-21mingw: emulate write(2) that fails with a EPIPEJohannes Schindelin2-0/+20
2015-12-21Merge git://ozlabs.org/~paulus/gitkJunio C Hamano3-664/+680
2015-12-19Merge branch 'ja.po' of https://github.com/qykth-git/gitkPaul Mackerras1-356/+336
2015-12-19Merge branch 'color-fix' of https://github.com/qykth-git/gitkPaul Mackerras1-6/+6
2015-12-16Merge branch 'fr/rebase-i-continue-preserve-options'Junio C Hamano2-11/+23
2015-12-16Merge branch 'maint'Junio C Hamano1-2/+1
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-15format-patch: check that header line has expected formatbrian m. carlson1-0/+7
2015-12-15format-patch: add an option to suppress commit hashbrian m. carlson5-1/+19
2015-12-15Git 2.7-rc1v2.7.0-rc1Junio C Hamano2-8/+14
2015-12-15Sync with maintJunio C Hamano1-0/+14
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/send-email-complete-aliases'Junio C Hamano1-1/+1
2015-12-15Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano1-1/+1
2015-12-15Merge branch 'jk/prune-mtime' into maintJunio C Hamano1-2/+2
2015-12-15Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano3-17/+165
2015-12-15Merge branch 'jk/prune-mtime'Junio C Hamano1-2/+2
2015-12-14completion: fix completing unstuck email alias argumentsSZEDER Gábor1-1/+1
2015-12-14sha1_file.c: introduce a null_oid constantbrian m. carlson2-0/+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-12gitk: sv.po: Update Swedish translation (311t)Peter Krefting1-300/+314
2015-12-12gitk: Let .bleft.mid widgets 'breathe'Giuseppe Bilotta1-2/+6
2015-12-12gitk: Match ttk fonts to gitk fontsGiuseppe Bilotta1-0/+18
2015-12-11rebase -i: remember merge options beyond continue actionsFabian Ruch2-11/+23
2015-12-11completion: remove 'git column' from porcelain commandsSZEDER Gábor1-0/+1
2015-12-11Update release notes to 2.7Junio C Hamano1-65/+1
2015-12-11Merge branch 'maint'Junio C Hamano1-0/+25
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-11Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting'Junio C Hamano1-1/+3
2015-12-11Merge branch 'sb/doc-submodule-sync-recursive'Junio C Hamano1-1/+4
2015-12-11Merge branch 'cb/t3404-shellquote'Junio C Hamano1-1/+1
2015-12-11Merge branch 'sg/lock-file-commit-error'Junio C Hamano4-5/+8
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-10Git 2.7-rc0v2.7.0-rc0Junio C Hamano1-1/+1
2015-12-10Sync with maintJunio C Hamano1-0/+1
2015-12-10Update release notes to 2.7Junio C Hamano1-0/+19
2015-12-10Merge branch 'nd/doc-check-ref-format-typo'Junio C Hamano1-1/+1
2015-12-10Merge branch 'bc/object-id'Junio C Hamano88-704/+716
2015-12-10Merge branch 'dt/fsck-verify-pack-error'Junio C Hamano1-1/+1
2015-12-10Merge branch 'ls/travis-yaml'Junio C Hamano1-0/+91
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-08Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano1-4/+27
2015-12-08Merge branch 'ls/test-must-fail-sigpipe'Junio C Hamano3-20/+41
2015-12-08Merge branch 'dt/refs-backend-pre-vtable'Junio C Hamano7-3682/+3776
2015-12-08Sync with 2.6.4Junio C Hamano3-6/+21
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-04push: follow the "last one wins" convention for --recurse-submodulesMike Crowe2-9/+44
2015-12-04push: test that --recurse-submodules on command line overrides configMike Crowe1-4/+28
2015-12-04Sync with maintJunio C Hamano1-0/+48
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-04RelNotes update for 2.7Junio C Hamano1-0/+51
2015-12-04Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2-7/+31
2015-12-04Merge branch 'np/credential-cache-sighup'Junio C Hamano2-0/+10
2015-12-04Merge branch 'rs/parseopt-short-help'Junio C Hamano4-48/+23
2015-12-04Merge branch 'jk/send-email-complete-aliases'Junio C Hamano4-0/+124
2015-12-04Merge branch 'jk/filter-branch-no-index'Junio C Hamano2-2/+40
2015-12-04Merge branch 'ad/sha1-update-chunked'Junio C Hamano7-13/+69
2015-12-01Merge branch 'mk/blame-first-parent'Jeff King2-16/+21
2015-12-01Merge branch 'jk/send-email-ca-path'Jeff King1-2/+1
2015-12-01Merge branch 'rs/fsck-nul-header'Jeff King2-1/+34
2015-12-01Merge branch 'ls/p4-test-timeouts'Jeff King1-9/+62
2015-12-01Merge branch 'js/test-modernize-t9300'Jeff King1-1783/+1798
2015-12-01Merge branch 'jk/send-email-expand-paths'Jeff King1-1/+1
2015-12-01Merge branch 'dg/subtree-test-cleanup'Jeff King3-443/+956
2015-12-01Merge branch 'dt/http-range'Jeff King1-4/+4
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 'maint'Jeff King15-82/+140
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-28Add Travis CI supportLars Schneider1-0/+91
2015-11-28add "ok=sigpipe" to test_must_fail and use it to fix flaky testsLars Schneider3-6/+8
2015-11-28implement test_might_fail using a refactored test_must_failLars Schneider1-14/+33
2015-11-24Merge branch 'fp/subtree-todo-update'Jeff King1-2/+0
2015-11-24Merge branch 'rc/configure-use-libs-when-checking-a-lib'Jeff King1-1/+7
2015-11-24Merge branch 'maint'Jeff King1-0/+1
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-24send-email: die if CA path doesn't existJohn Keeping1-2/+1
2015-11-24check-ignore: correct documentation about outputDennis Kaarsemaker1-5/+5
2015-11-24blame: fix object casting regressionJeff King2-16/+21
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-20push: add recurseSubmodules config optionMike Crowe7-26/+234
2015-11-20credential-cache: new option to ignore sighupNoam Postavsky2-0/+10
2015-11-20show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe1-11/+1
2015-11-20fsck: treat a NUL in a tag header as an errorRené Scharfe2-2/+3
2015-11-20grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe1-16/+1
2015-11-20t1450: add tests for NUL in headers of commits and tagsRené Scharfe1-0/+32
2015-11-20parse-options: allow -h as a short optionRené Scharfe2-6/+11
2015-11-20parse-options: inline parse_options_usage() at its only remaining callerRené Scharfe1-12/+1
2015-11-20parse-options: deduplicate parse_options_usage() callsRené Scharfe1-6/+12
2015-11-20completion: add support for completing email aliasesJacob Keller1-0/+16
2015-11-20git-p4: add trap to kill p4d on test exitLars Schneider1-0/+9
2015-11-20modernize t9300: move test preparations into test_expect_successJohannes Sixt1-1250/+1264
2015-11-20send-email: expand path in sendemail.smtpsslcertpath configJohn Keeping1-1/+1
2015-11-20sendemail: teach git-send-email to dump alias namesJacob Keller3-0/+108
2015-11-20git-p4: add p4d timeout in testsLars Schneider1-1/+19
2015-11-20modernize t9300: mark here-doc words to ignore tab indentationJohannes Sixt1-100/+100
2015-11-20git-p4: retry kill/cleanup operations in tests with timeoutLars Schneider1-8/+34
2015-11-20modernize t9300: use test_when_finished for clean-upJohannes Sixt1-20/+16
2015-11-20modernize t9300: wrap lines after &&Johannes Sixt1-16/+32
2015-11-20modernize t9300: use test_must_be_emptyJohannes Sixt1-5/+3
2015-11-20modernize t9300: use test_must_failJohannes Sixt1-14/+3
2015-11-20modernize t9300: single-quote placement and indentationJohannes Sixt1-435/+437
2015-11-20remote: convert functions to struct object_idbrian m. carlson1-29/+29
2015-11-20Remove get_object_hash.brian m. carlson63-253/+251
2015-11-20Convert struct object to object_idbrian m. carlson54-256/+256
2015-11-20Add several uses of get_object_hash.brian m. carlson61-253/+253
2015-11-20object: introduce get_object_hash macro.brian m. carlson1-0/+2
2015-11-20ref_newer: convert to use struct object_idbrian m. carlson4-8/+8
2015-11-20push_refs_with_export: convert to struct object_idbrian m. carlson1-4/+4
2015-11-20get_remote_heads: convert to struct object_idbrian m. carlson1-10/+12
2015-11-20parse_fetch: convert to use struct object_idbrian m. carlson1-6/+6
2015-11-20add_sought_entry_mem: convert to struct object_idbrian m. carlson1-6/+8
2015-11-20Convert struct ref to use object_id.brian m. carlson18-151/+151
2015-11-20sha1_file: introduce has_object_file helper.brian m. carlson2-0/+8
2015-11-20remote-http(s): support SOCKS proxiesPat Thoyts1-0/+11
2015-11-20Merge branch 'master' of git://git.bogomips.org/git-svnJeff King1-8/+76
2015-11-20Merge branch 'lf/ref-is-hidden-namespace'Jeff King6-15/+100
2015-11-20Merge branch 'dk/gc-idx-wo-pack'Jeff King6-22/+78
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-20refs: break out ref conflict checksDavid Turner3-42/+67
2015-11-20files_log_ref_write: new functionDavid Turner2-0/+12
2015-11-20initdb: make safe_create_dir publicDavid Turner3-12/+20
2015-11-20refs: split filesystem-based refs code into a new fileMichael Haggerty3-3536/+3545
2015-11-20refs/refs-internal.h: new header fileMichael Haggerty2-165/+189
2015-11-20refname_is_safe(): improve docstringMichael Haggerty1-6/+10
2015-11-20pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()Michael Haggerty1-3/+1
2015-11-20copy_msg(): rename to copy_reflog_msg()David Turner1-2/+2
2015-11-20verify_refname_available(): new functionRonnie Sahlberg1-26/+40
2015-11-20verify_refname_available(): rename functionRonnie Sahlberg1-22/+22
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-13contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2-1/+21
2015-11-13contrib/subtree: Make each test self-containedTechlive Zheng1-418/+840
2015-11-13contrib/subtree: Add split testsTechlive Zheng1-2/+15
2015-11-13contrib/subtree: Add merge testsTechlive Zheng1-1/+12
2015-11-13contrib/subtree: Add tests for subtree addTechlive Zheng1-0/+19
2015-11-13contrib/subtree: Add test for missing subtreeTechlive Zheng1-0/+4
2015-11-13contrib/subtree: Clean and refactor test codeTechlive Zheng2-55/+79
2015-11-12gitk: Update revision date in Japanese PO fileYOKOTA Hiroshi1-1/+1