summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | t1700: add tests for splitIndex.maxPercentChangeChristian Couder2017-03-011-0/+72
| * | | | | | read-cache: regenerate shared index if necessaryChristian Couder2017-03-012-0/+33
| * | | | | | config: add git_config_get_max_percent_split_change()Christian Couder2017-03-012-0/+16
| * | | | | | Documentation/git-update-index: talk about core.splitIndex config varChristian Couder2017-03-011-0/+6
| * | | | | | Documentation/config: add information for core.splitIndexChristian Couder2017-03-011-0/+4
| * | | | | | t1700: add tests for core.splitIndexChristian Couder2017-03-011-0/+37
| * | | | | | update-index: warn in case of split-index incoherencyChristian Couder2017-03-011-1/+10
| * | | | | | read-cache: add and then use tweak_split_index()Christian Couder2017-03-011-0/+17
| * | | | | | split-index: add {add,remove}_split_index() functionsChristian Couder2017-03-013-12/+30
| * | | | | | config: add git_config_get_split_index()Christian Couder2017-03-012-0/+11
| * | | | | | t1700: change here document styleChristian Couder2017-03-011-85/+85
| * | | | | | config: mark an error message up for translationChristian Couder2017-03-011-2/+2
* | | | | | | Sync with 'maint'Junio C Hamano2017-03-161-0/+41
|\ \ \ \ \ \ \
| * | | | | | | Preparing for 2.12.1Junio C Hamano2017-03-163-2/+43
| * | | | | | | Merge branch 'js/realpath-pathdup-fix' into maintJunio C Hamano2017-03-1610-18/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mm/two-more-xstrfmt' into maintJunio C Hamano2017-03-162-11/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vn/line-log-memcpy-size-fix' into maintJunio C Hamano2017-03-161-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ax/line-log-range-merge-fix' into maintJunio C Hamano2017-03-162-8/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-i-patch-do-prompt' into maintJunio C Hamano2017-03-162-4/+22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/http-base-url-update-upon-redirect' into maintJunio C Hamano2017-03-163-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/travis-32bit-linux' into maintJunio C Hamano2017-03-162-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/mingw-openssl-sha1' into maintJunio C Hamano2017-03-161-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-auth' into maintJunio C Hamano2017-03-161-4/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fourth batch after 2.12Junio C Hamano2017-03-141-0/+42
* | | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-03-142-4/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | branch: honor --abbrev/--no-abbrev in --list modeJunio C Hamano2017-03-102-4/+40
* | | | | | | | | | | | | | | | | Merge branch 'jk/push-deadlock-regression-fix'Junio C Hamano2017-03-142-11/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | send-pack: report signal death of pack-objectsjk/push-deadlock-regression-fixJeff King2017-03-071-1/+14
| * | | | | | | | | | | | | | | | | send-pack: read "unpack" status even on pack-objects failureJeff King2017-03-071-0/+8
| * | | | | | | | | | | | | | | | | send-pack: improve unpack-status error messagesJeff King2017-03-071-2/+2
| * | | | | | | | | | | | | | | | | send-pack: use skip_prefix for parsing unpack statusJeff King2017-03-071-3/+3
| * | | | | | | | | | | | | | | | | send-pack: extract parsing of "unpack" responseJeff King2017-03-071-9/+14
| * | | | | | | | | | | | | | | | | receive-pack: fix deadlock when we cannot create tmpdirJeff King2017-03-071-1/+4
* | | | | | | | | | | | | | | | | | Merge branch 'js/travis-32bit-linux'Junio C Hamano2017-03-142-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Travis: also test on 32-bit Linuxjs/travis-32bit-linuxJohannes Schindelin2017-03-062-0/+51
* | | | | | | | | | | | | | | | | | Merge branch 'ew/http-alternates-as-redirects-warning'Junio C Hamano2017-03-141-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | http: release strbuf on disabled alternatesew/http-alternates-as-redirects-warningEric Wong2017-03-061-0/+2
| * | | | | | | | | | | | | | | | | | http: inform about alternates-as-redirects behaviorEric Wong2017-03-061-3/+5
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'dp/filter-branch-prune-empty'Junio C Hamano2017-03-144-8/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | p7000: add test for filter-branch with --prune-emptydp/filter-branch-prune-emptyDevin J. Pohly2017-03-031-0/+5
| * | | | | | | | | | | | | | | | | | filter-branch: fix --prune-empty on parentless commitsDevin J. Pohly2017-03-033-10/+10
| * | | | | | | | | | | | | | | | | | t7003: ensure --prune-empty removes entire branch when applicableDevin J. Pohly2017-03-031-0/+7
| * | | | | | | | | | | | | | | | | | t7003: ensure --prune-empty can prune root commitDevin J. Pohly2017-03-031-0/+30
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jt/perf-updates'Junio C Hamano2017-03-143-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t/perf: add fallback for pre-bin-wrappers versions of gitjt/perf-updatesJeff King2017-03-031-0/+3
| * | | | | | | | | | | | | | | | | | t/perf: use $MODERN_GIT for all repo-copying stepsJeff King2017-03-031-2/+2
| * | | | | | | | | | | | | | | | | | t/perf: export variable used in other blocksJonathan Tan2017-03-031-1/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object'Junio C Hamano2017-03-147-30/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fetch-pack: add specific error for fetching an unadvertised objectmm/fetch-show-error-message-on-unadvertised-objectMatt McCutchen2017-03-023-18/+35
| * | | | | | | | | | | | | | | | | | fetch_refs_via_pack: call report_unmatched_refsMatt McCutchen2017-03-022-6/+11