summaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/rebase-apply-leakfix'Junio C Hamano2024-04-011-3/+3
|\
| * rebase: use child_process_clear() to cleanJeff King2024-03-221-3/+3
* | Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano2024-03-181-11/+3
|\ \
| * | rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood2024-02-271-11/+3
* | | Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-3/+5
|\ \ \
| * | | commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-3/+5
| |/ /
* | | Merge branch 'hs/rebase-not-in-progress' into HEADJunio C Hamano2024-03-011-1/+1
|\ \ \ | |/ / |/| |
| * | rebase: make warning less passive aggressiveHarmen Stoppels2024-02-211-1/+1
| |/
* | refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt2024-01-191-1/+1
* | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-4/+0
|\ \
| * | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-4/+0
* | | Merge branch 'rs/rebase-use-strvec-pushf'Junio C Hamano2024-01-021-11/+6
|\ \ \
| * | | rebase: use strvec_pushf() for format-patch revisionsRené Scharfe2023-12-201-11/+6
| | |/ | |/|
* | | rebase: support --autosquash without -iAndy Koppe2023-11-161-3/+1
* | | rebase: fully ignore rebase.autoSquash without -iAndy Koppe2023-11-161-7/+6
| |/ |/|
* | Merge branch 'rs/fix-arghelp'Junio C Hamano2023-11-071-1/+1
|\ \
| * | am, rebase: fix arghelp syntax of --emptyRené Scharfe2023-10-291-1/+1
* | | rebase: move parse_opt_keep_empty() downOswald Buddenhagen2023-10-201-13/+12
* | | rebase: handle --strategy via imply_merge() as wellOswald Buddenhagen2023-10-201-12/+1
* | | rebase: simplify code related to imply_merge()Oswald Buddenhagen2023-10-201-5/+1
* | | diff --stat: set the width defaults in a helper functionDragan Simic2023-09-301-3/+1
* | | diff --stat: add config option to limit filename widthDragan Simic2023-09-181-0/+1
|/ /
* | Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-1/+0
|\ \
| * | treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-2/+3
|\ \ \
| * | | config: add ctx arg to config_fn_tGlen Choo2023-06-281-2/+3
* | | | Merge branch 'cw/strbuf-cleanup'Junio C Hamano2023-07-061-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | strbuf: remove global variableCalvin Wan2023-06-121-1/+1
| |/ /
* / / repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
|/ /
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+3
|\ \
| * | object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | treewide: be explicit about dependence on trace.h & trace2.hElijah Newren2023-04-111-0/+1
| * | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-9/+12
| |\ \
* | \ \ Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano2023-04-181-44/+10
|\ \ \ \
| * | | | rebase -m: cleanup --strategy-option handlingPhillip Wood2023-04-101-20/+10
| * | | | rebase: stop reading and writing unnecessary strategy statePhillip Wood2023-04-101-24/+0
* | | | | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | | | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-9/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | | cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * | | | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-5/+7
| | |_|/ | |/| |
* | | | Merge branch 'ah/rebase-merges-config'Junio C Hamano2023-04-041-15/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | rebase: add a config option for --rebase-mergesAlex Henrie2023-03-271-19/+55
| * | | rebase: deprecate --rebase-merges=""Alex Henrie2023-03-271-2/+6
| | |/ | |/|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 20:38:56 +0100