summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano
2019-04-09Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano
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
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2019-01-02rebase: run post-checkout hook on checkoutOrgad Shaneh
2018-12-28git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren
2018-12-28rebase: fix incompatible options error messageElijah Newren
2018-12-28rebase: make builtin and legacy script error messages the sameElijah Newren
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin
2018-12-01Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano
2018-12-01Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano
2018-12-01builtin/rebase.c: remove superfluous space in messagesRalf Thielow
2018-11-30rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin
2018-11-30rebase: fix GIT_REFLOG_ACTION regressionJohannes Schindelin
2018-11-21Merge branch 'js/builtin-rebase-perf-fix-err-fix'Junio C Hamano
2018-11-21rebase: warn about the correct tree's OIDJohannes Schindelin
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Junio C Hamano
2018-11-18Merge branch 'js/rebase-am-options'Junio C Hamano
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Junio C Hamano
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Junio C Hamano
2018-11-16tests: add a special setup where rebase.useBuiltin is offÆvar Arnfjörð Bjarmason