summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | fetch-pack: support protocol version 2Jonathan Tan2019-01-102-10/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/proto-v2-hidden-refs-fix'Junio C Hamano2019-01-292-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-pack: support hidden refs with protocol v2Jeff King2019-01-102-0/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/save-getenv-result'Junio C Hamano2019-01-296-12/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King2019-01-111-1/+4
| * | | | | | | | merge-recursive: copy $GITHEAD stringsJeff King2019-01-111-5/+10
| * | | | | | | | init: make a copy of $GIT_DIR stringJeff King2019-01-111-2/+4
| * | | | | | | | config: make a copy of $GIT_CONFIG stringJeff King2019-01-111-1/+1
| * | | | | | | | commit: copy saved getenv() resultJeff King2019-01-111-1/+2
| * | | | | | | | get_super_prefix(): copy getenv() resultJeff King2019-01-111-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2019-01-294-87/+256
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --color-moved-ws: handle blank linesPhillip Wood2019-01-102-7/+68
| * | | | | | | | diff --color-moved-ws: modify allow-indentation-changePhillip Wood2019-01-102-58/+130
| * | | | | | | | diff --color-moved-ws: optimize allow-indentation-changePhillip Wood2019-01-101-8/+11
| * | | | | | | | diff --color-moved=zebra: be stricter with color alternationPhillip Wood2019-01-102-11/+22
| * | | | | | | | diff --color-moved-ws: fix false positivesPhillip Wood2019-01-101-6/+9
| * | | | | | | | diff --color-moved-ws: demonstrate false positivesPhillip Wood2019-01-101-2/+6
| * | | | | | | | diff: allow --no-color-moved-wsPhillip Wood2019-01-102-1/+12
| * | | | | | | | Use "whitespace" consistentlyPhillip Wood2019-01-103-7/+7
| * | | | | | | | diff: document --no-color-movedPhillip Wood2019-01-101-0/+4
* | | | | | | | | Merge branch 'ja/doc-build-l10n'Junio C Hamano2019-01-291-5/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/Makefile add optional targets for l10nJean-Noel Avila2019-01-071-5/+17
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/rebase-i-redo-exec'Junio C Hamano2019-01-299-5/+108
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin2018-12-114-0/+36
| * | | | | | | | | rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin2018-12-114-1/+18
| * | | | | | | | | rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-118-5/+55
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'cc/fetch-error-message-fix'Junio C Hamano2019-01-291-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: fix extensions.partialclone name in error messageChristian Couder2019-01-141-2/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'cc/partial-clone-doc-typofix'Junio C Hamano2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | partial-clone: add missing 'is' in docChristian Couder2019-01-141-1/+1
* | | | | | | | | | Merge branch 'kg/external-diff-save-env'Junio C Hamano2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: ensure correct lifetime of external_diff_cmdKim Gybels2019-01-111-1/+1
* | | | | | | | | | | Third batch after 2.20Junio C Hamano2019-01-181-0/+80
* | | | | | | | | | | Merge branch 'js/gc-repack-close-before-remove'Junio C Hamano2019-01-182-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gc/repack: release packs when neededJohannes Schindelin2019-01-112-1/+5
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'en/show-ref-doc-fix'Junio C Hamano2019-01-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-show-ref.txt: fix order of flagsElijah Newren2019-01-101-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ot/ref-filter-object-info'Junio C Hamano2019-01-183-6/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ref-filter: give uintmax_t to format with %PRIuMAXJunio C Hamano2019-01-101-1/+1
| * | | | | | | | | | | ref-filter: add docs for new optionsOlga Telezhnaya2018-12-281-1/+20
| * | | | | | | | | | | ref-filter: add tests for deltabaseOlga Telezhnaya2018-12-281-0/+3
| * | | | | | | | | | | ref-filter: add deltabase optionOlga Telezhnaya2018-12-281-1/+15
| * | | | | | | | | | | ref-filter: add tests for objectsize:diskOlga Telezhnaya2018-12-281-0/+3
| * | | | | | | | | | | ref-filter: add check for negative file sizeOlga Telezhnaya2018-12-281-0/+2
| * | | | | | | | | | | ref-filter: add objectsize:disk optionOlga Telezhnaya2018-12-281-7/+16
* | | | | | | | | | | | Merge branch 'sg/stress-test'Junio C Hamano2019-01-189-133/+308
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lib: add the '--stress' option to run a test repeatedly under loadSZEDER Gábor2019-01-073-5/+130
| * | | | | | | | | | | | test-lib-functions: introduce the 'test_set_port' helper functionSZEDER Gábor2019-01-077-13/+41
| * | | | | | | | | | | | test-lib: set $TRASH_DIRECTORY earlierSZEDER Gábor2019-01-071-6/+6
| * | | | | | | | | | | | test-lib: consolidate naming of test-results pathsSZEDER Gábor2019-01-071-11/+11