Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/rebase-cleanup' | Junio C Hamano | 2019-06-13 | 1 | -6/+1 |
|\ | |||||
| * | rebase: fold git-rebase--common into the -p backend | Johannes Schindelin | 2019-05-15 | 1 | -2/+1 |
| * | Drop unused git-rebase--am.sh | Johannes Schindelin | 2019-05-15 | 1 | -4/+0 |
* | | Merge branch 'jk/unused-params-final-batch' | Junio C Hamano | 2019-06-13 | 1 | -1/+1 |
|\ \ | |||||
* \ \ | Merge branch 'js/rebase-config-bitfix' | Junio C Hamano | 2019-05-30 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | rebase: replace incorrect logical negation by correct bitwise one | Johannes Schindelin | 2019-05-28 | 1 | -1/+1 |
* | | | Merge branch 'pw/rebase-i-internal' | Junio C Hamano | 2019-05-13 | 1 | -113/+465 |
|\ \ \ | |_|/ |/| | | |||||
| * | | rebase -i: run without forking rebase--interactive | Phillip Wood | 2019-04-19 | 1 | -135/+86 |
| * | | rebase: use a common action enum | Phillip Wood | 2019-04-19 | 1 | -43/+48 |
| * | | rebase -i: use struct rebase_options in do_interactive_rebase() | Phillip Wood | 2019-04-19 | 1 | -33/+36 |
| * | | rebase -i: use struct rebase_options to parse args | Phillip Wood | 2019-04-19 | 1 | -91/+112 |
| * | | rebase -i: use struct object_id for squash_onto | Phillip Wood | 2019-04-19 | 1 | -8/+13 |
| * | | rebase -i: use struct commit when parsing options | Phillip Wood | 2019-04-19 | 1 | -18/+24 |
| * | | rebase -i: remove duplication | Phillip Wood | 2019-04-19 | 1 | -3/+2 |
| * | | rebase -i: combine rebase--interactive.c with rebase.c | Phillip Wood | 2019-04-19 | 1 | -0/+367 |
| * | | rebase: use OPT_RERERE_AUTOUPDATE() | Phillip Wood | 2019-04-19 | 1 | -17/+13 |
| * | | rebase: rename write_basic_state() | Phillip Wood | 2019-04-19 | 1 | -2/+2 |
| * | | rebase: don't translate trace strings | Phillip Wood | 2019-04-19 | 1 | -8/+7 |
* | | | Merge branch 'nd/sha1-name-c-wo-the-repository' | Junio C Hamano | 2019-05-09 | 1 | -3/+2 |
|\ \ \ | |||||
| * | | | builtin rebase: use oideq() | SZEDER Gábor | 2019-04-08 | 1 | -1/+1 |
| * | | | builtin rebase: use FREE_AND_NULL | SZEDER Gábor | 2019-04-08 | 1 | -2/+1 |
* | | | | Merge branch 'ab/drop-scripted-rebase' | Junio C Hamano | 2019-04-16 | 1 | -39/+11 |
|\ \ \ \ | |||||
| * | | | | rebase: remove the rebase.useBuiltin setting | Ævar Arnfjörð Bjarmason | 2019-03-20 | 1 | -39/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/rebase-deprecate-preserve-merges' | Junio C Hamano | 2019-04-10 | 1 | -2/+6 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | rebase: deprecate --preserve-merges | Johannes Schindelin | 2019-03-12 | 1 | -2/+6 |
| |/ / | |||||
* | | | Merge branch 'js/rebase-orig-head-fix' | Junio C Hamano | 2019-03-20 | 1 | -16/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | built-in rebase: set ORIG_HEAD just once, before the rebase | Johannes Schindelin | 2019-03-04 | 1 | -13/+18 |
| * | | built-in rebase: use the correct reflog when switching branches | Johannes Schindelin | 2019-03-04 | 1 | -1/+1 |
| * | | built-in rebase: no need to check out `onto` twice | Johannes Schindelin | 2019-03-04 | 1 | -2/+2 |
* | | | trace2:data: add subverb for rebase | Jeff Hostetler | 2019-02-22 | 1 | -0/+17 |
* | | | Fix typos in translatable strings for v2.21.0 | Jean-Noël Avila | 2019-02-11 | 1 | -1/+1 |
* | | | Merge branch 'js/rebase-i-redo-exec-fix' | Junio C Hamano | 2019-02-08 | 1 | -21/+0 |
|\ \ \ | |||||
| * | | | Revert "rebase: introduce a shortcut for --reschedule-failed-exec" | Johannes Schindelin | 2019-02-06 | 1 | -21/+0 |
* | | | | Merge branch 'pw/rebase-x-sanity-check' | Junio C Hamano | 2019-02-06 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | rebase -x: sanity check command | Phillip Wood | 2019-01-29 | 1 | -0/+17 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'nd/the-index-final' | Junio C Hamano | 2019-02-06 | 1 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch | Nguyễn Thái Ngọc Duy | 2019-01-24 | 1 | -0/+1 |
| * | | | | read-cache.c: replace update_index_if_able with repo_& | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -3/+2 |
| * | | | | read-cache.c: kill read_index() | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -4/+4 |
* | | | | | Merge branch 'js/rebase-am' | Junio C Hamano | 2019-02-06 | 1 | -125/+311 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | built-in rebase: call `git am` directly | Johannes Schindelin | 2019-01-18 | 1 | -0/+179 |
| * | | | | rebase: teach `reset_head()` to optionally skip the worktree | Johannes Schindelin | 2019-01-18 | 1 | -1/+7 |
| * | | | | rebase: avoid double reflog entry when switching branches | Johannes Schindelin | 2019-01-18 | 1 | -3/+4 |
| * | | | | rebase: move `reset_head()` into a better spot | Johannes Schindelin | 2019-01-18 | 1 | -119/+119 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-06 | 1 | -20/+10 |
|\ \ \ \ | |||||
| * | | | | rebase: implement --merge via the interactive machinery | Elijah Newren | 2019-01-07 | 1 | -9/+6 |
| * | | | | git-rebase, sequencer: extend --quiet option for the interactive machinery | Elijah Newren | 2018-12-28 | 1 | -4/+1 |
| * | | | | rebase: fix incompatible options error message | Elijah Newren | 2018-12-28 | 1 | -7/+3 |
| * | | | | rebase: make builtin and legacy script error messages the same | Elijah Newren | 2018-12-28 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | Merge branch 'pw/no-editor-in-rebase-i-implicit' | Junio C Hamano | 2019-02-05 | 1 | -2/+3 |
|\ \ \ \ |