Age | Commit message (Expand) | Author | Files | Lines |
2021-08-30 | Merge branch 'en/ort-becomes-the-default' | Junio C Hamano | 1 | -2/+2 |
2021-08-30 | Merge branch 'en/merge-strategy-docs' | Junio C Hamano | 1 | -1/+1 |
2021-08-24 | Merge branch 'js/expand-runtime-prefix' | Junio C Hamano | 1 | -1/+1 |
2021-08-05 | Change default merge backend from recursive to ort | Elijah Newren | 1 | -2/+2 |
2021-08-05 | Update error message and code comment | Elijah Newren | 1 | -1/+1 |
2021-07-26 | Use a better name for the function interpolating paths | Johannes Schindelin | 1 | -1/+1 |
2021-07-13 | *.c static functions: add missing __attribute__((format)) | Ævar Arnfjörð Bjarmason | 1 | -0/+2 |
2021-07-12 | sequencer.c: move static function to avoid forward decl | Ævar Arnfjörð Bjarmason | 1 | -22/+19 |
2021-05-10 | Merge branch 'bc/hash-transition-interop-part-1' | Junio C Hamano | 1 | -2/+2 |
2021-05-07 | Merge branch 'ab/rebase-no-reschedule-failed-exec' | Junio C Hamano | 1 | -0/+5 |
2021-04-27 | hash: provide per-algorithm null OIDs | brian m. carlson | 1 | -2/+2 |
2021-04-16 | Merge branch 'en/ort-readiness' | Junio C Hamano | 1 | -0/+5 |
2021-04-10 | rebase: don't override --no-reschedule-failed-exec with config | Ævar Arnfjörð Bjarmason | 1 | -0/+5 |
2021-04-08 | Merge branch 'en/sequencer-edit-upon-conflict-fix' | Junio C Hamano | 1 | -11/+41 |
2021-03-31 | sequencer: fix edit handling for cherry-pick and revert messages | Elijah Newren | 1 | -11/+41 |
2021-03-26 | Merge branch 'cm/rebase-i-fixup-amend-reword' | Junio C Hamano | 1 | -15/+1 |
2021-03-26 | Merge branch 'cm/rebase-i-updates' | Junio C Hamano | 1 | -12/+11 |
2021-03-26 | Merge branch 'cm/rebase-i' | Junio C Hamano | 1 | -39/+256 |
2021-03-20 | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict | Elijah Newren | 1 | -0/+5 |
2021-03-15 | sequencer: export and rename subject_length() | Charvi Mendiratta | 1 | -15/+1 |
2021-03-13 | use CALLOC_ARRAY | René Scharfe | 1 | -1/+1 |
2021-02-10 | Merge branch 'ds/more-index-cleanups' | Junio C Hamano | 1 | -3/+0 |
2021-02-08 | sequencer: rename a few functions | Charvi Mendiratta | 1 | -9/+9 |
2021-02-08 | sequencer: fixup the datatype of the 'flag' argument | Charvi Mendiratta | 1 | -4/+3 |
2021-01-29 | rebase -i: teach --autosquash to work with amend! | Charvi Mendiratta | 1 | -7/+16 |
2021-01-29 | rebase -i: add fixup [-C | -c] command | Charvi Mendiratta | 1 | -19/+194 |
2021-01-29 | sequencer: use const variable for commit message comments | Charvi Mendiratta | 1 | -5/+10 |
2021-01-29 | sequencer: pass todo_item to do_pick_commit() | Charvi Mendiratta | 1 | -7/+11 |
2021-01-29 | rebase -i: comment out squash!/fixup! subjects from squash message | Phillip Wood | 1 | -1/+20 |
2021-01-28 | rebase -i: do leave commit message intact in fixup! chains | Johannes Schindelin | 1 | -1/+12 |
2021-01-23 | cache-tree: clean up cache_tree_update() | Derrick Stolee | 1 | -3/+0 |
2021-01-20 | sequencer: factor out code to append squash message | Phillip Wood | 1 | -6/+12 |
2021-01-20 | rebase -i: only write fixup-message when it's needed | Phillip Wood | 1 | -4/+3 |
2020-11-21 | Merge branch 'en/strmap' | Junio C Hamano | 1 | -2/+2 |
2020-11-18 | Merge branch 'en/merge-ort-api-null-impl' | Junio C Hamano | 1 | -11/+61 |
2020-11-18 | Merge branch 'pw/rebase-i-orig-head' | Junio C Hamano | 1 | -9/+6 |
2020-11-11 | Merge branch 'jc/sequencer-stopped-sha-simplify' | Junio C Hamano | 1 | -1/+1 |
2020-11-09 | Merge branch 'jk/committer-date-is-author-date-fix-simplify' | Junio C Hamano | 1 | -26/+2 |
2020-11-04 | rebase -i: use struct object_id when writing state | Phillip Wood | 1 | -2/+3 |
2020-11-04 | rebase -i: use struct object_id rather than looking up commit | Phillip Wood | 1 | -7/+3 |
2020-11-02 | merge,rebase,revert: select ort or recursive by config or environment | Elijah Newren | 1 | -11/+61 |
2020-11-02 | Merge branch 'en/sequencer-rollback-lock-cleanup' | Junio C Hamano | 1 | -1/+0 |
2020-11-02 | Merge branch 'sc/sequencer-gpg-octopus' | Junio C Hamano | 1 | -1/+3 |
2020-11-02 | hashmap: provide deallocation function names | Elijah Newren | 1 | -2/+2 |
2020-10-26 | Merge branch 'jk/committer-date-is-author-date-fix' | Junio C Hamano | 1 | -1/+1 |
2020-10-26 | am, sequencer: stop parsing our own committer ident | Jeff King | 1 | -26/+2 |
2020-10-23 | rebase: fix broken email with --committer-date-is-author-date | Jeff King | 1 | -1/+1 |
2020-10-21 | sequencer: tolerate abbreviated stopped-sha file | Jonathan Tan | 1 | -1/+1 |
2020-10-21 | sequencer: remove duplicate rollback_lock_file() call | Elijah Newren | 1 | -1/+0 |
2020-10-18 | sequencer: pass explicit --no-gpg-sign to merge | Samuel Čavoj | 1 | -0/+2 |