Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/rebase-r-fixes' | Junio C Hamano | 2021-11-03 | 1 | -1/+3 |
|\ | |||||
| * | rebase -i: fix rewording with --committer-date-is-author-date | Phillip Wood | 2021-11-03 | 1 | -1/+3 |
* | | Merge branch 'ab/unpack-trees-leakfix' | Junio C Hamano | 2021-10-25 | 1 | -21/+15 |
|\ \ | |||||
| * | | sequencer: fix a memory leak in do_reset() | Ævar Arnfjörð Bjarmason | 2021-10-13 | 1 | -2/+2 |
| * | | sequencer: add a "goto cleanup" to do_reset() | Ævar Arnfjörð Bjarmason | 2021-10-13 | 1 | -19/+13 |
* | | | Merge branch 'js/retire-preserve-merges' | Junio C Hamano | 2021-10-18 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | sequencer: restrict scope of a formerly public function | Johannes Schindelin | 2021-09-07 | 1 | -2/+2 |
* | | | | Merge branch 'ab/config-based-hooks-1' | Junio C Hamano | 2021-10-13 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | hook.c users: use "hook_exists()" instead of "find_hook()" | Ævar Arnfjörð Bjarmason | 2021-09-27 | 1 | -1/+1 |
| * | | | | hook.[ch]: move find_hook() from run-command.c to hook.c | Ævar Arnfjörð Bjarmason | 2021-09-27 | 1 | -0/+1 |
* | | | | | Merge branch 'en/removing-untracked-fixes' | Junio C Hamano | 2021-10-13 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove ignored files by default when they are in the way | Elijah Newren | 2021-09-27 | 1 | -2/+1 |
| * | | | | unpack-trees: introduce preserve_ignored to unpack_trees_options | Elijah Newren | 2021-09-27 | 1 | -0/+2 |
* | | | | | Merge branch 'pw/rebase-reread-todo-after-editing' | Junio C Hamano | 2021-10-06 | 1 | -20/+27 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | rebase: fix todo-list rereading | Phillip Wood | 2021-09-24 | 1 | -11/+8 |
| * | | | | sequencer.c: factor out a function | Phillip Wood | 2021-09-24 | 1 | -14/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ds/mergies-with-sparse-index' | Junio C Hamano | 2021-09-20 | 1 | -0/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | sequencer: ensure full index if not ORT strategy | Derrick Stolee | 2021-09-09 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'ab/retire-advice-config' | Junio C Hamano | 2021-09-10 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | advice: remove read uses of most global `advice_` variables | Ben Boeckel | 2021-08-25 | 1 | -4/+4 |
| |/ / | |||||
* | | | Merge branch 'zh/cherry-pick-advice' | Junio C Hamano | 2021-09-10 | 1 | -4/+16 |
|\ \ \ | |||||
| * | | | cherry-pick: use better advice message | ZheNing Hu | 2021-08-23 | 1 | -4/+16 |
| |/ / | |||||
* | | | Merge branch 'js/advise-when-skipping-cherry-picked' | Junio C Hamano | 2021-09-10 | 1 | -2/+20 |
|\ \ \ | |||||
| * | | | sequencer: advise if skipping cherry-picked commit | Josh Steadmon | 2021-08-30 | 1 | -2/+20 |
| |/ / | |||||
* | | | Merge branch 'pw/rebase-r-fixes' | Junio C Hamano | 2021-09-03 | 1 | -49/+57 |
|\ \ \ | | |/ | |/| | |||||
| * | | rebase -r: fix merge -c with a merge strategy | Phillip Wood | 2021-08-23 | 1 | -1/+4 |
| * | | rebase -r: don't write .git/MERGE_MSG when fast-forwarding | Phillip Wood | 2021-08-23 | 1 | -40/+41 |
| * | | rebase -r: make 'merge -c' behave like reword | Phillip Wood | 2021-08-20 | 1 | -10/+14 |
| |/ | |||||
* | | Merge branch 'pw/rebase-skip-final-fix' | Junio C Hamano | 2021-09-03 | 1 | -0/+3 |
|\ \ | |||||
| * | | rebase --continue: remove .git/MERGE_MSG | Phillip Wood | 2021-08-13 | 1 | -0/+3 |
* | | | Merge branch 'en/ort-becomes-the-default' | Junio C Hamano | 2021-08-30 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Change default merge backend from recursive to ort | Elijah Newren | 2021-08-05 | 1 | -2/+2 |
* | | | | Merge branch 'en/merge-strategy-docs' | Junio C Hamano | 2021-08-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update error message and code comment | Elijah Newren | 2021-08-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'js/expand-runtime-prefix' | Junio C Hamano | 2021-08-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use a better name for the function interpolating paths | Johannes Schindelin | 2021-07-26 | 1 | -1/+1 |
| |/ | |||||
* | | *.c static functions: add missing __attribute__((format)) | Ævar Arnfjörð Bjarmason | 2021-07-13 | 1 | -0/+2 |
* | | sequencer.c: move static function to avoid forward decl | Ævar Arnfjörð Bjarmason | 2021-07-12 | 1 | -22/+19 |
|/ | |||||
* | Merge branch 'bc/hash-transition-interop-part-1' | Junio C Hamano | 2021-05-10 | 1 | -2/+2 |
|\ | |||||
| * | hash: provide per-algorithm null OIDs | brian m. carlson | 2021-04-27 | 1 | -2/+2 |
* | | Merge branch 'ab/rebase-no-reschedule-failed-exec' | Junio C Hamano | 2021-05-07 | 1 | -0/+5 |
|\ \ | |||||
| * | | rebase: don't override --no-reschedule-failed-exec with config | Ævar Arnfjörð Bjarmason | 2021-04-10 | 1 | -0/+5 |
* | | | Merge branch 'en/ort-readiness' | Junio C Hamano | 2021-04-16 | 1 | -0/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict | Elijah Newren | 2021-03-20 | 1 | -0/+5 |
* | | | Merge branch 'en/sequencer-edit-upon-conflict-fix' | Junio C Hamano | 2021-04-08 | 1 | -11/+41 |
|\ \ \ | |||||
| * | | | sequencer: fix edit handling for cherry-pick and revert messages | Elijah Newren | 2021-03-31 | 1 | -11/+41 |
| | |/ | |/| | |||||
* | | | Merge branch 'cm/rebase-i-fixup-amend-reword' | Junio C Hamano | 2021-03-26 | 1 | -15/+1 |
|\ \ \ | |||||
| * | | | sequencer: export and rename subject_length() | Charvi Mendiratta | 2021-03-15 | 1 | -15/+1 |
* | | | | Merge branch 'cm/rebase-i-updates' | Junio C Hamano | 2021-03-26 | 1 | -12/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | sequencer: rename a few functions | Charvi Mendiratta | 2021-02-08 | 1 | -9/+9 |