summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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-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
2015-10-16Merge branch 'mm/keyid-docs' into maintJunio C Hamano10-29/+47
2015-10-16Merge branch 'pt/pull-builtin' into maintJunio C Hamano3-3/+3
2015-10-16am, credential-cache: add angle brackets to usage stringRalf Thielow2-3/+3
2015-10-16stripspace: use parse-options for command-line parsingTobias Klauser1-26/+31
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser9-78/+88
2015-10-16pull: enclose <options> in brackets in the usage stringAlex Henrie1-1/+1
2015-10-14Documentation/gc: warn against --prune=<now>Junio C Hamano1-2/+5
2015-10-12filter-branch: remove multi-line headers in msg filterJames McCoy2-1/+15
2015-10-09am -3: do not let failed merge from completing the error codepathJunio C Hamano1-16/+33
2015-10-08test-path-utils.c: remove incorrect assumptionRay Donnelly2-2/+5
2015-10-08pack-objects: do not get distracted by broken symrefsJohannes Schindelin2-2/+8
2015-10-07quote: move comment before sq_quote_buf()Christian Couder1-5/+5
2015-10-07quote: fix broken sq_quote_buf() related commentChristian Couder1-0/+1
2015-10-07Documentation/interpret-trailers: Grammar fixTobias Klauser1-1/+1
2015-10-07clone --dissociate: avoid locking pack filesJohannes Schindelin2-2/+4
2015-10-07sha1_file.c: add a function to release all packsJohannes Schindelin2-3/+21
2015-10-07t2026: rename worktree prune testMichael J Gruber1-0/+0
2015-10-07log: Update log.follow doc and add to config.txtEric N. Vander Weele2-4/+10
2015-10-05rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2-33/+44
2015-10-05gc: demonstrate failure with stale remote HEADJohannes Schindelin1-0/+13
2015-10-05sha1_file: consolidate code to close a pack's file descriptorJohannes Schindelin1-20/+18
2015-10-05t5700: demonstrate a Windows file locking issue with `git clone --dissociate`Johannes Schindelin1-0/+21
2015-10-02merge: grammofix in please-commit-before-merge messageAlex Henrie2-2/+2
2015-10-02rebase-i: explicitly accept tab as separator in commandsMatthieu Moy1-2/+2
2015-10-02status: don't say 'HEAD detached at HEAD'Matthieu Moy2-1/+7
2015-10-02t3203: test 'detached at' after checkout --detachMatthieu Moy1-0/+13
2015-09-30am: configure gpg at startupRenee Margaret McConahy1-1/+12
2015-09-30git-send-email.perl: Fixed sending of many/huge changes/patchesStefan Agner1-1/+5
2015-09-30l10n: ru.po: update Russian translationDimitriy Ryazantcev1-1583/+1967
2015-09-28Git 2.6.1v2.6.1Junio C Hamano4-3/+22
2015-09-28Sync with v2.5.4Junio C Hamano29-30/+486
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-28Git 2.6v2.6.0Junio C Hamano2-1/+6
2015-09-28ls-remote.txt: delete unsupported optionNguyễn Thái Ngọc Duy2-3/+2
2015-09-28setup: fix "inside work tree" detection on case-insensitive filesystemsJohannes Schindelin1-1/+10
2015-09-28clone: better error when --reference is a linked checkoutNguyễn Thái Ngọc Duy1-1/+6
2015-09-28clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2-2/+9
2015-09-28enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2-2/+17
2015-09-28enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2-2/+15
2015-09-28t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy1-0/+18
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-25Documentation: fix section header mark-upJohn Keeping2-2/+2
2015-09-25t/perf: make runner work even if Git is not installedStephan Beyer1-0/+1
2015-09-25connect: fix typo in result string of prot_name()Tobias Klauser1-1/+1
2015-09-25t5561: get rid of racy appending to logfileStephan Beyer3-23/+1
2015-09-23fsck: exit with non-zero when problems are foundJunio C Hamano2-5/+35
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-22notes: correct documentation of DWIMery for notes referencesJacob Keller3-3/+12
2015-09-22git-p4: handle "Translation of file content failed"Lars Schneider2-12/+17
2015-09-22git-p4: add test case for "Translation of file content failed" errorLars Schneider1-0/+50