Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/plug-misc-leaks' | Junio C Hamano | 2018-06-25 | 1 | -1/+3 |
|\ | |||||
| * | sequencer.c: plug mem leak in git_sequencer_config | Stefan Beller | 2018-06-25 | 1 | -0/+1 |
| * | sequencer.c: plug leaks in do_pick_commit | Stefan Beller | 2018-06-04 | 1 | -1/+2 |
* | | Merge branch 'nd/commit-util-to-slab' | Junio C Hamano | 2018-06-25 | 1 | -6/+18 |
|\ \ | |||||
| * | | sequencer.c: use commit-slab to associate todo items to commits | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -3/+9 |
| * | | sequencer.c: use commit-slab to mark seen commits | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -3/+9 |
* | | | Merge branch 'js/rebase-i-root-fix' | Junio C Hamano | 2018-06-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | rebase --root: fix amending root commit messages | Johannes Schindelin | 2018-06-18 | 1 | -1/+1 |
* | | | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2018-06-01 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | sequencer: ensure labels that are object IDs are rewritten | brian m. carlson | 2018-05-30 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/command-list' | Junio C Hamano | 2018-06-01 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Move declaration for alias.c to alias.h | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -0/+1 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | sequencer: use the_hash_algo for empty tree object ID | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| * | | | | | sequencer: convert one use of EMPTY_TREE_SHA1_HEX | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | 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 |
| |\ \ \ \ \ |