| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'js/sequencer-and-root-commits' | Junio C Hamano | 2018-05-30 | 1 | -25/+181 |
| |\ | |||||
| | * | rebase --rebase-merges: root commits can be cousins, too | Johannes Schindelin | 2018-05-06 | 1 | -1/+2 |
| | * | rebase --rebase-merges: a "merge" into a new root is a fast-forward | Johannes Schindelin | 2018-05-06 | 1 | -0/+12 |
| | * | sequencer: allow introducing new root commits | Johannes Schindelin | 2018-05-06 | 1 | -12/+28 |
| | * | sequencer: learn about the special "fake root commit" handling | Johannes Schindelin | 2018-05-06 | 1 | -3/+121 |
| | * | sequencer: extract helper to update active_cache_tree | Johannes Schindelin | 2018-05-06 | 1 | -9/+18 |
| * | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2018-05-23 | 1 | -37/+855 |
| |\ \ | |/ | |||||
| | * | rebase -i: introduce --rebase-merges=[no-]rebase-cousins | Johannes Schindelin | 2018-04-26 | 1 | -0/+4 |
| | * | rebase --rebase-merges: avoid "empty merges" | Johannes Schindelin | 2018-04-26 | 1 | -0/+7 |
| | * | sequencer: handle post-rewrite for merge commands | Johannes Schindelin | 2018-04-26 | 1 | -1/+4 |
| | * | rebase-helper --make-script: introduce a flag to rebase merges | Johannes Schindelin | 2018-04-26 | 1 | -1/+345 |
| | * | sequencer: fast-forward `merge` commands, if possible | Johannes Schindelin | 2018-04-26 | 1 | -1/+32 |
| | * | sequencer: introduce the `merge` command | Johannes Schindelin | 2018-04-26 | 1 | -0/+200 |
| | * | sequencer: introduce new commands to reset the revision | Johannes Schindelin | 2018-04-26 | 1 | -7/+206 |
| | * | sequencer: offer helpful advice when a command was rescheduled | Johannes Schindelin | 2018-04-26 | 1 | -0/+16 |
| | * | sequencer: refactor how original todo list lines are accessed | Johannes Schindelin | 2018-04-26 | 1 | -24/+36 |
| | * | sequencer: make rearrange_squash() a bit more obvious | Johannes Schindelin | 2018-04-26 | 1 | -1/+1 |
| | * | sequencer: avoid using errno clobbered by rollback_lock_file() | Johannes Schindelin | 2018-04-26 | 1 | -4/+6 |
| * | | Merge branch 'js/rebase-i-clean-msg-after-fixup-continue' | Junio C Hamano | 2018-05-23 | 1 | -47/+146 |
| |\ \ | |||||
| | * | | rebase --skip: clean up commit message after a failed fixup/squash | Johannes Schindelin | 2018-05-02 | 1 | -13/+100 |
| | * | | sequencer: always commit without editing when asked for | Johannes Schindelin | 2018-05-02 | 1 | -0/+2 |
| | * | | rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON | Johannes Schindelin | 2018-05-02 | 1 | -34/+44 |
| * | | | Merge branch 'sb/oid-object-info' | Junio C Hamano | 2018-05-23 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | cache.h: add repository argument to oid_object_info | Stefan Beller | 2018-04-26 | 1 | -1/+2 |
| * | | | | Merge branch 'ds/lazy-load-trees' | Junio C Hamano | 2018-05-23 | 1 | -6/+6 |
| |\ \ \ \ | |||||
| | * | | | | treewide: replace maybe_tree with accessor methods | Derrick Stolee | 2018-04-11 | 1 | -6/+6 |
| | * | | | | treewide: rename tree to maybe_tree | Derrick Stolee | 2018-04-11 | 1 | -6/+6 |
| | * | | | | Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees | Junio C Hamano | 2018-04-11 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch 'js/ident-date-fix' | Junio C Hamano | 2018-05-08 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| | * | | | | | sequencer: reset the committer date before commits | Johannes Sixt | 2018-04-19 | 1 | -0/+2 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'sb/filenames-with-dashes' | Junio C Hamano | 2018-04-25 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | exec_cmd: rename to use dash in file name | Stefan Beller | 2018-04-11 | 1 | -1/+1 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'pw/rebase-signoff' | Junio C Hamano | 2018-04-25 | 1 | -1/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | rebase: extend --signoff support | Phillip Wood | 2018-03-29 | 1 | -1/+7 |
| | * | | | | | Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff | Junio C Hamano | 2018-03-29 | 1 | -2/+6 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch 'pw/rebase-keep-empty-fixes' | Junio C Hamano | 2018-04-25 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | | |||||
| | * | | | | | rebase -i --keep-empty: don't prune empty commits | Phillip Wood | 2018-03-29 | 1 | -2/+6 |
| * | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -4/+5 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| | * | | | | | sha1_file: convert sha1_object_info* to object_id | brian m. carlson | 2018-03-14 | 1 | -1/+2 |
| | * | | | | | Convert find_unique_abbrev* to struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | cache-tree: convert write_*_as_tree to object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
| * | | | | | | Merge branch 'ma/skip-writing-unchanged-index' | Junio C Hamano | 2018-03-21 | 1 | -6/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-index | Martin Ågren | 2018-03-01 | 1 | -6/+5 |
| * | | | | | | | Merge branch 'ma/roll-back-lockfiles' | Junio C Hamano | 2018-03-14 | 1 | -18/+14 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| | * | | | | | sequencer: do not roll back lockfile unnecessarilyma/roll-back-lockfiles | Martin Ågren | 2018-02-28 | 1 | -12/+6 |
| | * | | | | | sequencer: always roll back lock in `do_recursive_merge()` | Martin Ågren | 2018-02-27 | 1 | -1/+3 |
| | * | | | | | sequencer: make lockfiles non-static | Martin Ågren | 2018-02-27 | 1 | -5/+5 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | object: rename function 'typename' to 'type_name' | Brandon Williams | 2018-02-14 | 1 | -1/+1 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'rs/strbuf-read-file-or-whine' | Junio C Hamano | 2018-03-06 | 1 | -46/+28 |
| |\ \ \ \ | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/sequencer.c