summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
2019-06-13Merge branch 'js/rebase-cleanup'Junio C Hamano
2019-06-13Merge branch 'jk/unused-params-final-batch'Junio C Hamano
2019-05-30Merge branch 'js/rebase-config-bitfix'Junio C Hamano
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin
2019-05-15rebase: fold git-rebase--common into the -p backendJohannes Schindelin
2019-05-15Drop unused git-rebase--am.shJohannes Schindelin
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano
2019-05-08Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano
2019-04-19rebase -i: run without forking rebase--interactivePhillip Wood
2019-04-19rebase: use a common action enumPhillip Wood
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood
2019-04-19rebase -i: use struct rebase_options to parse argsPhillip Wood
2019-04-19rebase -i: use struct object_id for squash_ontoPhillip Wood
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood
2019-04-19rebase -i: remove duplicationPhillip Wood
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood
2019-04-19rebase: rename write_basic_state()Phillip Wood
2019-04-19rebase: don't translate trace stringsPhillip Wood
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano
2019-04-09Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano
2019-04-08builtin rebase: use oideq()SZEDER Gábor
2019-04-08builtin rebase: use FREE_AND_NULLSZEDER Gábor
2019-03-20Merge branch 'js/rebase-orig-head-fix'Junio C Hamano
2019-03-20rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason
2019-03-12rebase: deprecate --preserve-mergesJohannes Schindelin
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin
2019-03-04built-in rebase: use the correct reflog when switching branchesJohannes Schindelin
2019-03-04built-in rebase: no need to check out `onto` twiceJohannes Schindelin
2019-02-22trace2:data: add subverb for rebaseJeff Hostetler
2019-02-11Fix typos in translatable strings for v2.21.0Jean-Noël Avila
2019-02-09Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano
2019-02-07Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-02-07Merge branch 'js/rebase-am'Junio C Hamano
2019-02-07Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin
2019-02-05Merge branch 'pw/no-editor-in-rebase-i-implicit'Junio C Hamano
2019-01-29rebase -x: sanity check commandPhillip Wood
2019-01-29Merge branch 'os/rebase-runs-post-checkout-hook'Junio C Hamano
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano
2019-01-28implicit interactive rebase: don't run sequence editorPhillip Wood
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-18built-in rebase: call `git am` directlyJohannes Schindelin
2019-01-18rebase: teach `reset_head()` to optionally skip the worktreeJohannes Schindelin
2019-01-18rebase: avoid double reflog entry when switching branchesJohannes Schindelin
2019-01-18rebase: move `reset_head()` into a better spotJohannes Schindelin
2019-01-14read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-07rebase: implement --merge via the interactive machineryElijah Newren