Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | sequencer.c: split up sequencer_remove_state() | Ævar Arnfjörð Bjarmason | 2023-02-06 | 1 | -9/+14 | |
|/ / / | ||||||
* | | | rebase: cleanup "--exec" option handling | Phillip Wood | 2023-01-13 | 1 | -2/+2 | |
* | | | Merge branch 'sk/remove-duplicate-includes' | Junio C Hamano | 2022-12-26 | 1 | -1/+0 | |
|\ \ \ | |/ / | ||||||
| * | | git: remove duplicate includes | Seija Kijin | 2022-12-15 | 1 | -1/+0 | |
* | | | Merge branch 'ab/various-leak-fixes' | Junio C Hamano | 2022-12-14 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | sequencer.c: fix "opts->strategy" leak in read_strategy_opts() | Ævar Arnfjörð Bjarmason | 2022-11-21 | 1 | -0/+1 | |
* | | | Merge branch 'ab/fewer-the-index-macros' | Junio C Hamano | 2022-11-28 | 1 | -6/+9 | |
|\ \ \ | ||||||
| * | | | read-cache API & users: make discard_index() return void | Ævar Arnfjörð Bjarmason | 2022-11-21 | 1 | -6/+9 | |
* | | | | Merge branch 'pw/rebase-no-reflog-action' | Junio C Hamano | 2022-11-23 | 1 | -20/+25 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | sequencer: stop exporting GIT_REFLOG_ACTION | Phillip Wood | 2022-11-09 | 1 | -20/+25 | |
* | | | | Merge branch 'pw/strict-label-lookups' | Junio C Hamano | 2022-11-23 | 1 | -25/+28 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | sequencer: tighten label lookups | Phillip Wood | 2022-11-10 | 1 | -6/+8 | |
| * | | | sequencer: unify label lookup | Phillip Wood | 2022-11-10 | 1 | -24/+25 | |
* | | | | Merge branch 'vd/skip-cache-tree-update' | Taylor Blau | 2022-11-18 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | rebase: use 'skip_cache_tree_update' option | Victoria Dye | 2022-11-10 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'vd/update-refs-delete' | Taylor Blau | 2022-11-18 | 1 | -3/+6 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | rebase --update-refs: avoid unintended ref deletion | Victoria Dye | 2022-11-07 | 1 | -3/+6 | |
| |/ / | ||||||
* | | | Merge branch 'rs/no-more-run-command-v' | Taylor Blau | 2022-11-08 | 1 | -18/+14 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | replace and remove run_command_v_opt() | René Scharfe | 2022-10-30 | 1 | -2/+4 | |
| * | | use child_process members "args" and "env" directly | René Scharfe | 2022-10-30 | 1 | -15/+10 | |
| * | | sequencer: simplify building argument list in do_exec() | René Scharfe | 2022-10-30 | 1 | -2/+1 | |
* | | | Merge branch 'pw/rebase-reflog-fixes' | Taylor Blau | 2022-10-30 | 1 | -0/+5 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | rebase --merge: fix reflog when continuing | Phillip Wood | 2022-10-17 | 1 | -0/+5 | |
* | | | Merge branch 'jk/sequencer-missing-author-name-check' | Junio C Hamano | 2022-10-11 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | sequencer: detect author name errors in read_author_script() | Jeff King | 2022-10-03 | 1 | -1/+1 | |
* | | | | Merge branch 'ja/rebase-i-avoid-amending-self' | Junio C Hamano | 2022-10-10 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | sequencer: avoid dropping fixup commit that targets self via commit-ish | Johannes Altmanninger | 2022-09-26 | 1 | -2/+2 | |
| * | | | | Merge branch 'rs/commit-summary-wo-break-rewrite' into maint | Junio C Hamano | 2022-06-08 | 1 | -1/+0 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'ab/unused-annotation' | Junio C Hamano | 2022-09-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | git-compat-util.h: use "UNUSED", not "UNUSED(var)" | Ævar Arnfjörð Bjarmason | 2022-09-01 | 1 | -2/+2 | |
* | | | | | | | Merge branch 'jk/unused-annotation' | Junio C Hamano | 2022-09-14 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | hashmap: mark unused callback parameters | Jeff King | 2022-08-19 | 1 | -2/+3 | |
* | | | | | | | sequencer: do not translate command names | Michael J Gruber | 2022-08-19 | 1 | -2/+2 | |
* | | | | | | | sequencer: do not translate parameters to error_resolve_conflict() | Michael J Gruber | 2022-08-19 | 1 | -2/+2 | |
* | | | | | | | sequencer: do not translate reflog messages | Michael J Gruber | 2022-08-19 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | sequencer: notify user of --update-refs activity | Derrick Stolee | 2022-07-19 | 1 | -6/+34 | |
* | | | | | | sequencer: ignore HEAD ref under --update-refs | Derrick Stolee | 2022-07-19 | 1 | -0/+13 | |
* | | | | | | sequencer: rewrite update-refs as user edits todo list | Derrick Stolee | 2022-07-19 | 1 | -0/+96 | |
* | | | | | | rebase: update refs from 'update-ref' commands | Derrick Stolee | 2022-07-19 | 1 | -3/+117 | |
* | | | | | | rebase: add --update-refs option | Derrick Stolee | 2022-07-19 | 1 | -0/+107 | |
* | | | | | | sequencer: add update-ref command | Derrick Stolee | 2022-07-19 | 1 | -1/+13 | |
* | | | | | | sequencer: define array with enum values | Derrick Stolee | 2022-07-19 | 1 | -14/+14 | |
* | | | | | | branch: consider refs under 'update-refs' | Derrick Stolee | 2022-07-19 | 1 | -0/+74 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'jc/revert-show-parent-info' | Junio C Hamano | 2022-06-15 | 1 | -5/+28 | |
|\ \ \ \ \ | ||||||
| * | | | | | revert: --reference should apply only to 'revert', not 'cherry-pick' | Junio C Hamano | 2022-05-31 | 1 | -1/+1 | |
| * | | | | | revert: optionally refer to commit in the "reference" format | Junio C Hamano | 2022-05-26 | 1 | -5/+28 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'ab/env-array' | Junio C Hamano | 2022-06-10 | 1 | -9/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | run-command API users: use "env" not "env_array" in comments & names | Ævar Arnfjörð Bjarmason | 2022-06-02 | 1 | -3/+3 | |
| * | | | | | run-command API: rename "env_array" to "env" | Ævar Arnfjörð Bjarmason | 2022-06-02 | 1 | -8/+8 | |
* | | | | | | Merge branch 'ab/plug-leak-in-revisions' | Junio C Hamano | 2022-06-07 | 1 | -7/+19 | |
|\ \ \ \ \ \ |