summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.22-rc3v2.22.0-rc3Junio C Hamano2019-06-032-1/+8
* Merge branch 'cc/list-objects-filter-wo-sparse-path'Junio C Hamano2019-06-037-116/+37
|\
| * list-objects-filter: disable 'sparse:path' filtersChristian Couder2019-05-297-116/+37
* | i18n: fix typos found during l10n for git 2.22.0Jiang Xin2019-06-032-3/+3
* | RelNotes: minor typo fixes in 2.22.0 draftTodd Zullinger2019-06-031-6/+6
* | Git 2.22-rc2v2.22.0-rc2Junio C Hamano2019-05-302-1/+3
* | Merge branch 'js/rebase-config-bitfix'Junio C Hamano2019-05-301-1/+1
|\ \
| * | rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin2019-05-281-1/+1
* | | Merge branch 'es/doc-gitsubmodules-markup'Junio C Hamano2019-05-301-7/+7
|\ \ \
| * | | gitsubmodules: align html and nroff listsEmily Shaffer2019-05-281-7/+7
* | | | Merge branch 'ja/diff-opt-typofix'Junio C Hamano2019-05-301-2/+2
|\ \ \ \
| * | | | diff: fix mistake in translatable stringsJean-Noël Avila2019-05-191-2/+2
* | | | | Merge branch 'jt/clone-server-option'Junio C Hamano2019-05-301-1/+1
|\ \ \ \ \
| * | | | | fetch-pack: send server options after commandJonathan Tan2019-05-281-1/+1
* | | | | | Merge branch 'sg/progress-off-by-one-fix'Junio C Hamano2019-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | progress: avoid empty line when breaking the progress lineSZEDER Gábor2019-05-281-1/+1
* | | | | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-05-304-11/+19
|\ \ \ \ \ \ \
| * | | | | | | rebase docs: recommend `-r` over `-p`Johannes Schindelin2019-05-281-2/+3
| * | | | | | | docs: say that `--rebase=preserve` is deprecatedJohannes Schindelin2019-05-281-2/+3
| * | | | | | | tests: mark a couple more test cases as requiring `rebase -p`Johannes Schindelin2019-05-282-7/+13
* | | | | | | | Merge branch 'sg/trace2-rename'Junio C Hamano2019-05-3013-91/+118
|\ \ \ \ \ \ \ \
| * | | | | | | | trace2: document the supported values of GIT_TRACE2* env variablesSZEDER Gábor2019-05-281-8/+35
| * | | | | | | | trace2: rename environment variables to GIT_TRACE2*SZEDER Gábor2019-05-2813-85/+85
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jh/trace2'Junio C Hamano2019-05-301-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | trace2: fix tracing when NO_PTHREADS is definedJeff Hostetler2019-05-281-3/+9
* | | | | | | | | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-308-5/+107
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | parse-options: check empty value in OPT_INTEGER and OPT_ABBREVNguyễn Thái Ngọc Duy2019-05-292-0/+6
| * | | | | | | | diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy2019-05-295-4/+100
| * | | | | | | | diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy2019-05-291-1/+1
* | | | | | | | | Git 2.22-rc1v2.22.0-rc1Junio C Hamano2019-05-192-1/+77
* | | | | | | | | Merge branch 'js/difftool-no-index'Junio C Hamano2019-05-191-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin2019-05-091-1/+2
* | | | | | | | | | Merge branch 'jk/get-oid-indexed-object-name'Junio C Hamano2019-05-192-7/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_oid: handle NULL repo->indexJeff King2019-05-152-7/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/set-packet-header-signature-fix'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pkt-line: drop 'const'-ness of a param to set_packet_header()Junio C Hamano2019-05-161-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cb/http-push-null-in-message-fix'Junio C Hamano2019-05-191-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http-push: prevent format overflow warning with gcc >= 9Carlo Marcelo Arenas Belón2019-05-151-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/stash-in-c-use-builtin-doc'Junio C Hamano2019-05-191-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: document stash.useBuiltinJohannes Schindelin2019-05-151-0/+15
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tz/test-lib-check-working-jgit'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: try harder to ensure a working jgitTodd Zullinger2019-05-151-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/parseopt-unknown-cb-returns-an-enum'Junio C Hamano2019-05-191-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: adjust `parse_opt_unknown_cb()`s declared return typeJohannes Schindelin2019-05-141-1/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/sha1dc'Junio C Hamano2019-05-192-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2019-05-142-1/+1
* | | | | | | | | | | Merge branch 'js/rebase-i-label-shown-in-status-fix'Junio C Hamano2019-05-191-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: fix display of rebase -ir's `label` commandJohannes Schindelin2019-05-131-1/+3
* | | | | | | | | | | | Merge branch 'es/check-non-portable-pre-5.10'Junio C Hamano2019-05-191-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | check-non-portable-shell: support Perl versions older than 5.10Eric Sunshine2019-05-131-4/+5
| |/ / / / / / / / / / /