summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-send-email: die if sendmail.* config is setDrew DeVault2020-07-234-0/+68
* 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
| * | | | | | | | Wait for child on signal death for aliases to builtinsTrygve Aaberge2020-07-073-1/+3
* | | | | | | | | Git 2.28-rc0v2.28.0-rc0Junio C Hamano2020-07-091-3/+27
* | | | | | | | | Merge branch 'mt/entry-fstat-fallback-fix' into masterJunio C Hamano2020-07-091-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | entry: check for fstat() errors after checkoutMatheus Tavares2020-07-091-2/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-rebase.txt: fix description list separatorMartin Ågren2020-07-091-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into masterJunio C Hamano2020-07-093-14/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | experimental: default to fetch.writeCommitGraph=falseJonathan Nieder2020-07-083-14/+5
* | | | | | | | | | Merge branch 'tb/fix-persistent-shallow' into masterJunio C Hamano2020-07-094-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit.c: don't persist substituted parents when unshallowingTaylor Blau2020-07-084-1/+19
* | | | | | | | | | | Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | diff: check for merge bases before assigning sym->baseJeff King2020-07-081-1/+1
* | | | | | | | | | | Merge branch 'rs/line-log-until' into masterJunio C Hamano2020-07-092-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision: disable min_age optimization with line-logRené Scharfe2020-07-062-1/+10
* | | | | | | | | | | | Merge branch 'ra/send-email-in-reply-to-from-command-line-wins' into masterJunio C Hamano2020-07-092-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-email: restore --in-reply-to superseding behaviorRafael Aquini2020-07-012-3/+19
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'vs/completion-with-set-u' into masterJunio C Hamano2020-07-091-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: nounset mode fixesVille Skyttä2020-07-011-9/+9
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cc/cat-file-usage-update' into masterJunio C Hamano2020-07-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | cat-file: add missing [=<format>] to usage/synopsisChristian Couder2020-07-012-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | The seventh batchJunio C Hamano2020-07-061-0/+35