Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | subtree: add 'die_incompatible_opt' function to reduce duplication | Philippe Blain | 2022-10-21 | 1 | -12/+20 | |
| * | | | | | | | | subtree: use 'git rev-parse --verify [--quiet]' for better error messages | Philippe Blain | 2022-10-21 | 1 | -3/+3 | |
| * | | | | | | | | test-lib-functions: mark 'test_commit' variables as 'local' | Philippe Blain | 2022-10-21 | 1 | -8/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'pw/rebase-reflog-fixes' | Taylor Blau | 2022-10-31 | 3 | -121/+215 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | rebase: cleanup action handling | Phillip Wood | 2022-10-17 | 1 | -49/+44 | |
| * | | | | | | | | rebase --abort: improve reflog message | Phillip Wood | 2022-10-17 | 2 | -20/+59 | |
| * | | | | | | | | rebase --apply: make reflog messages match rebase --merge | Phillip Wood | 2022-10-17 | 2 | -5/+6 | |
| * | | | | | | | | rebase --apply: respect GIT_REFLOG_ACTION | Phillip Wood | 2022-10-17 | 2 | -4/+5 | |
| * | | | | | | | | rebase --merge: fix reflog message after skipping | Phillip Wood | 2022-10-17 | 2 | -2/+24 | |
| * | | | | | | | | rebase --merge: fix reflog when continuing | Phillip Wood | 2022-10-17 | 3 | -4/+12 | |
| * | | | | | | | | t3406: rework rebase reflog tests | Phillip Wood | 2022-10-17 | 1 | -39/+76 | |
| * | | | | | | | | rebase --apply: remove duplicated code | Phillip Wood | 2022-10-17 | 1 | -10/+1 | |
| * | | | | | | | | Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes | Junio C Hamano | 2022-10-17 | 6 | -88/+172 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ | Merge branch 'pw/rebase-keep-base-fixes' | Taylor Blau | 2022-10-31 | 6 | -89/+172 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | rebase --keep-base: imply --no-fork-point | Phillip Wood | 2022-10-17 | 3 | -5/+11 | |
| * | | | | | | | | | rebase --keep-base: imply --reapply-cherry-picks | Phillip Wood | 2022-10-17 | 3 | -11/+52 | |
| * | | | | | | | | | rebase: factor out branch_base calculation | Phillip Wood | 2022-10-17 | 1 | -13/+20 | |
| * | | | | | | | | | rebase: rename merge_base to branch_base | Phillip Wood | 2022-10-17 | 1 | -15/+15 | |
| * | | | | | | | | | rebase: store orig_head as a commit | Phillip Wood | 2022-10-17 | 1 | -35/+31 | |
| * | | | | | | | | | rebase: be stricter when reading state files containing oids | Phillip Wood | 2022-10-17 | 3 | -4/+25 | |
| * | | | | | | | | | t3416: set $EDITOR in subshell | Phillip Wood | 2022-10-17 | 1 | -10/+21 | |
| * | | | | | | | | | t3416: tighten two tests | Phillip Wood | 2022-10-17 | 1 | -4/+6 | |
* | | | | | | | | | | Merge branch 'jh/trace2-timers-and-counters' | Taylor Blau | 2022-10-31 | 17 | -102/+1361 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | trace2: add global counter mechanism | Jeff Hostetler | 2022-10-24 | 13 | -7/+517 | |
| * | | | | | | | | | | trace2: add stopwatch timers | Jeff Hostetler | 2022-10-24 | 15 | -0/+786 | |
| * | | | | | | | | | | trace2: convert ctx.thread_name from strbuf to pointer | Jeff Hostetler | 2022-10-24 | 4 | -10/+12 | |
| * | | | | | | | | | | trace2: improve thread-name documentation in the thread-context | Jeff Hostetler | 2022-10-24 | 1 | -6/+9 | |
| * | | | | | | | | | | trace2: rename the thread_name argument to trace2_thread_start | Jeff Hostetler | 2022-10-24 | 4 | -11/+12 | |
| * | | | | | | | | | | api-trace2.txt: elminate section describing the public trace2 API | Jeff Hostetler | 2022-10-24 | 1 | -54/+7 | |
| * | | | | | | | | | | tr2tls: clarify TLS terminology | Jeff Hostetler | 2022-10-24 | 5 | -20/+24 | |
| * | | | | | | | | | | trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx | Jeff Hostetler | 2022-10-24 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'tb/shortlog-group' | Taylor Blau | 2022-10-31 | 5 | -27/+113 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | shortlog: implement `--group=committer` in terms of `--group=<format>` | Taylor Blau | 2022-10-24 | 1 | -11/+3 | |
| * | | | | | | | | | | | shortlog: implement `--group=author` in terms of `--group=<format>` | Taylor Blau | 2022-10-24 | 1 | -9/+4 | |
| * | | | | | | | | | | | shortlog: extract `shortlog_finish_setup()` | Taylor Blau | 2022-10-24 | 3 | -1/+8 | |
| * | | | | | | | | | | | shortlog: support arbitrary commit format `--group`s | Taylor Blau | 2022-10-24 | 4 | -2/+78 | |
| * | | | | | | | | | | | shortlog: extract `--group` fragment for translation | Taylor Blau | 2022-10-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | shortlog: make trailer insertion a noop when appropriate | Taylor Blau | 2022-10-24 | 1 | -3/+4 | |
| * | | | | | | | | | | | shortlog: accept `--date`-related options | Jeff King | 2022-10-24 | 4 | -1/+16 | |
* | | | | | | | | | | | | Merge branch 'rs/absorb-git-dir-simplify' | Taylor Blau | 2022-10-31 | 1 | -9/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | submodule: use strvec_pushf() for --super-prefix | René Scharfe | 2022-10-23 | 1 | -9/+3 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/repack-tempfile-cleanup' | Taylor Blau | 2022-10-31 | 2 | -61/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t7700: annotate cruft-pack failure with ok=sigpipe | Jeff King | 2022-10-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | repack: drop remove_temporary_files() | Jeff King | 2022-10-22 | 2 | -32/+8 | |
| * | | | | | | | | | | | | repack: use tempfiles for signal cleanup | Jeff King | 2022-10-22 | 2 | -18/+16 | |
| * | | | | | | | | | | | | repack: expand error message for missing pack files | Jeff King | 2022-10-22 | 1 | -1/+2 | |
| * | | | | | | | | | | | | repack: populate extension bits incrementally | Jeff King | 2022-10-22 | 1 | -6/+9 | |
| * | | | | | | | | | | | | repack: convert "names" util bitfield to array | Jeff King | 2022-10-22 | 1 | -8/+14 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'sg/stable-docdep' | Taylor Blau | 2022-10-31 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/build-docdep.perl: generate sorted output | SZEDER Gábor | 2022-10-21 | 1 | -2/+3 | |
| |/ / / / / / / / / / / |