summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-06-01rebase: remove -p code from git-rebase--interactive.shLibravatar Alban Gruin1-794/+8
2018-06-01rebase: use the new git-rebase--preserve-merges.shLibravatar Alban Gruin1-7/+25
2018-06-01rebase: strip unused code in git-rebase--preserve-merges.shLibravatar Alban Gruin1-61/+4
2018-06-01rebase: introduce a dedicated backend for --preserve-mergesLibravatar Alban Gruin3-0/+1072
2018-05-06rebase --rebase-merges: root commits can be cousins, tooLibravatar Johannes Schindelin2-1/+27
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardLibravatar Johannes Schindelin2-0/+25
2018-05-06sequencer: allow introducing new root commitsLibravatar Johannes Schindelin2-12/+62
2018-05-06rebase -i --root: let the sequencer handle even the initial partLibravatar Johannes Schindelin3-10/+19
2018-05-06sequencer: learn about the special "fake root commit" handlingLibravatar Johannes Schindelin2-3/+125
2018-05-06sequencer: extract helper to update active_cache_treeLibravatar Johannes Schindelin1-9/+18
2018-04-26rebase -i --rebase-merges: add a section to the man pageLibravatar Johannes Schindelin1-0/+135
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin7-6/+59
2018-04-26pull: accept --rebase=merges to recreate the branch topologyLibravatar Johannes Schindelin5-10/+38
2018-04-26rebase --rebase-merges: avoid "empty merges"Libravatar Johannes Schindelin2-0/+15
2018-04-26sequencer: handle post-rewrite for merge commandsLibravatar Johannes Schindelin2-1/+29
2018-04-26sequencer: make refs generated by the `label` command worktree-localLibravatar Johannes Schindelin2-1/+16
2018-04-26rebase --rebase-merges: add test for --keep-emptyLibravatar Phillip Wood1-0/+1
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin5-2/+207
2018-04-26rebase-helper --make-script: introduce a flag to rebase mergesLibravatar Johannes Schindelin3-2/+349
2018-04-26sequencer: fast-forward `merge` commands, if possibleLibravatar Johannes Schindelin1-1/+32
2018-04-26sequencer: introduce the `merge` commandLibravatar Johannes Schindelin2-0/+204
2018-04-26sequencer: introduce new commands to reset the revisionLibravatar Johannes Schindelin2-7/+208
2018-04-26git-rebase--interactive: clarify argumentsLibravatar Stefan Beller1-7/+7
2018-04-26sequencer: offer helpful advice when a command was rescheduledLibravatar Johannes Schindelin1-0/+16
2018-04-26sequencer: refactor how original todo list lines are accessedLibravatar Johannes Schindelin1-24/+36
2018-04-26sequencer: make rearrange_squash() a bit more obviousLibravatar Johannes Schindelin1-1/+1
2018-04-26sequencer: avoid using errno clobbered by rollback_lock_file()Libravatar Johannes Schindelin1-4/+6
2018-04-25The fourth batch for 2.18Libravatar Junio C Hamano1-0/+78
2018-04-25Merge branch 'jm/mem-pool'Libravatar Junio C Hamano4-61/+106
2018-04-25Merge branch 'tg/use-git-contacts'Libravatar Junio C Hamano1-2/+2
2018-04-25Merge branch 'sb/filenames-with-dashes'Libravatar Junio C Hamano42-45/+45
2018-04-25Merge branch 'cc/perf-bisect'Libravatar Junio C Hamano3-10/+166
2018-04-25Merge branch 'bp/fsmonitor-prime-index'Libravatar Junio C Hamano1-0/+3
2018-04-25Merge branch 'bp/fsmonitor-bufsize-fix'Libravatar Junio C Hamano1-1/+1
2018-04-25Merge branch 'cb/bash-completion-ls-files-processing'Libravatar Junio C Hamano1-6/+1
2018-04-25Merge branch 'es/worktree-docs'Libravatar Junio C Hamano1-9/+9
2018-04-25Merge branch 'es/fread-reads-dir-autoconf-fix'Libravatar Junio C Hamano1-1/+1
2018-04-25Merge branch 'ps/test-chmtime-get'Libravatar Junio C Hamano10-42/+63
2018-04-25Merge branch 'js/t5404-path-fix'Libravatar Junio C Hamano1-1/+1
2018-04-25Merge branch 'jk/ref-array-push'Libravatar Junio C Hamano4-14/+36
2018-04-25Merge branch 'en/doc-typoes'Libravatar Junio C Hamano7-8/+8
2018-04-25Merge branch 'lw/daemon-log-destination'Libravatar Junio C Hamano1-1/+1
2018-04-25Merge branch 'mn/send-email-credential-doc'Libravatar Junio C Hamano1-10/+6
2018-04-25Merge branch 'ak/bisect-doc-typofix'Libravatar Junio C Hamano1-2/+2
2018-04-25Merge branch 'br/mergetools-guiffy'Libravatar Junio C Hamano1-0/+18
2018-04-25Merge branch 'nd/worktree-move'Libravatar Junio C Hamano1-4/+3
2018-04-25Merge branch 'ks/branch-list-detached-rebase-i'Libravatar Junio C Hamano2-4/+32
2018-04-25Merge branch 'jk/t5561-missing-curl'Libravatar Junio C Hamano2-2/+12
2018-04-25Merge branch 'bw/commit-partial-from-subdirectory-fix'Libravatar Junio C Hamano2-2/+13
2018-04-25Merge branch 'jk/relative-directory-fix'Libravatar Junio C Hamano11-17/+223
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 05:52:37 +0000