aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sync with maintJunio C Hamano2020-01-271-0/+1
|\
| * .mailmap: fix erroneous authorship for Johannes SchindelinDenton Liu2020-01-271-0/+1
* | The first batch post 2.25 cycleJunio C Hamano2020-01-223-2/+55
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2020-01-222-0/+19
|\ \
| * | restore: invalidate cache-tree when removing entries with --stagedJeff King2020-01-082-0/+19
* | | Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'Junio C Hamano2020-01-222-1/+13
|\ \ \
| * | | transport: don't flush when disconnecting stateless-rpc helperJeff King2020-01-082-1/+13
* | | | Merge branch 'hw/tutorial-favor-switch-over-checkout'Junio C Hamano2020-01-221-1/+1
|\ \ \ \
| * | | | doc/gitcore-tutorial: fix prose to match example commandHeba Waly2020-01-081-1/+1
* | | | | Merge branch 'es/unpack-trees-oob-fix'Junio C Hamano2020-01-221-2/+4
|\ \ \ \ \
| * | | | | unpack-trees: watch for out-of-range index positionEmily Shaffer2020-01-081-2/+4
| |/ / / /
* | | | | Merge branch 'bc/run-command-nullness-after-free-fix'Junio C Hamano2020-01-221-1/+2
|\ \ \ \ \
| * | | | | run-command: avoid undefined behavior in exists_in_PATHbrian m. carlson2020-01-071-1/+2
| |/ / / /
* | | | | Merge branch 'en/string-list-can-be-custom-sorted'Junio C Hamano2020-01-221-2/+4
|\ \ \ \ \
| * | | | | string-list: note in docs that callers can specify sorting functionElijah Newren2020-01-071-2/+4
| |/ / / /
* | | | | Merge branch 'en/simplify-check-updates-in-unpack-trees'Junio C Hamano2020-01-221-12/+14
|\ \ \ \ \
| * | | | | unpack-trees: exit check_updates() early if updates are not wantedElijah Newren2020-01-071-12/+14
| |/ / / /
* | | | | Merge branch 'jt/sha1-file-remove-oi-skip-cached'Junio C Hamano2020-01-222-22/+18
|\ \ \ \ \
| * | | | | sha1-file: remove OBJECT_INFO_SKIP_CACHEDJonathan Tan2020-01-022-22/+18
| |/ / / /
* | | | | Merge branch 'hw/commit-advise-while-rejecting'Junio C Hamano2020-01-222-0/+10
|\ \ \ \ \
| * | | | | commit: honor advice.statusHints when rejecting an empty commitHeba Waly2019-12-192-0/+10
| |/ / / /
* | | | | Merge branch 'dl/credential-netrc'Junio C Hamano2020-01-223-3/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | contrib/credential/netrc: work outside a repoDenton Liu2019-12-201-1/+1
| * | | | contrib/credential/netrc: make PERL_PATH configurableDenton Liu2019-12-203-2/+25
| |/ / /
* | | | Sync with maintJunio C Hamano2020-01-162-4/+4
|\ \ \ \
| * | | | msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.xJohannes Schindelin2020-01-162-4/+4
| |/ / /
* | | | Git 2.25v2.25.0Junio C Hamano2020-01-131-1/+1
* | | | Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano2020-01-1212-24312/+53740
|\ \ \ \
| * | | | l10n: zh_CN: for git v2.25.0 l10n round 1Jiang Xin2020-01-121-2275/+2807
| * | | | Merge branch 'master' of github.com:Softcatala/git-po into git-po-masterJiang Xin2020-01-111-3757/+4260
| |\ \ \ \
| | * | | | l10n: Update Catalan translationJordi Mas2020-01-101-3757/+4260
| * | | | | l10n: de.po: Update German translation v2.25.0 round 1Matthias Rüster2020-01-101-2282/+2844
| * | | | | l10n: de.po: Reword generation numbersThomas Braun2020-01-101-1/+1
| * | | | | l10n: bg.po: Updated Bulgarian translation (4800t)Alexander Shopov2020-01-091-2353/+2905
| |/ / / /
| * | | | l10n: es: 2.25.0 round #1Christopher Diaz Riveros2020-01-061-2282/+2838
| * | | | l10n: sv.po: Update Swedish translation (4800t0f0u)Peter Krefting2020-01-041-2282/+2825
| * | | | Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into masterJiang Xin2020-01-041-2271/+2800
| |\ \ \ \
| | * | | | l10n: fr.po v2.25.0 rnd 1Jean-Noël Avila2020-01-031-2271/+2800
| * | | | | l10n: vi(4800t): Updated Vietnamese translation v2.25.0Tran Ngoc Quan2020-01-031-2273/+2839
| * | | | | Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-masterJiang Xin2020-01-011-2343/+2974
| |\ \ \ \ \
| | * | | | | l10n: zh_TW.po: update translation for v2.25.0 round 1pan934122019-12-311-2343/+2974
| | |/ / / /
| * / / / / l10n: it.po: update the Italian translation for Git 2.25.0Alessandro Menti2019-12-301-2277/+2854
| |/ / / /
| * | | | l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)Jiang Xin2019-12-301-2252/+2755
| * | | | Merge tag 'v2.25.0-rc0' into git-po-masterJiang Xin2019-12-30518-6607/+17382
| |\ \ \ \
| * | | | | l10n: Update Catalan translationJordi Mas2019-12-271-8/+8
| * | | | | l10n: zh_TW: add translation for v2.24.0Yi-Jyun Pan2019-11-252-0/+23374
* | | | | | Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-127-327/+28
* | | | | | Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Junio C Hamano2020-01-102-7/+7
|\ \ \ \ \ \
| * | | | | | mingw: safeguard better against backslashes in file namesJohannes Schindelin via GitGitGadget2020-01-102-7/+7
* | | | | | | Merge branch 'ma/config-advice-markup-fix'Junio C Hamano2020-01-101-1/+1
|\ \ \ \ \ \ \
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.