summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-06-07Git 2.22v2.22.0Junio C Hamano1-1/+1
2019-06-07Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano11-33731/+43398
2019-06-07Merge branch 'fr_review' of git://github.com/jnavila/gitJiang Xin1-15/+15
2019-06-07Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-7/+11
2019-06-07l10n: fr.po: Review French translationCédric Malard1-15/+15
2019-06-06Merge branch 'en/merge-directory-renames-fix'Junio C Hamano2-0/+117
2019-06-06l10n: de.po: Update German translationMatthias Rüster1-3074/+4139
2019-06-06l10n: de.po: improve description of 'git reset --quiet'Ralf Thielow1-1/+1
2019-06-05l10n: TEAMS: Change German translation team leaderMatthias Rüster1-3/+3
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren2-0/+117
2019-06-05l10n: bg.po: Updated Bulgarian translation (4581t)Alexander Shopov1-7/+11
2019-06-05l10n: zh_CN: Revision for git v2.22.0 l10nFangyi Zhou2-54/+54
2019-06-05l10n: zh_CN: for git v2.22.0 l10n round 1~3Jiang Xin1-3040/+4015
2019-06-05Merge branch '2.22' of https://github.com/ChrisADR/git-poJiang Xin1-8/+12
2019-06-05Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-poJiang Xin1-4745/+6015
2019-06-04l10n: es: 2.22.0 round 3Christopher Diaz Riveros1-8/+12
2019-06-04l10n: it.po: Updated Italian translationAlessandro Menti1-4745/+6015
2019-06-04l10n: fr v2.22.0 rnd 3Jean-Noël Avila1-10/+16
2019-06-04l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3Tran Ngoc Quan1-12/+16
2019-06-04l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)Jiang Xin1-6/+10
2019-06-04Merge branch 'master' of git://git.kernel.org/pub/scm/git/gitJiang Xin11-126/+54
2019-06-03Git 2.22-rc3v2.22.0-rc3Junio C Hamano2-1/+8
2019-06-03Merge branch 'cc/list-objects-filter-wo-sparse-path'Junio C Hamano7-116/+37
2019-06-03i18n: fix typos found during l10n for git 2.22.0Jiang Xin2-3/+3
2019-06-03RelNotes: minor typo fixes in 2.22.0 draftTodd Zullinger1-6/+6
2019-06-03l10n: es: 2.22.0 round 2Christopher Diaz Riveros1-381/+394
2019-06-02Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-383/+396
2019-06-02Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-1577/+1590
2019-06-02l10n: bg.po: Updated Bulgarian translation (4580t)Alexander Shopov1-1577/+1590
2019-06-01l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2Tran Ngoc Quan1-383/+396
2019-05-31l10n: fr.po v2.22.0 round 2Jean-Noël Avila1-434/+537
2019-05-31l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)Jiang Xin1-378/+391
2019-05-31Merge branch 'master' of git://git.kernel.org/pub/scm/git/gitJiang Xin95-553/+1001
2019-05-31Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin1-4465/+4516
2019-05-30Git 2.22-rc2v2.22.0-rc2Junio C Hamano2-1/+3
2019-05-30Merge branch 'js/rebase-config-bitfix'Junio C Hamano1-1/+1
2019-05-30Merge branch 'es/doc-gitsubmodules-markup'Junio C Hamano1-7/+7
2019-05-30Merge branch 'ja/diff-opt-typofix'Junio C Hamano1-2/+2
2019-05-30Merge branch 'jt/clone-server-option'Junio C Hamano1-1/+1
2019-05-30Merge branch 'sg/progress-off-by-one-fix'Junio C Hamano1-1/+1
2019-05-30Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano4-11/+19
2019-05-30Merge branch 'sg/trace2-rename'Junio C Hamano13-91/+118
2019-05-30Merge branch 'jh/trace2'Junio C Hamano1-3/+9
2019-05-30Merge branch 'nd/diff-parseopt'Junio C Hamano8-5/+107
2019-05-29list-objects-filter: disable 'sparse:path' filtersChristian Couder7-116/+37
2019-05-29parse-options: check empty value in OPT_INTEGER and OPT_ABBREVNguyễn Thái Ngọc Duy2-0/+6
2019-05-29diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy5-4/+100
2019-05-29diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy1-1/+1
2019-05-29Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-3137/+4156
2019-05-29l10n: bg.po: Updated Bulgarian translation (4577t)Alexander Shopov1-3137/+4156
2019-05-28rebase docs: recommend `-r` over `-p`Johannes Schindelin1-2/+3
2019-05-28docs: say that `--rebase=preserve` is deprecatedJohannes Schindelin1-2/+3
2019-05-28tests: mark a couple more test cases as requiring `rebase -p`Johannes Schindelin2-7/+13
2019-05-28fetch-pack: send server options after commandJonathan Tan1-1/+1
2019-05-28trace2: fix tracing when NO_PTHREADS is definedJeff Hostetler1-3/+9
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin1-1/+1
2019-05-28progress: avoid empty line when breaking the progress lineSZEDER Gábor1-1/+1
2019-05-28trace2: document the supported values of GIT_TRACE2* env variablesSZEDER Gábor1-8/+35
2019-05-28trace2: rename environment variables to GIT_TRACE2*SZEDER Gábor13-85/+85
2019-05-28gitsubmodules: align html and nroff listsEmily Shaffer1-7/+7
2019-05-28l10n: es: 2.22.0 round 1Christopher Diaz Riveros1-3065/+4150
2019-05-21Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-3069/+4154
2019-05-19Git 2.22-rc1v2.22.0-rc1Junio C Hamano2-1/+77
2019-05-19Merge branch 'js/difftool-no-index'Junio C Hamano1-1/+2
2019-05-19Merge branch 'jk/get-oid-indexed-object-name'Junio C Hamano2-7/+3
2019-05-19Merge branch 'jc/set-packet-header-signature-fix'Junio C Hamano1-1/+1
2019-05-19Merge branch 'cb/http-push-null-in-message-fix'Junio C Hamano1-2/+2
2019-05-19Merge branch 'js/stash-in-c-use-builtin-doc'Junio C Hamano1-0/+15
2019-05-19Merge branch 'tz/test-lib-check-working-jgit'Junio C Hamano1-1/+1
2019-05-19Merge branch 'js/parseopt-unknown-cb-returns-an-enum'Junio C Hamano1-1/+3
2019-05-19Merge branch 'ab/sha1dc'Junio C Hamano2-1/+1
2019-05-19Merge branch 'js/rebase-i-label-shown-in-status-fix'Junio C Hamano1-1/+3
2019-05-19Merge branch 'es/check-non-portable-pre-5.10'Junio C Hamano1-4/+5
2019-05-19Merge branch 'ds/trace2-document-env-vars'Junio C Hamano1-0/+21
2019-05-19Merge branch 'js/fsmonitor-refresh-after-discarding-index'Junio C Hamano5-5/+36
2019-05-19Merge branch 'cm/notes-comment-fix'Junio C Hamano1-5/+3
2019-05-19Merge branch 'tt/no-ipv6-fallback-for-winxp'Junio C Hamano2-183/+3
2019-05-19Merge branch 'js/t5580-unc-alternate-test'Junio C Hamano1-0/+12
2019-05-19Merge branch 'ds/cvsexportcommit-force-text'Junio C Hamano1-0/+1
2019-05-19Merge branch 'sg/ci-libsvn-perl'Junio C Hamano1-1/+1
2019-05-19Merge branch 'bl/t4253-exit-code-from-format-patch'Junio C Hamano1-2/+4
2019-05-19Merge branch 'ds/midx-too-many-packs'Junio C Hamano7-47/+51
2019-05-19Merge branch 'en/unicode-in-refnames'Junio C Hamano3-0/+7
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano9-93/+180
2019-05-19Merge branch 'mh/http-fread-api-fix'Junio C Hamano1-6/+6
2019-05-19Merge branch 'js/t6500-use-windows-pid-on-mingw'Junio C Hamano1-1/+9
2019-05-19Merge branch 'jk/apache-lsan'Junio C Hamano1-0/+1
2019-05-19Merge branch 'nd/parse-options-aliases'Junio C Hamano5-10/+164
2019-05-19Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano5-32/+50
2019-05-19Merge branch 'js/commit-graph-parse-leakfix'Junio C Hamano1-1/+3
2019-05-19Merge branch 'jk/cocci-batch'Junio C Hamano1-7/+12
2019-05-19Merge branch 'ab/perf-installed-fix'Junio C Hamano4-27/+53
2019-05-19Merge branch 'id/windows-dep-aslr'Junio C Hamano1-0/+8
2019-05-19Merge branch 'ab/trace2-typofix'Junio C Hamano0-0/+0
2019-05-19Merge branch 'nd/submodule-helper-incomplete-line-fix'Junio C Hamano1-1/+1
2019-05-19Merge branch 'cw/diff-highlight'Junio C Hamano1-1/+6
2019-05-19Merge branch 'dl/warn-tagging-a-tag'Junio C Hamano2-2/+2
2019-05-19diff: fix mistake in translatable stringsJean-Noël Avila1-2/+2
2019-05-19l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1Tran Ngoc Quan1-3069/+4154
2019-05-17l10n: fr.po v2.22.0.rnd1Jean-Noël Avila1-3065/+3998
2019-05-16pkt-line: drop 'const'-ness of a param to set_packet_header()Junio C Hamano1-1/+1
2019-05-15test-lib: try harder to ensure a working jgitTodd Zullinger1-1/+1
2019-05-15get_oid: handle NULL repo->indexJeff King2-7/+3
2019-05-15http-push: prevent format overflow warning with gcc >= 9Carlo Marcelo Arenas Belón1-2/+2
2019-05-15stash: document stash.useBuiltinJohannes Schindelin1-0/+15
2019-05-14l10n: sv.po: Update Swedish translation (4577t0f0u)Peter Krefting1-3073/+4140
2019-05-14l10n: sv.po: Update Swedish translationPeter Krefting1-7/+7
2019-05-14l10n: git.pot: v2.22.0 round 1 (270 new, 56 removed)Jiang Xin1-2987/+3927
2019-05-14sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2-1/+1
2019-05-14parse-options: adjust `parse_opt_unknown_cb()`s declared return typeJohannes Schindelin1-1/+3
2019-05-13Git 2.22-rc0v2.22.0-rc0Junio C Hamano2-1/+40
2019-05-13Merge branch 'jh/trace2'Junio C Hamano2-2/+2
2019-05-13Merge branch 'cc/access-on-aix-workaround'Junio C Hamano5-2/+52
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano7-9/+201
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano7-511/+532
2019-05-13Merge branch 'jk/perf-aggregate-wo-libjson'Junio C Hamano1-2/+2
2019-05-13Merge branch 'dl/rev-tilde-doc-clarify'Junio C Hamano1-15/+14
2019-05-13Merge branch 'jc/make-dedup-ls-files-output'Junio C Hamano1-2/+2
2019-05-13Merge branch 'jk/ls-files-doc-markup-fix'Junio C Hamano1-0/+2
2019-05-13Merge branch 'jk/p5302-avoid-collision-check-cost'Junio C Hamano1-13/+18
2019-05-13Merge branch 'dl/no-extern-in-func-decl'Junio C Hamano70-1082/+1082
2019-05-13Merge branch 'ew/repack-with-bitmaps-by-default'Junio C Hamano8-13/+28
2019-05-13Merge branch 'js/partial-clone-connectivity-check'Junio C Hamano4-2/+55
2019-05-13Merge branch 'jh/trace2-sid-fix'Junio C Hamano29-216/+758
2019-05-13difftool: fallback on merge.guitoolDenton Liu3-9/+21
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu2-0/+11
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu3-10/+48
2019-05-13mergetool--lib: create gui_mode functionDenton Liu1-5/+8
2019-05-13mergetool: use get_merge_tool functionDenton Liu4-11/+12
2019-05-13trace2: add variable description to git.txtDerrick Stolee1-0/+21
2019-05-13status: fix display of rebase -ir's `label` commandJohannes Schindelin1-1/+3
2019-05-13trace2: fix up a missing "leave" entry pointÆvar Arnfjörð Bjarmason1-1/+1
2019-05-13check-non-portable-shell: support Perl versions older than 5.10Eric Sunshine1-4/+5
2019-05-13mingw: enable DEP and ASLRİsmail Dönmez1-0/+6
2019-05-13mingw: do not let ld strip relocationsİsmail Dönmez1-0/+2
2019-05-10trace2: fix up a missing "leave" entry pointÆvar Arnfjörð Bjarmason1-1/+1
2019-05-09difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin1-1/+2
2019-05-09tag: fix typo in nested tagging hintDenton Liu2-2/+2
2019-05-09diff-highlight: use correct /dev/null for UNIX and WindowsChris. Webster1-1/+6
2019-05-09The eighth batchJunio C Hamano1-2/+88
2019-05-09Merge branch 'vk/autoconf-gettext'Junio C Hamano1-3/+13
2019-05-09Merge branch 'cc/aix-has-fileno-as-a-macro'Junio C Hamano1-0/+1
2019-05-09Merge branch 'jt/submodule-repo-is-with-worktree'Junio C Hamano2-4/+34
2019-05-09Merge branch 'jk/untracked-cache-more-fixes'Junio C Hamano1-23/+18
2019-05-09Merge branch 'jk/prune-optim'Junio C Hamano1-0/+8
2019-05-09Merge branch 'js/misc-doc-fixes'Junio C Hamano15-51/+99
2019-05-09Merge branch 'dr/ref-filter-push-track-fix'Junio C Hamano5-28/+66
2019-05-09Merge branch 'ss/msvc-path-utils-fix'Junio C Hamano2-0/+2
2019-05-09Merge branch 'jt/clone-server-option'Junio C Hamano5-1/+67
2019-05-09Merge branch 'tb/unexpected'Junio C Hamano8-16/+152
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano19-242/+408
2019-05-09Merge branch 'cc/replace-graft-peel-tags'Junio C Hamano2-10/+41
2019-05-09Merge branch 'js/trace2-to-directory'Junio C Hamano3-2/+81
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano18-132/+484
2019-05-09Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano3-7/+38
2019-05-09Merge branch 'jk/pack-objects-reports-num-objects-to-trace2'Junio C Hamano1-0/+2
2019-05-09Merge branch 'tz/git-svn-doc-markup-fix'Junio C Hamano1-3/+3
2019-05-09Merge branch 'km/empty-repo-is-still-a-repo'Junio C Hamano7-4/+88
2019-05-09Merge branch 'dl/warn-tagging-a-tag'Junio C Hamano5-6/+33
2019-05-09Merge branch 'en/merge-directory-renames'Junio C Hamano19-1025/+1367
2019-05-08submodule--helper: add a missing \nNguyễn Thái Ngọc Duy1-1/+1
2019-05-08coccicheck: make batch size of 0 mean "unlimited"Jeff King1-1/+7
2019-05-08t6500(mingw): use the Windows PID of the shellJohannes Schindelin1-1/+9
2019-05-08t/lib-httpd: pass LSAN_OPTIONS through apacheJeff King1-0/+1
2019-05-08Make fread/fwrite-like functions in http.c more like fread/fwrite.Mike Hommey1-6/+6
2019-05-08fsmonitor: force a refresh after the index was discardedJohannes Schindelin4-5/+6
2019-05-08fsmonitor: demonstrate that it is not refreshed after discard_index()Johannes Schindelin2-1/+31
2019-05-08perf-lib.sh: forbid the use of GIT_TEST_INSTALLEDÆvar Arnfjörð Bjarmason2-0/+13
2019-05-08perf tests: add "bindir" prefix to git tree test resultsÆvar Arnfjörð Bjarmason2-2/+4
2019-05-08perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.shÆvar Arnfjörð Bjarmason3-32/+38
2019-05-08perf-lib.sh: make "./run <revisions>" use the correct gitsÆvar Arnfjörð Bjarmason2-2/+10
2019-05-08perf aggregate: remove GIT_TEST_INSTALLED from --codespeedÆvar Arnfjörð Bjarmason1-3/+0
2019-05-08perf README: correct docs for 3c8f12c96c regressionÆvar Arnfjörð Bjarmason1-1/+1
2019-05-08revisions.txt: remove ambibuity between <rev>:<path> and :<path>Andreas Heiduk1-5/+2
2019-05-08revisions.txt: mention <rev>~ formDenton Liu1-1/+3
2019-05-08revisions.txt: mark optional rev arguments with []Denton Liu1-5/+5
2019-05-08revisions.txt: change "rev" to "<rev>"Denton Liu1-4/+4
2019-05-07notes: correct documentation of format_display_notes()Chris Mayo1-5/+3
2019-05-07mingw: remove obsolete IPv6-related codeTanushree Tumane2-183/+3
2019-05-07t5580: verify that alternates can be UNC pathsJohannes Schindelin1-0/+12
2019-05-07cvsexportcommit: force crlf translationDustin Spicuzza1-0/+1
2019-05-07ci: install 'libsvn-perl' instead of 'git-svn'SZEDER Gábor1-1/+1
2019-05-07t4253-am-keep-cr-dos: avoid using pipesBoxuan Li1-2/+4
2019-05-07commit-graph: fix memory leakJosh Steadmon1-1/+3
2019-05-07midx: add packs to packed_git linked listDerrick Stolee4-33/+30
2019-05-07midx: pass a repository pointerDerrick Stolee5-15/+22
2019-05-07branch: make create_branch accept a merge base revDenton Liu5-6/+33
2019-05-07t2018: cleanup in current testDenton Liu1-26/+17
2019-05-07parse-options: don't emit "ambiguous option" for aliasesNguyễn Thái Ngọc Duy5-10/+164
2019-05-07coccicheck: optionally batch spatch invocationsJeff King1-7/+6
2019-05-07trace2: fixup access problem on /etc/gitconfig in read_very_early_configJeff Hostetler2-1/+5
2019-05-05*.[ch]: manually align parameter listsDenton Liu44-202/+202
2019-05-05*.[ch]: remove extern from function declarations using sedDenton Liu11-49/+49
2019-05-05*.[ch]: remove extern from function declarations using spatchDenton Liu70-885/+885
2019-05-05t/perf: add perf script for partial clonesJeff King1-0/+26
2019-04-26trace2: fix incorrect function pointer checkJosh Steadmon1-1/+1
2019-04-26Honor core.precomposeUnicode in more placesElijah Newren3-0/+7
2019-04-25git-compat-util: work around for access(X_OK) under rootClément Chigot5-2/+52
2019-04-25Makefile: use fileno macro work around on AIXClément Chigot1-0/+1
2019-04-25The seventh batchJunio C Hamano1-0/+118