summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-cleanup'Junio C Hamano2019-06-131-6/+1
|\
| * rebase: fold git-rebase--common into the -p backendJohannes Schindelin2019-05-151-2/+1
| * Drop unused git-rebase--am.shJohannes Schindelin2019-05-151-4/+0
* | Merge branch 'jk/unused-params-final-batch'Junio C Hamano2019-06-131-1/+1
|\ \
* \ \ Merge branch 'js/rebase-config-bitfix'Junio C Hamano2019-05-301-1/+1
|\ \ \ | |_|/ |/| |
| * | rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin2019-05-281-1/+1
* | | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-131-113/+465
|\ \ \ | |_|/ |/| |
| * | rebase -i: run without forking rebase--interactivePhillip Wood2019-04-191-135/+86
| * | rebase: use a common action enumPhillip Wood2019-04-191-43/+48
| * | rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood2019-04-191-33/+36
| * | rebase -i: use struct rebase_options to parse argsPhillip Wood2019-04-191-91/+112
| * | rebase -i: use struct object_id for squash_ontoPhillip Wood2019-04-191-8/+13
| * | rebase -i: use struct commit when parsing optionsPhillip Wood2019-04-191-18/+24
| * | rebase -i: remove duplicationPhillip Wood2019-04-191-3/+2
| * | rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood2019-04-191-0/+367
| * | rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood2019-04-191-17/+13
| * | rebase: rename write_basic_state()Phillip Wood2019-04-191-2/+2
| * | rebase: don't translate trace stringsPhillip Wood2019-04-191-8/+7
* | | Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano2019-05-091-3/+2
|\ \ \
| * | | builtin rebase: use oideq()SZEDER Gábor2019-04-081-1/+1
| * | | builtin rebase: use FREE_AND_NULLSZEDER Gábor2019-04-081-2/+1
* | | | Merge branch 'ab/drop-scripted-rebase'Junio C Hamano2019-04-161-39/+11
|\ \ \ \
| * | | | rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason2019-03-201-39/+11
| | |/ / | |/| |
* | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-04-101-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase: deprecate --preserve-mergesJohannes Schindelin2019-03-121-2/+6
| |/ /
* | | Merge branch 'js/rebase-orig-head-fix'Junio C Hamano2019-03-201-16/+22
|\ \ \ | |/ / |/| |
| * | built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin2019-03-041-13/+18
| * | built-in rebase: use the correct reflog when switching branchesJohannes Schindelin2019-03-041-1/+1
| * | built-in rebase: no need to check out `onto` twiceJohannes Schindelin2019-03-041-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
|\ \ \ \