summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-02Git 2.11.1v2.11.1Junio C Hamano1-0/+3
2017-02-02Merge branch 'ws/request-pull-code-cleanup' into maintJunio C Hamano1-3/+0
2017-02-02Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano3-21/+35
2017-01-31Ready for 2.11.1Junio C Hamano1-0/+45
2017-01-31Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano3-22/+32
2017-01-31Merge branch 'js/mingw-isatty' into maintJunio C Hamano1-7/+4
2017-01-31Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano1-5/+32
2017-01-31Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano1-6/+8
2017-01-31Merge branch 'ad/bisect-terms' into maintJunio C Hamano1-2/+2
2017-01-31Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano1-11/+15
2017-01-31Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2-3/+9
2017-01-31Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano1-1/+1
2017-01-31Merge branch 'jk/blame-fixes' into maintJunio C Hamano3-10/+166
2017-01-31Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2-4/+25
2017-01-31Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano4-6/+45
2017-01-31Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano1-5/+15
2017-01-31Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2-8/+15
2017-01-31Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2-3/+47
2017-01-31Merge branch 'jc/compression-config' into maintJunio C Hamano9-31/+158
2017-01-31Merge branch 'ew/svn-fixes' into maintJunio C Hamano2-2/+8
2017-01-31Merge branch 'ls/travis-p4-on-macos' into maintJunio C Hamano1-10/+2
2017-01-31Merge branch 'jk/make-tags-find-sources-tweak' into maintJunio C Hamano1-3/+16
2017-01-31Merge branch 'jc/latin-1' into maintJunio C Hamano1-11/+25
2017-01-23travis-ci: fix Perforce install on macOSLars Schneider1-10/+2
2017-01-19documentation: retire unfinished documentationStefan Beller1-21/+0
2017-01-19cache.h: document add_[file_]to_indexStefan Beller1-0/+10
2017-01-19cache.h: document remove_index_entry_atStefan Beller2-1/+3
2017-01-19cache.h: document index_name_posStefan Beller1-0/+19
2017-01-18mingw: follow-up to "replace isatty() hack"Johannes Schindelin1-7/+4
2017-01-17Almost ready for 2.11.1Junio C Hamano4-3/+124
2017-01-17Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2-9/+29
2017-01-17Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano6-22/+51
2017-01-17Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano1-3/+0
2017-01-17Merge branch 'ls/filter-process' into maintJunio C Hamano4-29/+24
2017-01-17Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano1-6/+6
2017-01-17Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano1-1/+1
2017-01-17Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano1-73/+51
2017-01-17Merge branch 'jk/readme-gmane-is-no-more' into maintJunio C Hamano1-1/+1
2017-01-17Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2-2/+2
2017-01-17Merge branch 'ls/t0021-fixup' into maintJunio C Hamano1-3/+2
2017-01-17Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano1-1/+2
2017-01-17Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano1-9/+7
2017-01-17Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano5-4/+77
2017-01-17Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maintJunio C Hamano1-1/+1
2017-01-17Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2-3/+23
2017-01-17Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano1-24/+29
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2-6/+63
2017-01-17Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2-2/+15
2017-01-17Merge branch 'jt/mailinfo-fold-in-body-headers' into maintJunio C Hamano1-1/+2
2017-01-17Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano7-47/+42
2017-01-17Merge branch 'jk/parseopt-usage-msg-opt' into maintJunio C Hamano1-1/+1
2017-01-17Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano5-12/+102
2017-01-17Merge branch 'nd/shallow-fixup' into maintJunio C Hamano1-19/+20
2017-01-17Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano3-2/+61
2017-01-17Merge branch 'da/mergetool-xxdiff-hotkey' into maintJunio C Hamano1-5/+5
2017-01-17Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2-4/+35
2017-01-17Merge branch 'js/normalize-path-copy-ceil' into maintJunio C Hamano1-9/+14
2017-01-17Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano3-4/+12
2017-01-17Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2-3/+45
2017-01-17Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano8-1/+39
2017-01-17Merge branch 'jk/stash-disable-renames-internally' into maintJunio C Hamano2-1/+10
2017-01-17Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano9-28/+165
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano3-6/+21
2017-01-17Merge branch 'ls/p4-empty-file-on-lfs' into maintJunio C Hamano2-12/+19
2017-01-17Merge branch 'da/mergetool-trust-exit-code' into maintJunio C Hamano20-38/+75
2017-01-17Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano6-30/+74
2017-01-17Merge branch 'bw/push-dry-run' into maintJunio C Hamano4-9/+41
2017-01-17Merge branch 'hv/submodule-not-yet-pushed-fix' into maintJunio C Hamano3-36/+121
2017-01-17Merge branch 'dt/empty-submodule-in-merge' into maintJunio C Hamano3-11/+17
2017-01-17Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2-1/+24
2017-01-17Merge branch 'js/mingw-isatty' into maintJunio C Hamano2-86/+92
2017-01-17Merge branch 'bb/unicode-9.0' into maintJunio C Hamano6-65/+163
2017-01-17Merge branch 'ls/travis-update-p4-and-lfs' into maintJunio C Hamano1-2/+2
2017-01-17CodingGuidelines: clarify multi-line brace styleJeff King1-5/+32
2017-01-15request-pull: drop old USAGE stuffWolfram Sang1-3/+0
2017-01-13Documentation/bisect: improve on (bad|new) and (good|bad)Christian Couder1-2/+2
2017-01-11t7810: avoid assumption about invalid regex syntaxJeff King1-11/+15
2017-01-09execv_dashed_external: wait for child on signal deathJeff King3-0/+21
2017-01-09execv_dashed_external: stop exiting with negative codeJeff King1-3/+7
2017-01-09execv_dashed_external: use child_process structJeff King1-18/+7
2017-01-09git_exec_path: do not return the result of getenv()Jeff King1-9/+8
2017-01-08git_exec_path: avoid Coverity warning about unfree()d resultJohannes Schindelin1-1/+4
2017-01-07blame: output porcelain "previous" header for each fileJeff King2-9/+131
2017-01-07blame: handle --no-abbrevJeff King2-0/+6
2017-01-07blame: fix alignment with --abbrev=40Jeff King2-1/+29
2017-01-07rebase--interactive: count squash commits above 10 correctlyJeff King1-1/+1
2017-01-07branch_get_push: do not segfault when HEAD is detachedKyle Meyer2-3/+9
2017-01-07archive-zip: load userdiff configJeff King2-4/+25
2016-12-29repack: die on incremental + write-bitmap-indexDavid Turner2-5/+12
2016-12-29auto gc: don't write bitmaps for incremental repacksDavid Turner2-1/+33
2016-12-22config.abbrev: document the new default that auto-scalesJunio C Hamano2-8/+15
2016-12-22config.c: handle lock file in error case in git_config_rename_...Nguyễn Thái Ngọc Duy1-1/+3
2016-12-22mingw: replace isatty() hackJeff Hostetler1-107/+69
2016-12-22mingw: fix colourization on Cygwin pseudo terminalsAlan Davies1-2/+6
2016-12-22mingw: adjust is_console() to work with stdinJohannes Schindelin1-1/+5
2016-12-21t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt1-1/+1
2016-12-20fast-import: properly fanout notes when tree is importedMike Hommey2-3/+47
2016-12-20config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy1-2/+2
2016-12-20config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy1-2/+10
2016-12-20mailinfo.c: move side-effects outside of assertKyle J. McKay1-1/+2
2016-12-20mingw: consider that UNICODE_STRING::Length counts bytesMax Kirillov1-1/+1
2016-12-19git-p4: fix multi-path changelist empty commitsGeorge Vanburgh2-3/+23
2016-12-18git-p4: avoid crash adding symlinked directoryLuke Diamand2-6/+63
2016-12-18t0021: fix flaky testLars Schneider1-16/+1
2016-12-16index-pack: skip collision check when not in repositoryJeff King1-4/+6
2016-12-16normalize_path_copy(): fix pushing to //server/share/dir on WindowsJohannes Sixt1-9/+14
2016-12-16t: use nongit() function where applicableJeff King3-29/+5
2016-12-16index-pack: complain when --stdin is used outside of a repoJeff King2-0/+17
2016-12-16t5000: extract nongit function to test-lib-functions.shJeff King2-14/+14
2016-12-15README: replace gmane link with public-inboxJeff King1-1/+1
2016-12-14Revert "sequencer: remove useless get_dir() function"Junio C Hamano1-1/+6
2016-12-14parse-options: print "fatal:" before usage_msg_opt()Jeff King1-1/+1
2016-12-14Makefile: exclude contrib from FIND_SOURCE_FILESJeff King1-0/+2
2016-12-14Makefile: match shell scripts in FIND_SOURCE_FILESJeff King1-1/+3
2016-12-14Makefile: exclude test cruft from FIND_SOURCE_FILESJeff King1-1/+7
2016-12-14Makefile: reformat FIND_SOURCE_FILESJeff King1-3/+6
2016-12-14unicode_width.h: update the width tables to Unicode 9.0Beat Bolli1-24/+107
2016-12-14update_unicode.sh: remove the plane filterBeat Bolli1-2/+1
2016-12-14update_unicode.sh: automatically download newer definition filesBeat Bolli1-6/+2
2016-12-13update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli1-1/+2
2016-12-13update_unicode.sh: remove an unnecessary subshell levelBeat Bolli1-27/+26
2016-12-13update_unicode.sh: move it into contrib/update-unicodeBeat Bolli4-6/+26
2016-12-13t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt1-4/+10
2016-12-12t3600: slightly modernize styleStefan Beller1-73/+51
2016-12-12tmp-objdir: quote paths we add to alternatesJeff King2-1/+36
2016-12-12alternates: accept double-quoted pathsJeff King3-11/+60
2016-12-12Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2-1/+72
2016-12-12date-formats.txt: Typo fixLuis Ressel1-1/+1
2016-12-12git-svn: document useLogAuthor and addAuthorFrom config keysEric Wong1-1/+7
2016-12-12git-svn: allow "0" in SVN path componentsEric Wong1-1/+1
2016-12-11mergetools: fix xxdiff hotkeysDavid Aguilar1-5/+5
2016-12-11difftool: rename variables for consistencyDavid Aguilar1-14/+14
2016-12-11difftool: chdir as early as possibleDavid Aguilar1-12/+14
2016-12-11difftool: sanitize $workdir as early as possibleDavid Aguilar1-3/+2
2016-12-11difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2-3/+45
2016-12-11mingw: intercept isatty() to handle /dev/null as Git expects itJohannes Schindelin2-0/+36
2016-12-09doc: omit needless "for"Kristoffer Haugsbakk1-1/+1
2016-12-09doc: make the intent of sentence clearerKristoffer Haugsbakk1-1/+1
2016-12-09doc: add verb in front of command to runKristoffer Haugsbakk1-1/+1
2016-12-09doc: add articles (grammar)Kristoffer Haugsbakk1-3/+3
2016-12-09sequencer: remove useless get_dir() functionStephan Beyer1-6/+1
2016-12-09sequencer: make sequencer abort saferStephan Beyer2-1/+50
2016-12-09t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer1-0/+10
2016-12-09commit: remove 'Clever' message for --only --amendAndreas Krey1-2/+0
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates8-1/+39
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2-3/+45
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer1-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageStephan Beyer1-1/+1
2016-12-07shallow.c: remove useless codeNguyễn Thái Ngọc Duy1-4/+0
2016-12-07shallow.c: bit manipulation tweaksRasmus Villemoes1-4/+4
2016-12-07shallow.c: avoid theoretical pointer wrap-aroundRasmus Villemoes1-1/+1
2016-12-07shallow.c: make paint_alloc slightly more robustNguyễn Thái Ngọc Duy1-0/+3
2016-12-07shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsNguyễn Thái Ngọc Duy1-2/+4
2016-12-07shallow.c: rename fields in paint_info to better express their purposesNguyễn Thái Ngọc Duy1-9/+9
2016-12-06stash: prefer plumbing over git-diffJeff King2-1/+10
2016-12-06http-walker: complain about non-404 loose object errorsJeff King2-3/+6
2016-12-06Merge branch 'ew/http-walker' into jk/http-walker-limit-redirectJunio C Hamano3-31/+206
2016-12-06http: treat http-alternates like redirectsJeff King3-3/+44
2016-12-06http: make redirects more obviousJeff King6-3/+81
2016-12-06remote-curl: rename shadowed options variableJeff King1-9/+9
2016-12-06http: always update the base URL for redirectsJeff King4-4/+21
2016-12-06http: simplify update_url_from_redirectJeff King1-6/+4
2016-12-06docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider4-15/+25
2016-12-05t0021: minor filter process test cleanupLars Schneider1-3/+2
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLars Schneider2-12/+19
2016-12-05travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildLars Schneider1-2/+2
2016-12-05commit: make --only --allow-empty work without pathsAndreas Krey3-2/+12
2016-12-05t3600: remove useless redirectStefan Beller1-1/+1
2016-12-05unpack-trees: fix grammar for untracked files in directoriesStefan Beller2-2/+2
2016-12-05Sync with maint-2.10Junio C Hamano1-0/+48
2016-12-05preparing for 2.10.3Junio C Hamano2-1/+49
2016-12-05Merge branch 'jk/common-main' into maint-2.10Junio C Hamano5-11/+12
2016-12-01convert: git cherry-pick -Xrenormalize did not workTorsten Bögershausen1-6/+7
2016-12-01Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfJunio C Hamano2-43/+60
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano2-4/+35
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano5-8/+1
2016-11-29Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano4-13/+18
2016-11-29Merge branch 'nd/worktree-lock' into maintJunio C Hamano1-1/+1
2016-11-29Merge branch 'ps/common-info-doc' into maintJunio C Hamano1-1/+1
2016-11-29Merge branch 'rs/cocci' into maintJunio C Hamano1-0/+15
2016-11-29Merge branch 'nd/test-helpers' into maintJunio C Hamano2-3/+18
2016-11-29Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintJunio C Hamano1-2/+2
2016-11-29Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano1-8/+6
2016-11-29Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano1-1/+1
2016-11-29Merge branch 'ak/pre-receive-hook-template-modefix' into maintJunio C Hamano1-0/+0
2016-11-29Merge branch 'ls/macos-update' into maintJunio C Hamano2-1/+3
2016-11-29Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano1-5/+13
2016-11-29Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintJunio C Hamano1-3/+3
2016-11-29Merge branch 'jk/daemon-path-ok-check-truncation' into maintJunio C Hamano1-4/+21
2016-11-29Merge branch 'rs/ring-buffer-wraparound' into maintJunio C Hamano2-2/+4
2016-11-29Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano3-10/+42
2016-11-29Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano1-3/+4
2016-11-29Merge branch 'jc/am-read-author-file' into maintJunio C Hamano1-58/+45
2016-11-29Git 2.11v2.11.0Junio C Hamano2-1/+6
2016-11-29Merge branch 'jk/common-main'Junio C Hamano4-9/+10
2016-11-29Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2-4189/+5888
2016-11-29common-main: stop munging argv[0] pathJeff King4-9/+10
2016-11-29t7610: clean up foo.XXXXXX tmpdirJeff King1-1/+2
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar20-38/+71