summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-021-2/+2
* trace2:data: add subverb for rebaseJeff Hostetler2019-02-221-0/+17
* Fix typos in translatable strings for v2.21.0Jean-Noël Avila2019-02-111-1/+1
* Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-081-21/+0
|\
| * Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-21/+0
* | Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano2019-02-061-0/+17
|\ \
| * | rebase -x: sanity check commandPhillip Wood2019-01-291-0/+17
* | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-7/+7
|\ \ \
| * | | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
| * | | read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy2019-01-141-3/+2
| * | | read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-4/+4
* | | | Merge branch 'js/rebase-am'Junio C Hamano2019-02-061-125/+311
|\ \ \ \
| * | | | built-in rebase: call `git am` directlyJohannes Schindelin2019-01-181-0/+179
| * | | | rebase: teach `reset_head()` to optionally skip the worktreeJohannes Schindelin2019-01-181-1/+7
| * | | | rebase: avoid double reflog entry when switching branchesJohannes Schindelin2019-01-181-3/+4
| * | | | rebase: move `reset_head()` into a better spotJohannes Schindelin2019-01-181-119/+119
| | |/ / | |/| |
* | | | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-061-20/+10
|\ \ \ \
| * | | | rebase: implement --merge via the interactive machineryElijah Newren2019-01-071-9/+6
| * | | | git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren2018-12-281-4/+1
| * | | | rebase: fix incompatible options error messageElijah Newren2018-12-281-7/+3
| * | | | rebase: make builtin and legacy script error messages the sameElijah Newren2018-12-281-5/+5
| |/ / /
* | | | Merge branch 'pw/no-editor-in-rebase-i-implicit'Junio C Hamano2019-02-051-2/+3
|\ \ \ \
| * | | | implicit interactive rebase: don't run sequence editorPhillip Wood2019-01-281-2/+3
| |/ / /
* | | | Merge branch 'os/rebase-runs-post-checkout-hook'Junio C Hamano2019-01-291-2/+10
|\ \ \ \
| * | | | rebase: run post-checkout hook on checkoutOrgad Shaneh2019-01-021-2/+10
| |/ / /
* | | | Merge branch 'js/rebase-i-redo-exec'Junio C Hamano2019-01-291-1/+41
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin2018-12-111-0/+21
| * | rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin2018-12-111-0/+5
| * | rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-111-1/+15
| |/
* | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-8/+9
|\ \ | |/ |/|
| * rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-2/+2
| * cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-3/+4
* | Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano2018-12-011-2/+2
|\ \
| * | builtin/rebase.c: remove superfluous space in messagesRalf Thielow2018-12-011-2/+2
* | | Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano2018-12-011-6/+12
|\ \ \
| * | | rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin2018-11-301-6/+12
* | | | rebase: fix GIT_REFLOG_ACTION regressionJohannes Schindelin2018-11-301-3/+26
|/ / /
* | | Merge branch 'js/builtin-rebase-perf-fix-err-fix'Junio C Hamano2018-11-211-1/+2
|\ \ \
| * | | rebase: warn about the correct tree's OIDJohannes Schindelin2018-11-211-1/+2
* | | | Merge branch 'ab/rebase-in-c-escape-hatch'Junio C Hamano2018-11-181-1/+4
|\ \ \ \
| * | | | tests: add a special setup where rebase.useBuiltin is offÆvar Arnfjörð Bjarmason2018-11-161-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'js/rebase-am-options'Junio C Hamano2018-11-181-63/+45
|\ \ \ \
| * | | | rebase: validate -C<n> and --whitespace=<mode> parameters earlyJohannes Schindelin2018-11-161-1/+11
| * | | | rebase: really just passthru the `git am` optionsJohannes Schindelin2018-11-161-63/+35
| |/ / /
* | | | Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano2018-11-181-0/+3
|\ \ \ \
| * | | | built-in rebase --skip/--abort: clean up stale .git/<name> filesJohannes Schindelin2018-11-131-0/+3
| |/ / /
* | | | Merge branch 'js/builtin-rebase-perf-fix'Junio C Hamano2018-11-181-33/+46
|\ \ \ \ | | |/ / | |/| |
| * | | built-in rebase: reinstate `checkout -q` behavior where appropriateJohannes Schindelin2018-11-131-15/+25
| * | | rebase: prepare reset_head() for more flagsJohannes Schindelin2018-11-131-3/+6
View Lorry Controller Status