summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/parse-options-cleanup'Junio C Hamano2021-12-151-3/+4
|\
| * parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()Ævar Arnfjörð Bjarmason2021-11-111-3/+4
* | Merge branch 're/color-default-reset'Junio C Hamano2021-12-154-13/+80
|\ \
| * | color: allow colors to be prefixed with "reset"Robert Estelle2021-10-284-7/+21
| * | color: support "default" to restore fg/bg colorRobert Estelle2021-10-284-6/+51
| * | color: add missing GIT_COLOR_* white/black constantsRobert Estelle2021-10-281-0/+8
* | | Merge branch 'jc/reflog-iterator-callback-doc'Junio C Hamano2021-12-151-1/+23
|\ \ \
| * | | refs: document callback for reflog-ent iteratorsJunio C Hamano2021-11-281-1/+23
* | | | Merge branch 'ew/test-wo-fsync'Junio C Hamano2021-12-156-2/+48
|\ \ \ \
| * | | | tests: disable fsync everywhereEric Wong2021-10-296-2/+48
* | | | | Merge branch 'ew/cbtree-remove-unused-and-broken-cb-unlink'Junio C Hamano2021-12-152-33/+0
|\ \ \ \ \
| * | | | | cbtree: remove broken and unused cb_unlinkEric Wong2021-12-082-33/+0
* | | | | | Merge branch 'ds/sparse-deep-pattern-checkout-fix'Junio C Hamano2021-12-152-7/+23
|\ \ \ \ \ \
| * | | | | | unpack-trees: use traverse_path instead of nameDerrick Stolee2021-12-062-7/+9
| * | | | | | t1092: add deeper changes during a checkoutDerrick Stolee2021-12-061-1/+15
| |/ / / / /
* | | | | | Merge branch 'tb/pack-revindex-on-disk-cleanup'Junio C Hamano2021-12-152-2/+2
|\ \ \ \ \ \
| * | | | | | packfile: make `close_pack_revindex()` staticTaylor Blau2021-12-052-2/+2
* | | | | | | Merge branch 'es/doc-stdout-vs-stderr'Junio C Hamano2021-12-151-0/+27
|\ \ \ \ \ \ \
| * | | | | | | CodingGuidelines: document which output goes to stdout vs. stderrEric Sunshine2021-12-051-0/+27
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'js/test-initial-branch-override-cleanup'Junio C Hamano2021-12-1517-50/+0
|\ \ \ \ \ \ \
| * | | | | | | tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when neededJohannes Schindelin2021-12-0517-50/+0
* | | | | | | | Merge branch 'es/worktree-chatty-to-stderr'Junio C Hamano2021-12-155-34/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | git-worktree.txt: add missing `-v` to synopsis for `worktree list`Eric Sunshine2021-12-051-1/+1
| * | | | | | | | worktree: send "chatty" messages to stderrEric Sunshine2021-12-054-33/+27
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ab/ci-updates'Junio C Hamano2021-12-1510-165/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | CI: don't run "make test" twice in one jobÆvar Arnfjörð Bjarmason2021-11-242-12/+20
| * | | | | | | | CI: use "$runs_on_pool", not "$jobname" to select packages & configÆvar Arnfjörð Bjarmason2021-11-243-28/+29
| * | | | | | | | CI: rename the "Linux32" job to lower-case "linux32"Ævar Arnfjörð Bjarmason2021-11-245-5/+6
| * | | | | | | | CI: use shorter names that fit in UX tooltipsÆvar Arnfjörð Bjarmason2021-11-242-2/+10
| * | | | | | | | CI: remove Travis CI supportÆvar Arnfjörð Bjarmason2021-11-247-118/+7
* | | | | | | | | Merge branch 'hn/reflog-tests'Junio C Hamano2021-12-157-19/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs/debug: trim trailing LF from reflog messageHan-Wen Nienhuys2021-12-021-2/+5
| * | | | | | | | | test-ref-store: tweaks to for-each-reflog-ent formatHan-Wen Nienhuys2021-12-022-7/+11
| * | | | | | | | | t1405: check for_each_reflog_ent_reverse() more thoroughlyHan-Wen Nienhuys2021-12-021-0/+1
| * | | | | | | | | test-ref-store: don't add newline to reflog messageHan-Wen Nienhuys2021-12-023-8/+6
| * | | | | | | | | show-branch: show reflog messageHan-Wen Nienhuys2021-12-022-5/+22
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rj/receive-pack-avoid-sigpipe-during-status-reporting'Junio C Hamano2021-12-151-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: ignore SIGPIPE while reporting status to clientRobin Jarry2021-11-101-0/+2
* | | | | | | | | | Merge branch 'es/pretty-describe-more'Junio C Hamano2021-12-153-15/+75
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: add abbrev option to %(describe)Eli Schwartz2021-11-013-0/+27
| * | | | | | | | | | pretty: add tag option to %(describe)Eli Schwartz2021-11-013-5/+27
| * | | | | | | | | | pretty.c: rework describe options parsing for better extensibilityEli Schwartz2021-11-011-10/+21
* | | | | | | | | | | Merge branch 'ab/run-command'Junio C Hamano2021-12-1533-223/+157
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | run-command API: remove "env" member, always use "env_array"Ævar Arnfjörð Bjarmason2021-11-268-42/+40
| * | | | | | | | | | | difftool: use "env_array" to simplify memory managementÆvar Arnfjörð Bjarmason2021-11-261-10/+4
| * | | | | | | | | | | run-command API: remove "argv" member, always use "args"Ævar Arnfjörð Bjarmason2021-11-266-39/+33
| * | | | | | | | | | | run-command API users: use strvec_push(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-266-53/+31
| * | | | | | | | | | | run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-2610-61/+29
| * | | | | | | | | | | run-command tests: use strvec_pushv(), not argv assignmentÆvar Arnfjörð Bjarmason2021-11-261-4/+5
| * | | | | | | | | | | run-command API users: use strvec_pushv(), not argv assignmentÆvar Arnfjörð Bjarmason2021-11-267-9/+10