summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hooks--pre-push.sample: modernize scriptDenton Liu2020-09-231-8/+8
* Git 2.28v2.28.0Junio C Hamano2020-07-261-1/+1
* Merge tag 'l10n-2.28.0-rnd1' of https://www.github.com/git-l10n/git-po into m...Junio C Hamano2020-07-2611-11813/+14504
|\
| * Merge branch 'master' of github.com:Softcatala/git-poJiang Xin2020-07-271-426/+428
| |\
| | * l10n: Update Catalan translationJordi Mas2020-07-091-426/+428
| * | l10n: es: 2.28.0 round 1Christopher Diaz Riveros2020-07-261-1219/+1509
| * | l10n: de.po: Update German translation for Git v2.28.0Matthias Rüster2020-07-241-1160/+1420
| * | l10n: de.po: fix grammarRalf Thielow2020-07-241-3/+3
| * | l10n: zh_CN: for git v2.28.0 l10n round 1Jiang Xin2020-07-211-1122/+1368
| * | Merge branch 'l10n/zh_TW/200716' of github.com:l10n-tw/git-poJiang Xin2020-07-211-1127/+1413
| |\ \
| | * | l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)Yi-Jyun Pan2020-07-201-1127/+1413
| * | | l10n: vi.po: correct "ident line" translationĐoàn Trần Công Danh2020-07-201-6/+6
| * | | l10n: vi.po(4931t): Updated translation for v2.28.0Tran Ngoc Quan2020-07-201-1125/+1411
| |/ /
| * | Merge branch 'fr_v2.28.0_rnd1' of github.com:jnavila/gitJiang Xin2020-07-131-1144/+1408
| |\ \
| | * | l10n: fr v2.28.0 round 1Jean-Noël Avila2020-07-121-1144/+1408
| * | | Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin2020-07-121-1127/+1399
| |\ \ \
| | * | | l10n: sv.po: Update Swedish translation (4931t0f0u)Peter Krefting2020-07-111-1127/+1399
| * | | | l10n: it.po: update the Italian translation for Git 2.28.0 round 1Alessandro Menti2020-07-111-1124/+1412
| |/ / /
| * | | l10n: tr: v2.28.0 round 1Emir Sarı2020-07-101-1128/+1377
| |/ /
| * | l10n: git.pot: v2.28.0 round 1 (70 new, 14 removed)Jiang Xin2020-07-101-1102/+1350
* | | Merge branch 'ps/ref-transaction-hook' into masterJunio C Hamano2020-07-241-2/+2
|\ \ \
| * | | githooks.txt: use correct "reference-transaction" hook nameBojun Chen2020-07-241-2/+2
* | | | Documentation/RelNotes: fix a typo in 2.28's relnotesTaylor Blau2020-07-221-1/+1
* | | | Git 2.28-rc2v2.28.0-rc2Junio C Hamano2020-07-222-1/+3
* | | | Merge branch 'en/sparse-status' into masterJunio C Hamano2020-07-211-2/+2
|\ \ \ \
| * | | | git-prompt: change == to = for zsh's sakeDavid J. Malan2020-07-201-2/+2
* | | | | Merge https://github.com/prati0100/git-gui into masterJunio C Hamano2020-07-201-24/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'mt/open-worktree'Pratyush Yadav2020-06-221-24/+3
| |\ \ \ \ \
| | * | | | | git-gui: allow opening work trees from the startup dialogMikhail Terekhov2020-06-081-24/+3
| |/ / / / /
* | | | | | Merge branch 'dl/branch-cleanup' into masterJunio C Hamano2020-07-181-2/+2
|\ \ \ \ \ \
| * | | | | | t3200: don't grep for `strerror()` stringMartin Ågren2020-07-181-2/+2
* | | | | | | Merge branch 'js/pu-to-seen' into masterJunio C Hamano2020-07-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gitworkflows.txt: fix broken subsection underlineMartin Ågren2020-07-181-1/+1
* | | | | | | | Merge branch 'jc/relnotes-v0-extension-update' into masterJunio C Hamano2020-07-181-9/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | RelNotes: update the v0 with extension situationJunio C Hamano2020-07-171-9/+0
|/ / / / / / / /
* | | | | | | | Git 2.28-rc1v2.28.0-rc1Junio C Hamano2020-07-162-1/+9
* | | | | | | | Merge branch 'jn/v0-with-extensions-fix' into masterJunio C Hamano2020-07-163-17/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | repository: allow repository format upgrade with extensionsJonathan Nieder2020-07-163-8/+9
| * | | | | | | | Revert "check_repository_format_gently(): refuse extensions for old repositor...Jonathan Nieder2020-07-162-11/+16
* | | | | | | | | Hopefully the last batch before -rc1Junio C Hamano2020-07-151-0/+8
* | | | | | | | | Merge branch 'tb/commit-graph-no-check-oids' into masterJunio C Hamano2020-07-151-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: fix "Collecting commits from input" progress lineSZEDER Gábor2020-07-151-3/+1
* | | | | | | | | | Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano2020-07-151-7/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-diff.txt: reorder possible usagesMartin Ågren2020-07-131-6/+7
| * | | | | | | | | | git-diff.txt: don't mark required argument as optionalMartin Ågren2020-07-131-1/+1
* | | | | | | | | | | Merge branch 'sg/commit-graph-progress-fix' into masterJunio C Hamano2020-07-151-22/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit-graph: fix "Writing out commit graph" progress counterSZEDER Gábor2020-07-091-20/+2
| * | | | | | | | | | | commit-graph: fix progress of reachable commitsSZEDER Gábor2020-07-091-2/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ta/wait-on-aliased-commands-upon-signal' into masterJunio C Hamano2020-07-153-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Wait for child on signal death for aliases to externalsTrygve Aaberge2020-07-071-0/+2