summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2019-03-12rebase: deprecate --preserve-mergesLibravatar Johannes Schindelin1-2/+6
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseLibravatar Johannes Schindelin1-13/+18
2019-03-04built-in rebase: use the correct reflog when switching branchesLibravatar Johannes Schindelin1-1/+1
2019-03-04built-in rebase: no need to check out `onto` twiceLibravatar Johannes Schindelin1-2/+2
2019-02-22trace2:data: add subverb for rebaseLibravatar Jeff Hostetler1-0/+17
2019-02-11Fix typos in translatable strings for v2.21.0Libravatar Jean-Noël Avila1-1/+1
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Libravatar Junio C Hamano1-21/+0
2019-02-06Merge branch 'pw/rebase-x-sanity-check'Libravatar Junio C Hamano1-0/+17
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-7/+7
2019-02-06Merge branch 'js/rebase-am'Libravatar Junio C Hamano1-125/+311
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-20/+10
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Libravatar Johannes Schindelin1-21/+0
2019-02-05Merge branch 'pw/no-editor-in-rebase-i-implicit'Libravatar Junio C Hamano1-2/+3
2019-01-29rebase -x: sanity check commandLibravatar Phillip Wood1-0/+17
2019-01-29Merge branch 'os/rebase-runs-post-checkout-hook'Libravatar Junio C Hamano1-2/+10
2019-01-29Merge branch 'js/rebase-i-redo-exec'Libravatar Junio C Hamano1-1/+41
2019-01-28implicit interactive rebase: don't run sequence editorLibravatar Phillip Wood1-2/+3
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-18built-in rebase: call `git am` directlyLibravatar Johannes Schindelin1-0/+179
2019-01-18rebase: teach `reset_head()` to optionally skip the worktreeLibravatar Johannes Schindelin1-1/+7
2019-01-18rebase: avoid double reflog entry when switching branchesLibravatar Johannes Schindelin1-3/+4
2019-01-18rebase: move `reset_head()` into a better spotLibravatar Johannes Schindelin1-119/+119
2019-01-14read-cache.c: replace update_index_if_able with repo_&Libravatar Nguyễn Thái Ngọc Duy1-3/+2
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-4/+4
2019-01-07rebase: implement --merge via the interactive machineryLibravatar Elijah Newren1-9/+6
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-8/+9
2019-01-02rebase: run post-checkout hook on checkoutLibravatar Orgad Shaneh1-2/+10
2018-12-28git-rebase, sequencer: extend --quiet option for the interactive machineryLibravatar Elijah Newren1-4/+1
2018-12-28rebase: fix incompatible options error messageLibravatar Elijah Newren1-7/+3
2018-12-28rebase: make builtin and legacy script error messages the sameLibravatar Elijah Newren1-5/+5
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execLibravatar Johannes Schindelin1-0/+21
2018-12-11rebase: add a config option to default to --reschedule-failed-execLibravatar Johannes Schindelin1-0/+5
2018-12-11rebase: introduce --reschedule-failed-execLibravatar Johannes Schindelin1-1/+15
2018-12-01Merge branch 'rt/rebase-in-c-message-fix'Libravatar Junio C Hamano1-2/+2
2018-12-01Merge branch 'js/rebase-stat-unrelated-fix'Libravatar Junio C Hamano1-6/+12
2018-12-01builtin/rebase.c: remove superfluous space in messagesLibravatar Ralf Thielow1-2/+2
2018-11-30rebase --stat: fix when rebasing to an unrelated historyLibravatar Johannes Schindelin1-6/+12
2018-11-30rebase: fix GIT_REFLOG_ACTION regressionLibravatar Johannes Schindelin1-3/+26
2018-11-21Merge branch 'js/builtin-rebase-perf-fix-err-fix'Libravatar Junio C Hamano1-1/+2
2018-11-21rebase: warn about the correct tree's OIDLibravatar Johannes Schindelin1-1/+2
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Libravatar Junio C Hamano1-1/+4
2018-11-18Merge branch 'js/rebase-am-options'Libravatar Junio C Hamano1-63/+45
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Libravatar Junio C Hamano1-0/+3
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Libravatar Junio C Hamano1-33/+46
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Libravatar Junio C Hamano1-1/+2
2018-11-16tests: add a special setup where rebase.useBuiltin is offLibravatar Ævar Arnfjörð Bjarmason1-1/+4
2018-11-16rebase: validate -C<n> and --whitespace=<mode> parameters earlyLibravatar Johannes Schindelin1-1/+11
2018-11-16rebase: really just passthru the `git am` optionsLibravatar Johannes Schindelin1-63/+35
2018-11-13built-in rebase: reinstate `checkout -q` behavior where appropriateLibravatar Johannes Schindelin1-15/+25
2018-11-13rebase: prepare reset_head() for more flagsLibravatar Johannes Schindelin1-3/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:07:46 +0000