summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-01-05Git 2.16-rc1v2.16.0-rc1Junio C Hamano2-1/+12
2018-01-05Merge branch 'js/sequencer-cleanups'Junio C Hamano2-13/+20
2018-01-05Merge branch 'jh/memihash-opt'Junio C Hamano1-1/+1
2018-01-05Merge branch 'tb/test-lint-wc-l'Junio C Hamano1-0/+1
2018-01-05Merge branch 'rs/use-argv-array-in-child-process'Junio C Hamano2-27/+12
2018-01-05Merge branch 'ld/p4-multiple-shelves'Junio C Hamano3-26/+47
2018-01-05Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Junio C Hamano1-1/+1
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano5-42/+70
2018-01-05Merge branch 'db/doc-config-section-names-with-bs'Junio C Hamano1-5/+7
2018-01-05Merge branch 'jk/test-suite-tracing'Junio C Hamano4-18/+48
2017-12-28Git 2.16-rc0v2.16.0-rc0Junio C Hamano2-1/+32
2017-12-28Merge branch 'sb/describe-blob'Junio C Hamano8-52/+277
2017-12-28Merge branch 'hi/merge-verify-sig-config'Junio C Hamano4-0/+132
2017-12-28Merge branch 'ws/curl-http-proxy-over-https'Junio C Hamano1-0/+5
2017-12-28Merge branch 'ks/doc-previous-checkout'Junio C Hamano1-7/+12
2017-12-28Merge branch 'ks/rebase-error-messages'Junio C Hamano1-10/+25
2017-12-28Merge branch 'sr/http-sslverify-config-doc'Junio C Hamano1-2/+2
2017-12-28Merge branch 'nm/imap-send-quote-server-folder-name'Junio C Hamano1-1/+7
2017-12-28Merge branch 'bp/fsmonitor'Junio C Hamano1-2/+1
2017-12-28Merge branch 'jh/partial-clone-doc'Junio C Hamano1-0/+324
2017-12-28Merge branch 'jt/transport-hide-vtable'Junio C Hamano6-93/+120
2017-12-28Merge branch 'js/enhanced-version-info'Junio C Hamano4-1/+20
2017-12-28Merge branch 'tz/lib-git-svn-svnserve-tests'Junio C Hamano1-11/+13
2017-12-28Merge branch 'ew/svn-crlf'Junio C Hamano2-0/+28
2017-12-28Merge branch 'cc/skip-to-optional-val'Junio C Hamano5-90/+126
2017-12-28Merge branch 'ra/prompt-eread-fix'Junio C Hamano1-3/+4
2017-12-28Merge branch 'bw/path-doc'Junio C Hamano1-21/+112
2017-12-27sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin1-1/+4
2017-12-27sequencer: report when noop has an argumentJohannes Schindelin1-4/+9
2017-12-27sequencer: remove superfluous conditionalJohannes Schindelin1-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesJohannes Schindelin1-4/+4
2017-12-27rebase: do not continue when the todo list generation failedJohannes Schindelin1-1/+2
2017-12-27RelNotes: the eleventh batchJunio C Hamano1-0/+41
2017-12-27Merge branch 'rb/quick-install-doc'Junio C Hamano2-6/+8
2017-12-27Merge branch 'jt/transport-no-more-rsync'Junio C Hamano2-9/+1
2017-12-27Merge branch 'sg/travis-fixes'Junio C Hamano3-29/+39
2017-12-27Merge branch 'sb/test-helper-excludes'Junio C Hamano1-41/+5
2017-12-27Merge branch 'ot/pretty'Junio C Hamano6-84/+136
2017-12-27Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano5-23/+31
2017-12-27Merge branch 'es/clone-shared-worktree'Junio C Hamano2-1/+8
2017-12-27Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano1-5/+7
2017-12-27Merge branch 'rs/fmt-merge-msg-leakfix'Junio C Hamano1-2/+5
2017-12-27Merge branch 'jt/decorate-api'Junio C Hamano8-25/+146
2017-12-27Merge branch 'jk/cvsimport-quoting'Junio C Hamano1-1/+1
2017-12-27Merge branch 'db/doc-workflows-neuter-the-maintainer'Junio C Hamano1-2/+2
2017-12-27Merge branch 'ks/branch-cleanup'Junio C Hamano4-11/+24
2017-12-27Merge branch 'rs/strbuf-read-once-reset-length'Junio C Hamano1-0/+3
2017-12-27Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano1-1/+2
2017-12-27Merge branch 'rs/am-builtin-leakfix'Junio C Hamano1-3/+7
2017-12-27Merge branch 'es/worktree-checkout-hook'Junio C Hamano3-7/+47
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano8-126/+186
2017-12-27Merge branch 'tb/check-crlf-for-safe-crlf'Junio C Hamano2-10/+86
2017-12-27Merge branch 'jh/object-filtering'Junio C Hamano20-53/+1735
2017-12-27sequencer.c: drop 'const' from function return typeJunio C Hamano1-1/+1
2017-12-22strbuf: fix urlencode format string on signed charJulien Dusser1-1/+1
2017-12-22send-pack: use internal argv_array of struct child_processRené Scharfe1-19/+9
2017-12-22http: use internal argv_array of struct child_processRené Scharfe1-8/+3
2017-12-22git-p4: update multiple shelved change listsLuke Diamand3-26/+47
2017-12-22check-non-portable-shell.pl: `wc -l` may have leading WSTorsten Bögershausen1-0/+1
2017-12-22config.txt: document behavior of backslashes in subsectionsDave Borowitz1-5/+7
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano5-42/+70
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2-1/+8
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren3-37/+42
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren1-5/+21
2017-12-22t/helper/test-lazy-name-hash: fix compilationStefan Beller1-1/+1
2017-12-19t5573, t7612: clean up after unexpected success of 'pull' and 'merge'Junio C Hamano2-8/+17
2017-12-19RelNotes: the tenth batchJunio C Hamano1-0/+46
2017-12-19Merge branch 'ls/editor-waiting-message'Junio C Hamano7-7/+41
2017-12-19Merge branch 'sg/setup-doc-update'Junio C Hamano1-1/+1
2017-12-19Merge branch 'ar/unconfuse-three-dots'Junio C Hamano25-24/+458
2017-12-19Merge branch 'tg/worktree-create-tracking'Junio C Hamano8-51/+277
2017-12-19Merge branch 'gk/tracing-optimization'Junio C Hamano2-40/+48
2017-12-19Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2-0/+19
2017-12-19Merge branch 'sb/clone-recursive-submodule-doc'Junio C Hamano1-8/+11
2017-12-19Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano1-3/+9
2017-12-19Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano4-2/+24
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano6-7/+169
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano1-1/+1
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano6-27/+44
2017-12-19builtin/describe.c: describe a blobStefan Beller3-7/+107
2017-12-19http: support CURLPROXY_HTTPSWei Shuyu1-0/+5
2017-12-19rebase: rebasing can also be done when HEAD is detachedKaartic Sivaraam1-2/+14
2017-12-19rebase: distinguish user input by quoting itKaartic Sivaraam1-2/+2
2017-12-19rebase: consistently use branch_name variableKaartic Sivaraam1-7/+10
2017-12-19Doc/check-ref-format: clarify information about @{-N} syntaxKaartic Sivaraam1-7/+12
2017-12-18config: document default value of http.sslVerifySimon Ruderich1-2/+2
2017-12-18p7519: improve check for prerequisite WATCHMANRené Scharfe1-2/+1
2017-12-18imap-send: URI encode server folderNicolas Morey-Chaisemartin1-1/+7
2017-12-14version --build-options: report commit, too, if possibleJohannes Schindelin4-1/+10
2017-12-14version --build-options: also report host CPUEric Sunshine2-0/+10
2017-12-14transport: make transport vtable more privateJonathan Tan4-87/+120
2017-12-14clone, fetch: remove redundant transport checkJonathan Tan2-6/+0
2017-12-14partial-clone: design docJeff Hostetler1-0/+324
2017-12-14RelNotes: minor typo fixes in 2.16.0 draftTodd Zullinger1-2/+2
2017-12-14t/lib-git-svn.sh: improve svnserve tests with parallel make testTodd Zullinger1-2/+4
2017-12-14t/lib-git-svn: cleanup inconsistent tab/space usageTodd Zullinger1-11/+11
2017-12-14Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfJunio C Hamano2-0/+28
2017-12-14git-svn: convert CRLF to LF in commit message to SVNEric Wong2-0/+28
2017-12-13RelNotes: the ninth batchJunio C Hamano1-0/+31
2017-12-13Merge branch 'js/hashmap-update-sample'Junio C Hamano1-31/+29
2017-12-13Merge branch 'en/remove-stripspace'Junio C Hamano1-9/+0
2017-12-13Merge branch 'jk/no-optional-locks'Junio C Hamano1-0/+13
2017-12-13Merge branch 'ds/for-each-file-in-obj-micro-optim'Junio C Hamano2-5/+11
2017-12-13Merge branch 'jk/progress-delay-fix'Junio C Hamano1-19/+5
2017-12-13Merge branch 'ks/doc-checkout-previous'Junio C Hamano1-4/+4
2017-12-13Merge branch 'fk/sendmail-from-path'Junio C Hamano2-4/+6
2017-12-13Merge branch 'tg/t-readme-updates'Junio C Hamano1-4/+6
2017-12-13Merge branch 'pc/submodule-helper'Junio C Hamano1-1/+1
2017-12-13Merge branch 'jc/receive-pack-hook-doc'Junio C Hamano1-10/+10
2017-12-13Merge branch 'ab/pcre2-grep'Junio C Hamano4-0/+46
2017-12-13Merge branch 'ra/decorate-limit-refs'Junio C Hamano9-11/+232
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano15-37/+175
2017-12-13path: document path functionsBrandon Williams1-21/+112
2017-12-12transport: remove unused "push" in vtableJonathan Tan2-9/+1
2017-12-12install-doc-quick: allow specifying what ref to installRandall S. Becker2-6/+8
2017-12-12t/helper: ignore everything but sourcesStefan Beller1-38/+4
2017-12-12travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing outputSZEDER Gábor1-1/+1
2017-12-12travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'SZEDER Gábor2-2/+2
2017-12-12travis-ci: move setting environment variables to 'ci/lib-travisci.sh'SZEDER Gábor2-17/+22
2017-12-12travis-ci: introduce a $jobname variable for 'ci/*' scriptsSZEDER Gábor3-10/+15
2017-12-12submodule: convert get_next_submodule to not rely on the_indexBrandon Williams3-15/+22
2017-12-12submodule: used correct index in is_staging_gitmodules_okBrandon Williams2-3/+4
2017-12-12submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams4-5/+5
2017-12-12t: add tests for pull --verify-signaturesHans Jerry Illikainen1-0/+78
2017-12-12merge: add config option for verifySignaturesHans Jerry Illikainen3-0/+45
2017-12-12format: create docs for pretty.hOlga Telezhnaya1-0/+44
2017-12-12format: create pretty.h fileOlga Telezhnaya6-84/+92
2017-12-11t4045: reindent to make helpers readableJunio C Hamano1-48/+56
2017-12-11diff: add tests for --relative without optional prefix valueJacob Keller1-8/+14
2017-12-11diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano1-4/+3
2017-12-11diff: use skip_to_optional_arg_default()Christian Couder1-16/+4
2017-12-11diff: use skip_to_optional_arg()Christian Couder1-14/+9
2017-12-11index-pack: use skip_to_optional_arg()Christian Couder1-8/+3
2017-12-11git-compat-util: introduce skip_to_optional_arg()Christian Couder2-0/+45
2017-12-11clone: support 'clone --shared' from a worktreeEric Sunshine2-1/+8
2017-12-08transport-helper: plug strbuf and string_list leaksRené Scharfe1-2/+5
2017-12-08t0027: Adapt the new MIX tests to WindowsTorsten Bögershausen1-8/+9
2017-12-08doc: reword gitworkflows.txt for neutralityDaniel Bensoussan1-2/+2
2017-12-08decorate: clean up and document APIJonathan Tan8-25/+146
2017-12-08t/Makefile: introduce TEST_SHELL_PATHJeff King3-3/+13
2017-12-08test-lib: make "-x" work with "--verbose-log"Jeff King1-2/+8
2017-12-08t5615: avoid re-using descriptor 4Jeff King1-3/+3
2017-12-08test-lib: silence "-x" cleanup under bashJeff King1-10/+24
2017-12-08cvsimport: apply shell-quoting regex globallyJeff King1-1/+1
2017-12-08docs/pretty-formats: mention commas in %(trailers) syntaxJeff King1-5/+7
2017-12-07builtin/branch: strip refs/heads/ using skip_prefixKaartic Sivaraam1-4/+11
2017-12-07branch: update warning message shown when copying a misnamed branchKaartic Sivaraam1-1/+1
2017-12-07branch: group related arguments of create_branch()Kaartic Sivaraam4-7/+8
2017-12-07branch: improve documentation and naming of create_branch() parametersKaartic Sivaraam2-3/+8
2017-12-07worktree: invoke post-checkout hook (unless --no-checkout)Eric Sunshine3-7/+47
2017-12-07strbuf: release memory on read error in strbuf_read_once()René Scharfe1-0/+3
2017-12-07fmt-merge-msg: avoid leaking strbuf in shortlog()René Scharfe1-1/+2
2017-12-07am: release strbuf after use in split_mail_mbox()René Scharfe1-3/+7
2017-12-07launch_editor(): indicate that Git waits for user inputLars Schneider4-0/+30
2017-12-07setup.c: fix comment about order of .git directory discoverySZEDER Gábor1-1/+1
2017-12-06diff-tree: read the index so attribute checks work in bare repositoriesBrandon Williams2-0/+19
2017-12-06git-prompt: fix reading files with windows line endingsRobert Abel1-1/+1
2017-12-06git-prompt: make __git_eread intended use explicitRobert Abel1-3/+4
2017-12-06add worktree.guessRemote config optionThomas Gummerer4-2/+56
2017-12-06worktree: add --guess-remote flag to add subcommandThomas Gummerer3-0/+46
2017-12-06trace: improve performance while category is disabledGennady Kupava2-20/+42
2017-12-06RelNotes: the eighth batchJunio C Hamano1-13/+45
2017-12-06Sync with maintJunio C Hamano1-0/+47
2017-12-06Merge branch 'jn/ssh-wrappers'Junio C Hamano4-152/+266
2017-12-06Merge branch 'bw/protocol-v1'Junio C Hamano19-149/+968
2017-12-06Merge branch 'sp/doc-info-attributes'Junio C Hamano1-0/+4
2017-12-06Merge branch 'ph/stash-save-m-option-fix'Junio C Hamano2-0/+111
2017-12-06Merge branch 'jk/fewer-pack-rescan'Junio C Hamano5-24/+87
2017-12-06Merge branch 'tg/deprecate-stash-save'Junio C Hamano1-2/+2
2017-12-06Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2-2/+2
2017-12-06Merge branch 'rd/man-reflog-add-n'Junio C Hamano1-2/+2
2017-12-06Merge branch 'rd/man-prune-progress'Junio C Hamano2-4/+7
2017-12-06Merge branch 'jt/submodule-tests-cleanup'Junio C Hamano1-218/+125
2017-12-06Merge branch 'jn/reproducible-build'Junio C Hamano2-2/+2
2017-12-06Merge branch 'cc/git-packet-pm'Junio C Hamano2-12/+17
2017-12-06Merge branch 'ac/complete-pull-autostash'Junio C Hamano1-0/+1
2017-12-06Merge branch 'hm/config-parse-expiry-date'Junio C Hamano7-13/+69
2017-12-06Merge branch 'tz/branch-doc-remove-set-upstream'Junio C Hamano1-2/+2
2017-12-06Merge branch 'cc/perf-run-config'Junio C Hamano3-15/+89
2017-12-06Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano3-1/+21
2017-12-06Prepare for 2.15.2Junio C Hamano2-1/+48
2017-12-06Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano1-8/+56
2017-12-06Merge branch 'tz/redirect-fix' into maintJunio C Hamano2-2/+2
2017-12-06Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano3-9/+9
2017-12-06Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2-2/+39
2017-12-06Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano1-1/+2
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2-0/+16
2017-12-06Merge branch 'tz/complete-branch-copy' into maintJunio C Hamano1-1/+1
2017-12-06Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2-0/+24
2017-12-06Merge branch 'sd/branch-copy' into maintJunio C Hamano1-2/+2
2017-12-06Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano1-0/+12
2017-12-06Merge branch 'bc/submitting-patches-in-asciidoc' into maintJunio C Hamano3-161/+192
2017-12-06Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano4-1/+238
2017-12-06t2020: test variations that matterJunio C Hamano1-3/+3
2017-12-06t4013: test new output from diff --abbrev --rawAnn T Ropea15-1/+253
2017-12-06diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueAnn T Ropea1-1/+7
2017-12-06t4013: prepare for upcoming "diff --raw --abbrev" output format changeAnn T Ropea1-6/+23
2017-12-06checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea3-3/+132
2017-12-05hashmap: adjust documentation to reflect realityJohannes Schindelin1-31/+29
2017-12-05Documentation/git-clone: improve description for submodule recursingStefan Beller1-8/+11