Commit Graph

297 Commits (bcd020f88e1e22f38422ac3f73ab06b34ec4bef1)

Author SHA1 Message Date
Phillip Wood cd1528ef8e rebase --apply: set ORIG_HEAD correctly 10 months ago
Phillip Wood 7700ab087b rebase --apply: fix reflog 10 months ago
Phillip Wood 6ae8086161 reset_head(): take struct rebase_head_opts 10 months ago
Phillip Wood ee464c4e37 rebase: cleanup reset_head() calls 10 months ago
Phillip Wood b7de153bd9 create_autostash(): remove unneeded parameter 10 months ago
Phillip Wood 1526d0fcfd reset_head(): make default_reflog_action optional 10 months ago
Phillip Wood 1946d45844 reset_head(): remove action parameter 10 months ago
Phillip Wood ae42fa4c03 rebase: factor out checkout for up to date branch 10 months ago
Emily Shaffer 25d4e02cfc rebase: convert pre-rebase to use hook.h 11 months ago
Jean-Noël Avila 246cac8505 i18n: turn even more messages into "cannot be used together" ones 11 months ago
Jean-Noël Avila 12909b6b8a i18n: turn "options are incompatible" into "cannot be used together" 11 months ago
Phillip Wood 7740ac691d rebase: dereference tags 1 year ago
Phillip Wood 1d188263e0 rebase: use lookup_commit_reference_by_name() 1 year ago
Phillip Wood 35f070b4de rebase: use our standard error return value 1 year ago
Derrick Stolee 516680ba77 sparse-index: integrate with cherry-pick and rebase 1 year ago
Johannes Schindelin 5a22a334cb run_auto_maintenance(): implicitly close the object store 1 year ago
Johannes Schindelin 82db1f8439 rebase: stop mentioning the -p option in comments 1 year ago
Johannes Schindelin ff8d6e5a66 rebase: remove obsolete code comment 1 year ago
Johannes Schindelin 5b55b32bd2 rebase: drop the internal `rebase--interactive` command 1 year ago
Johannes Schindelin a74b35081c rebase: drop support for `--preserve-merges` 1 year ago
Josh Steadmon 767a4ca648 sequencer: advise if skipping cherry-picked commit 1 year ago
Ævar Arnfjörð Bjarmason 0160f7e725 rebase: emit one "fatal" in "fatal: fatal: <error>" 1 year ago
Elijah Newren 6a5fb96672 Change default merge backend from recursive to ort 1 year ago
Andrzej Hunt b54cf3a766 builtin/rebase: fix options.strategy memory lifecycle 1 year ago
Andrzej Hunt 805b789a69 builtin/rebase: release git_format_patch_opt too 2 years ago
brian m. carlson 14228447c9 hash: provide per-algorithm null OIDs 2 years ago
Ævar Arnfjörð Bjarmason 9bcde4d531 rebase: remove transitory rebase.useBuiltin setting & env 2 years ago
Elijah Newren 5291828df8 merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict 2 years ago
Alex Henrie 2803d800d2 rebase: add a config option for --no-fork-point 2 years ago
René Scharfe ca5120c339 rebase: verify commit parameter 2 years ago
Phillip Wood 8843302307 rebase -i: simplify get_revision_ranges() 2 years ago
Phillip Wood a2bb10d06d rebase -i: use struct object_id when writing state 2 years ago
Phillip Wood f3e27a02d5 rebase -i: use struct object_id rather than looking up commit 2 years ago
Phillip Wood e100bea481 rebase -i: stop overwriting ORIG_HEAD buffer 2 years ago
Elijah Newren 14c4586c2d merge,rebase,revert: select ort or recursive by config or environment 2 years ago
Bradley M. Kuhn 3abd4a67d9 Documentation: stylistically normalize references to Signed-off-by: 2 years ago
Derrick Stolee a95ce12430 maintenance: replace run_auto_gc() 2 years ago
Rohit Ashiwal 27126692ba rebase: add --reset-author-date 2 years ago
Phillip Wood a3894aad67 rebase -i: support --ignore-date 2 years ago
Phillip Wood 7573cec52c rebase -i: support --committer-date-is-author-date 2 years ago
Jeff King d70a9eb611 strvec: rename struct fields 2 years ago
Jeff King f6d8942b1f strvec: fix indentation in renamed calls 2 years ago
Jeff King 22f9b7f3f5 strvec: convert builtin/ callers away from argv_array name 2 years ago
Jeff King dbbcd44fb4 strvec: rename files from argv-array to strvec 2 years ago
Rohit Ashiwal ef484add9f rebase -i: add --ignore-whitespace flag 2 years ago
Junio C Hamano 7c3e9e8cfb auto-gc: pass --quiet down from am, commit, merge and rebase 3 years ago
Denton Liu 9b2df3e8d0 rebase: save autostash entry into stash reflog on --quit 3 years ago
Denton Liu 203c85339f Use OPT_CALLBACK and OPT_CALLBACK_F 3 years ago
Elijah Newren a35413c378 rebase: display an error if --root and --fork-point are both provided 3 years ago
Jonathan Tan 0fcb4f6b62 rebase --merge: optionally skip upstreamed commits 3 years ago