Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/rebase-i-show-HEAD-to-reword' | Junio C Hamano | 2019-10-11 | 1 | -3/+13 |
|\ | |||||
| * | rebase -i: always update HEAD before rewording | Phillip Wood | 2019-08-19 | 1 | -3/+13 |
* | | Merge branch 'dl/rebase-i-keep-base' | Junio C Hamano | 2019-09-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | rebase: fast-forward --onto in more cases | Denton Liu | 2019-08-27 | 1 | -1/+1 |
* | | | Merge branch 'dl/use-sq-from-test-lib' | Junio C Hamano | 2019-09-30 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | t: use common $SQ variable | Denton Liu | 2019-09-06 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge branch 'bc/hash-independent-tests-part-5' | Junio C Hamano | 2019-09-30 | 1 | -11/+11 |
|\ \ \ | |||||
| * | | | t3404: abstract away SHA-1-specific constants | brian m. carlson | 2019-08-20 | 1 | -11/+11 |
| |/ / | |||||
| * | | Merge branch 'sg/rebase-progress' | Junio C Hamano | 2019-07-09 | 1 | -70/+50 |
| |\ \ | |||||
| * \ \ | Merge branch 'js/t3404-typofix' | Junio C Hamano | 2019-07-09 | 1 | -1/+1 |
| |\ \ \ | |||||
* | | | | | t: use LF variable defined in the test harness | Junio C Hamano | 2019-09-05 | 1 | -2/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'sg/rebase-progress' into maint | Junio C Hamano | 2019-07-29 | 1 | -70/+50 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused | SZEDER Gábor | 2019-06-24 | 1 | -14/+1 |
| * | | | t3404: modernize here doc style | SZEDER Gábor | 2019-06-24 | 1 | -65/+58 |
| |/ / | |||||
* | | | Merge branch 'js/t3404-typofix' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | t3404: fix a typo | Johannes Schindelin | 2019-06-14 | 1 | -1/+1 |
* | | rebase: remove the rebase.useBuiltin setting | Ævar Arnfjörð Bjarmason | 2019-03-20 | 1 | -6/+3 |
* | | rebase: fix regression in rebase.useBuiltin=false test mode | Ævar Arnfjörð Bjarmason | 2019-02-13 | 1 | -3/+6 |
* | | Merge branch 'pw/rebase-x-sanity-check' | Junio C Hamano | 2019-02-06 | 1 | -0/+19 |
|\ \ | |||||
| * | | rebase -x: sanity check command | Phillip Wood | 2019-01-29 | 1 | -0/+19 |
* | | | implicit interactive rebase: don't run sequence editor | Phillip Wood | 2019-01-28 | 1 | -0/+5 |
|/ / | |||||
* | | Merge branch 'js/rebase-p-tests' | Junio C Hamano | 2018-11-13 | 1 | -11/+12 |
|\ \ | |||||
| * | | tests: optionally skip `git rebase -p` tests | Johannes Schindelin | 2018-11-02 | 1 | -4/+4 |
| * | | t3404: decouple some test cases from outcomes of previous test cases | Johannes Schindelin | 2018-11-02 | 1 | -7/+8 |
* | | | Merge branch 'sg/test-rebase-editor-fix' | Junio C Hamano | 2018-11-06 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | t3404-rebase-interactive: test abbreviated commands | Johannes Sixt | 2018-10-29 | 1 | -5/+5 |
* | | | | Merge branch 'ag/rebase-i-in-c' | Junio C Hamano | 2018-11-02 | 1 | -0/+10 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | rebase -i: rewrite complete_action() in C | Alban Gruin | 2018-08-29 | 1 | -1/+1 |
| * | | | t3404: todo list with commented-out commands only aborts | Alban Gruin | 2018-08-10 | 1 | -0/+10 |
| | |/ | |/| | |||||
* | | | Merge branch 'en/sequencer-empty-edit-result-aborts' | Junio C Hamano | 2018-09-24 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | sequencer: fix --allow-empty-message behavior, make it smarter | Elijah Newren | 2018-09-13 | 1 | -4/+3 |
* | | | | Merge branch 'pw/rebase-i-author-script-fix' | Junio C Hamano | 2018-09-04 | 1 | -3/+15 |
|\ \ \ \ | |||||
| * | | | | sequencer: fix quoting in write_author_script | Phillip Wood | 2018-08-07 | 1 | -3/+15 |
* | | | | | Merge branch 'sg/test-must-be-empty' | Junio C Hamano | 2018-08-27 | 1 | -3/+2 |
|\ \ \ \ \ | |||||
| * | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' | SZEDER Gábor | 2018-08-21 | 1 | -3/+2 |
* | | | | | | Merge branch 'es/rebase-i-author-script-fix' | Junio C Hamano | 2018-08-17 | 1 | -1/+9 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | sequencer: fix "rebase -i --root" corrupting author header timestamp | Eric Sunshine | 2018-07-31 | 1 | -1/+1 |
| * | | | | | sequencer: fix "rebase -i --root" corrupting author header timezone | Eric Sunshine | 2018-07-31 | 1 | -1/+1 |
| * | | | | | sequencer: fix "rebase -i --root" corrupting author header | Eric Sunshine | 2018-07-31 | 1 | -1/+9 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well' | Junio C Hamano | 2018-08-02 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commands | brian m. carlson | 2018-07-16 | 1 | -0/+9 |
* | | | | | | Merge branch 'es/test-fixes' | Junio C Hamano | 2018-08-02 | 1 | -3/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | t: use test_write_lines() instead of series of 'echo' commands | Eric Sunshine | 2018-07-03 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jc/t3404-one-shot-export-fix' | Junio C Hamano | 2018-07-24 | 1 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | t3404: fix use of "VAR=VAL cmd" with a shell function | Junio C Hamano | 2018-07-12 | 1 | -1/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'en/rebase-consistency' | Junio C Hamano | 2018-07-24 | 1 | -3/+4 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | git-rebase: make --allow-empty-message the default | Elijah Newren | 2018-06-27 | 1 | -3/+4 |
| | |/ | |/| | |||||
* | | | sequencer: do not squash 'reword' commits when we hit conflicts | Phillip Wood | 2018-06-19 | 1 | -0/+28 |
|/ / | |||||
* | | t3404: check root commit in 'rebase -i --root reword root commit' | Todd Zullinger | 2018-06-19 | 1 | -1/+2 |
* | | rebase --root: fix amending root commit messages | Johannes Schindelin | 2018-06-18 | 1 | -1/+1 |