summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-10Git 2.12-rc1v2.12.0-rc1Junio C Hamano2-1/+16
2017-02-10Merge branch 'nd/rev-list-all-includes-HEAD-doc'Junio C Hamano1-2/+2
2017-02-10Merge branch 'rs/fill-directory-optim'Junio C Hamano1-4/+3
2017-02-10Merge branch 'jk/log-graph-name-only'Junio C Hamano2-0/+49
2017-02-10Merge branch 'da/t7800-cleanup'Junio C Hamano1-12/+19
2017-02-10Merge branch 'dl/difftool-doc-no-gui-option'Junio C Hamano1-2/+3
2017-02-10Merge branch 'js/difftool-builtin'Junio C Hamano2-4/+16
2017-02-10Merge branch 'rs/p5302-create-repositories-before-tests'Junio C Hamano1-0/+7
2017-02-10Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano1-2/+2
2017-02-10Merge branch 'ew/complete-svn-authorship-options'Junio C Hamano1-2/+2
2017-02-10Merge branch 'jk/reset-to-break-a-commit-doc'Junio C Hamano1-0/+38
2017-02-10Merge branch 'bw/push-submodule-only'Junio C Hamano2-7/+8
2017-02-08diff: print line prefix for --name-only outputJeff King2-0/+49
2017-02-08dir: avoid allocation in fill_directory()René Scharfe1-4/+3
2017-02-08rev-list-options.txt: update --all about HEADNguyễn Thái Ngọc Duy1-2/+2
2017-02-08t7800: replace "wc -l" with test_line_countDavid Aguilar1-12/+19
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano2-3/+45
2017-02-08t7800: simplify basic usage testDavid Aguilar1-8/+7
2017-02-08Document the --no-gui option in difftoolDenton Liu1-2/+3
2017-02-06worktree: fix option descriptions for `prune`Patrick Steinhardt1-2/+2
2017-02-06p5302: create repositories for index-pack results explicitlyRené Scharfe1-0/+7
2017-02-06completion: fix git svn authorship switchesEric Wong1-2/+2
2017-02-06difftool: fix bug when printing usageDavid Aguilar2-4/+17
2017-02-03reset: add an example of how to split a commit into twoJacob Keller1-0/+38
2017-02-03Git 2.12-rc0v2.12.0-rc0Junio C Hamano2-7/+30
2017-02-03Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano15-30/+133
2017-02-03Merge branch 'pl/complete-diff-submodule-diff'Junio C Hamano1-1/+1
2017-02-03Merge branch 'rs/object-id'Junio C Hamano7-10/+10
2017-02-03Merge branch 'js/re-running-failed-tests'Junio C Hamano1-0/+6
2017-02-03Merge branch 'sb/submodule-update-initial-runs-custom-script'Junio C Hamano2-1/+16
2017-02-03Merge branch 'sb/submodule-recursive-absorb'Junio C Hamano4-41/+105
2017-02-03Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano5-676/+702
2017-02-02Sync with v2.11.1Junio C Hamano1-0/+3
2017-02-02Ninth batch for 2.12; almost ready for -rc0Junio C Hamano1-21/+50
2017-02-02Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano6-5/+97
2017-02-02Merge branch 'ep/commit-static-buf-cleanup'Junio C Hamano1-17/+14
2017-02-02Merge branch 'bc/use-asciidoctor-opt'Junio C Hamano5-13/+88
2017-02-02Merge branch 'sg/mailmap-self'Junio C Hamano1-0/+1
2017-02-02Merge branch 'js/mingw-hooks-with-exe-suffix'Junio C Hamano1-1/+7
2017-02-02Merge branch 'rs/receive-pack-cleanup'Junio C Hamano1-2/+1
2017-02-02Merge branch 'mm/reset-facl-before-umask-test'Junio C Hamano1-0/+3
2017-02-02Merge branch 'hv/mingw-help-is-executable'Junio C Hamano1-3/+18
2017-02-02Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano1-1/+1
2017-02-02Merge branch 'rs/absolute-pathdup'Junio C Hamano6-4/+18
2017-02-02Merge branch 'js/unzip-in-usr-bin-workaround'Junio C Hamano1-1/+3
2017-02-02Merge branch 'cw/doc-sign-off'Junio C Hamano1-7/+6
2017-02-02Merge branch 'js/status-pre-rebase-i'Junio C Hamano2-4/+29
2017-02-02Merge branch 'js/retire-relink'Junio C Hamano5-206/+0
2017-02-02Merge branch 'sb/submodule-add-force'Junio C Hamano2-2/+22
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-02-02document behavior of empty color nameJeff King1-0/+3
2017-02-01doc: add note about ignoring '--no-create-reflog'Cornelius Weig2-0/+6
2017-02-01completion: add completion for --recurse-submodules=onlyCornelius Weig1-1/+1
2017-02-01doc: add doc for git-push --recurse-submodules=onlyCornelius Weig1-6/+7
2017-01-31color_parse_mem: allow empty color specJeff King4-4/+25
2017-01-31.mailmap: update Gábor Szeder's email addressSZEDER Gábor1-0/+1
2017-01-31Sync with maintJunio C Hamano1-0/+45
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-31Eighth batch for 2.12Junio C Hamano1-2/+61
2017-01-31Merge branch 'jk/fsck-connectivity-check-fix'Junio C Hamano3-40/+158
2017-01-31Merge branch 'js/difftool-builtin'Junio C Hamano6-47/+741
2017-01-31Merge branch 'rs/qsort-s'Junio C Hamano7-12/+146
2017-01-31Merge branch 'ls/travis-p4-on-macos'Junio C Hamano1-10/+2
2017-01-31Merge branch 'vp/show-ref-verify-head'Junio C Hamano2-28/+63
2017-01-31Merge branch 'sb/retire-convert-objects-from-contrib'Junio C Hamano2-358/+0
2017-01-31Merge branch 'sb/in-core-index-doc'Junio C Hamano3-22/+32
2017-01-31Merge branch 'js/remote-rename-with-half-configured-remote'Junio C Hamano5-12/+27
2017-01-31Merge branch 'jk/clear-delta-base-cache-fix'Junio C Hamano2-6/+7
2017-01-31Merge branch 'st/verify-tag'Junio C Hamano10-24/+115
2017-01-31Merge branch 'js/mingw-isatty'Junio C Hamano1-7/+4
2017-01-31Merge branch 'js/sequencer-i-countdown-3'Junio C Hamano3-97/+1030
2017-01-31Merge branch 'jk/coding-guidelines-update'Junio C Hamano1-5/+32
2017-01-31Merge branch 'jk/loose-object-fsck'Junio C Hamano4-41/+284
2017-01-31Merge branch 'js/exec-path-coverity-workaround'Junio C Hamano1-6/+8
2017-01-31Merge branch 'bw/push-submodule-only'Junio C Hamano6-19/+53
2017-01-31Merge branch 'jk/vreport-sanitize'Junio C Hamano1-10/+7
2017-01-31Documentation: implement linkgit macro for Asciidoctorbrian m. carlson2-3/+29
2017-01-31builtin/commit.c: switch to strbuf, instead of snprintf()Elia Pinto1-6/+4
2017-01-31update-ref: add test cases for bare repositoryCornelius Weig1-7/+36
2017-01-31refs: add option core.logAllRefUpdates = alwaysCornelius Weig14-20/+88
2017-01-30receive-pack: call string_list_clear() unconditionallyRené Scharfe1-2/+1
2017-01-30Completion: Add support for --submodule=diffPeter Law1-1/+1
2017-01-30checkout: convert post_checkout_hook() to struct object_idRené Scharfe1-2/+2
2017-01-30use oidcpy() for copying hashes between instances of struct object_idRené Scharfe2-3/+3
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe4-5/+5
2017-01-30t0001: don't let a default ACL interfere with the umask testMatt McCutchen1-0/+3
2017-01-30config: add markup to core.logAllRefUpdates docCornelius Weig1-3/+3
2017-01-30git-p4: fix git-p4.mapUser on WindowsGeorge Vanburgh1-1/+1
2017-01-30help: improve is_executable() on WindowsHeiko Voigt1-3/+18
2017-01-30mingw: allow hooks to be .exe filesJohannes Schindelin1-1/+7
2017-01-27doc: clarify distinction between sign-off and pgp-signingCornelius Weig1-7/+6
2017-01-27test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/Johannes Schindelin1-1/+3
2017-01-27t/Makefile: add a rule to re-run previously-failed testsJohannes Schindelin1-0/+6
2017-01-27use absolute_pathdup()René Scharfe3-4/+4
2017-01-26abspath: add absolute_pathdup()René Scharfe3-0/+14
2017-01-26status: be prepared for not-yet-started interactive rebaseJohannes Schindelin2-4/+29
2017-01-26submodule update: run custom update script for initial populating as wellStefan Beller2-1/+16
2017-01-26submodule absorbing: fix worktree/gitdir pointers recursively for non-movesStefan Beller2-16/+73
2017-01-26cache.h: expose the dying procedure for reading gitlinksStefan Beller2-22/+27
2017-01-26setup: add gentle version of resolve_git_dirStefan Beller2-3/+5
2017-01-26fsck: lazily load types under --connectivity-onlyJeff King2-51/+11
2017-01-26fsck: move typename() printing to its own functionJeff King1-9/+20
2017-01-25relink: really remove the commandJunio C Hamano2-203/+0
2017-01-25relink: retire the commandJohannes Schindelin5-3/+0
2017-01-25difftool: hack around -Wzero-length-format warningJeff King1-1/+1
2017-01-25unpack-trees: support super-prefix optionStefan Beller3-4/+49
2017-01-25t1450: use "mv -f" within loose object directoryJeff King1-1/+1
2017-01-23show-ref: remove a stale commentJunio C Hamano1-4/+0
2017-01-23log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy3-3/+63
2017-01-23Seventh batch for 2.12Junio C Hamano1-0/+15
2017-01-23Merge branch 'ws/request-pull-code-cleanup'Junio C Hamano1-3/+0
2017-01-23Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2-5/+36
2017-01-23Merge branch 'sb/cd-then-git-can-be-written-as-git-c'Junio C Hamano1-4/+1
2017-01-23Merge branch 'ad/bisect-terms'Junio C Hamano1-2/+2
2017-01-23Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano4-58/+221
2017-01-23Merge branch 'vn/diff-ihc-config'Junio C Hamano4-1/+42
2017-01-23Merge branch 'sb/submodule-init'Junio C Hamano3-7/+25
2017-01-23Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano1-1/+2
2017-01-23Merge branch 'sb/submodule-config-tests'Junio C Hamano1-2/+23
2017-01-23Merge branch 'jk/grep-e-could-be-extended-beyond-posix'Junio C Hamano1-11/+15
2017-01-23Merge branch 'bw/read-blob-data-does-not-modify-index-state'Junio C Hamano2-2/+3
2017-01-23show-ref: remove dead `if (verify)' checkVladimir Panteleev1-3/+0
2017-01-23show-ref: detect dangling refs under --verify as wellVladimir Panteleev2-8/+30
2017-01-23show-ref: move --quiet handling into show_one()Vladimir Panteleev1-5/+4
2017-01-23show-ref: allow -d to work with --verifyVladimir Panteleev2-11/+21
2017-01-23show-ref: accept HEAD with --verifyVladimir Panteleev2-1/+12
2017-01-23ref-filter: use QSORT_S in ref_array_sort()René Scharfe1-4/+2
2017-01-23string-list: use QSORT_S in string_list_sort()René Scharfe1-8/+5
2017-01-23perf: add basic sort performance testRené Scharfe2-0/+51
2017-01-23add QSORT_SRené Scharfe1-0/+5
2017-01-23compat: add qsort_s()René Scharfe3-0/+83
2017-01-23Makefile: add a knob to enable the use of Asciidoctorbrian m. carlson2-0/+18
2017-01-23Documentation: move dblatex arguments into variablebrian m. carlson1-1/+2
2017-01-23Documentation: add XSLT to fix DocBook for Texinfobrian m. carlson2-3/+30
2017-01-23Documentation: sort sources for gitman.texibrian m. carlson1-1/+1
2017-01-23Documentation: remove unneeded argument in cat-texi.perlbrian m. carlson1-2/+2
2017-01-23Documentation: modernize cat-texi.perlbrian m. carlson1-6/+9
2017-01-23Documentation: fix warning in cat-texi.perlbrian m. carlson1-1/+1
2017-01-23travis-ci: fix Perforce install on macOSLars Schneider1-10/+2
2017-01-19contrib: remove git-convert-objectsStefan Beller2-358/+0
2017-01-19remote rename: more carefully determine whether a remote is configuredJohannes Schindelin5-13/+21
2017-01-19remote rename: demonstrate a bogus "remote exists" bugJohannes Schindelin1-0/+7
2017-01-19difftool: retire the scripted versionJohannes Schindelin6-97/+47
2017-01-19difftool: implement the functionality in the builtinJohannes Schindelin1-1/+671
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-19color.c: trim leading spaces in color_parse_mem()Nguyễn Thái Ngọc Duy1-1/+6
2017-01-19color.c: fix color_parse_mem() with value_len == 0Nguyễn Thái Ngọc Duy1-0/+3
2017-01-19clear_delta_base_cache(): don't modify hashmap while iteratingJeff King2-6/+7
2017-01-18Sixth batch for 2.12Junio C Hamano1-0/+64
2017-01-18Merge branch 'sb/remove-gitview'Junio C Hamano4-1369/+9
2017-01-18Merge branch 'js/asciidoctor-tweaks'Junio C Hamano3-9/+18
2017-01-18Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano1-23/+30
2017-01-18Merge branch 'rh/mergetool-regression-fix'Junio C Hamano4-119/+186
2017-01-18Merge branch 'bw/realpath-wo-chdir'Junio C Hamano2-3/+7
2017-01-18Merge branch 'jk/execv-dashed-external'Junio C Hamano3-21/+35
2017-01-18Merge branch 'sp/cygwin-build-fixes'Junio C Hamano1-2/+2
2017-01-18Merge branch 'sb/pathspec-errors'Junio C Hamano2-2/+69
2017-01-18Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano10-26/+26
2017-01-18Merge branch 'bw/pathspec-cleanup'Junio C Hamano7-357/+388
2017-01-18Merge branch 'js/mingw-test-push-unc-path'Junio C Hamano1-0/+48
2017-01-18Merge branch 'sb/submodule-cleanup-export-git-dir-env'Junio C Hamano1-1/+2
2017-01-18Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2-3/+9
2017-01-18Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano1-1/+1
2017-01-18Merge branch 'jk/blame-fixes'Junio C Hamano3-10/+166
2017-01-18Merge branch 'jk/archive-zip-userdiff-config'Junio C Hamano2-4/+25
2017-01-18Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano4-6/+45
2017-01-18Merge branch 'ls/p4-retry-thrice'Junio C Hamano2-1/+5
2017-01-18Merge branch 'sb/submodule-rm-absorb'Junio C Hamano4-129/+107
2017-01-18Merge branch 'bw/grep-recurse-submodules'Junio C Hamano20-117/+904
2017-01-18mingw: follow-up to "replace isatty() hack"Johannes Schindelin1-7/+4
2017-01-18t/t7004-tag: Add --format specifier testsSantiago Torres1-0/+16
2017-01-18t/t7030-verify-tag: Add --format specifier testsSantiago Torres1-0/+16
2017-01-18builtin/tag: add --format argument for tag -vLukas Puehringer2-11/+28
2017-01-18Merge git://ozlabs.org/~paulus/gitkJunio C Hamano15-382/+1901
2017-01-18gitk: Remove translated message from commentsDavid Aguilar1-15/+0
2017-01-17builtin/verify-tag: add --format to verify-tagSantiago Torres2-4/+20