summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | subtree: add 'die_incompatible_opt' function to reduce duplicationPhilippe Blain2022-10-211-12/+20
| * | | | | | | | subtree: use 'git rev-parse --verify [--quiet]' for better error messagesPhilippe Blain2022-10-211-3/+3
| * | | | | | | | test-lib-functions: mark 'test_commit' variables as 'local'Philippe Blain2022-10-211-8/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'pw/rebase-reflog-fixes'Taylor Blau2022-10-313-121/+215
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: cleanup action handlingPhillip Wood2022-10-171-49/+44
| * | | | | | | | rebase --abort: improve reflog messagePhillip Wood2022-10-172-20/+59
| * | | | | | | | rebase --apply: make reflog messages match rebase --mergePhillip Wood2022-10-172-5/+6
| * | | | | | | | rebase --apply: respect GIT_REFLOG_ACTIONPhillip Wood2022-10-172-4/+5
| * | | | | | | | rebase --merge: fix reflog message after skippingPhillip Wood2022-10-172-2/+24
| * | | | | | | | rebase --merge: fix reflog when continuingPhillip Wood2022-10-173-4/+12
| * | | | | | | | t3406: rework rebase reflog testsPhillip Wood2022-10-171-39/+76
| * | | | | | | | rebase --apply: remove duplicated codePhillip Wood2022-10-171-10/+1
| * | | | | | | | Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixesJunio C Hamano2022-10-176-88/+172
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau2022-10-316-89/+172
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | rebase --keep-base: imply --no-fork-pointPhillip Wood2022-10-173-5/+11
| * | | | | | | | | rebase --keep-base: imply --reapply-cherry-picksPhillip Wood2022-10-173-11/+52
| * | | | | | | | | rebase: factor out branch_base calculationPhillip Wood2022-10-171-13/+20
| * | | | | | | | | rebase: rename merge_base to branch_basePhillip Wood2022-10-171-15/+15
| * | | | | | | | | rebase: store orig_head as a commitPhillip Wood2022-10-171-35/+31
| * | | | | | | | | rebase: be stricter when reading state files containing oidsPhillip Wood2022-10-173-4/+25
| * | | | | | | | | t3416: set $EDITOR in subshellPhillip Wood2022-10-171-10/+21
| * | | | | | | | | t3416: tighten two testsPhillip Wood2022-10-171-4/+6
* | | | | | | | | | Merge branch 'jh/trace2-timers-and-counters'Taylor Blau2022-10-3117-102/+1361
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | trace2: add global counter mechanismJeff Hostetler2022-10-2413-7/+517
| * | | | | | | | | | trace2: add stopwatch timersJeff Hostetler2022-10-2415-0/+786
| * | | | | | | | | | trace2: convert ctx.thread_name from strbuf to pointerJeff Hostetler2022-10-244-10/+12
| * | | | | | | | | | trace2: improve thread-name documentation in the thread-contextJeff Hostetler2022-10-241-6/+9
| * | | | | | | | | | trace2: rename the thread_name argument to trace2_thread_startJeff Hostetler2022-10-244-11/+12
| * | | | | | | | | | api-trace2.txt: elminate section describing the public trace2 APIJeff Hostetler2022-10-241-54/+7
| * | | | | | | | | | tr2tls: clarify TLS terminologyJeff Hostetler2022-10-245-20/+24
| * | | | | | | | | | trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctxJeff Hostetler2022-10-241-2/+2
* | | | | | | | | | | Merge branch 'tb/shortlog-group'Taylor Blau2022-10-315-27/+113
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shortlog: implement `--group=committer` in terms of `--group=<format>`Taylor Blau2022-10-241-11/+3
| * | | | | | | | | | | shortlog: implement `--group=author` in terms of `--group=<format>`Taylor Blau2022-10-241-9/+4
| * | | | | | | | | | | shortlog: extract `shortlog_finish_setup()`Taylor Blau2022-10-243-1/+8
| * | | | | | | | | | | shortlog: support arbitrary commit format `--group`sTaylor Blau2022-10-244-2/+78
| * | | | | | | | | | | shortlog: extract `--group` fragment for translationTaylor Blau2022-10-241-1/+1
| * | | | | | | | | | | shortlog: make trailer insertion a noop when appropriateTaylor Blau2022-10-241-3/+4
| * | | | | | | | | | | shortlog: accept `--date`-related optionsJeff King2022-10-244-1/+16
* | | | | | | | | | | | Merge branch 'rs/absorb-git-dir-simplify'Taylor Blau2022-10-311-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule: use strvec_pushf() for --super-prefixRené Scharfe2022-10-231-9/+3
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/repack-tempfile-cleanup'Taylor Blau2022-10-312-61/+45
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t7700: annotate cruft-pack failure with ok=sigpipeJeff King2022-10-231-1/+1
| * | | | | | | | | | | | repack: drop remove_temporary_files()Jeff King2022-10-222-32/+8
| * | | | | | | | | | | | repack: use tempfiles for signal cleanupJeff King2022-10-222-18/+16
| * | | | | | | | | | | | repack: expand error message for missing pack filesJeff King2022-10-221-1/+2
| * | | | | | | | | | | | repack: populate extension bits incrementallyJeff King2022-10-221-6/+9
| * | | | | | | | | | | | repack: convert "names" util bitfield to arrayJeff King2022-10-221-8/+14
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sg/stable-docdep'Taylor Blau2022-10-311-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/build-docdep.perl: generate sorted outputSZEDER Gábor2022-10-211-2/+3
| |/ / / / / / / / / / /