summaryrefslogtreecommitdiff
path: root/t/t0064-sha1-array.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:20 +0900
commit2c18e6ae2434a6caa5b3a7256608470948e73f66 (patch)
treef9bd49bc282a98ecf005a7de388d4268b846a8c9 /t/t0064-sha1-array.sh
parentMerge branch 'nd/pack-objects-pack-struct' (diff)
parentrebase -i --rebase-merges: add a section to the man page (diff)
downloadtgif-2c18e6ae2434a6caa5b3a7256608470948e73f66.tar.xz
Merge branch 'js/rebase-recreate-merge'
"git rebase" learned "--rebase-merges" to transplant the whole topology of commit graph elsewhere. * js/rebase-recreate-merge: rebase -i --rebase-merges: add a section to the man page rebase -i: introduce --rebase-merges=[no-]rebase-cousins pull: accept --rebase=merges to recreate the branch topology rebase --rebase-merges: avoid "empty merges" sequencer: handle post-rewrite for merge commands sequencer: make refs generated by the `label` command worktree-local rebase --rebase-merges: add test for --keep-empty rebase: introduce the --rebase-merges option rebase-helper --make-script: introduce a flag to rebase merges sequencer: fast-forward `merge` commands, if possible sequencer: introduce the `merge` command sequencer: introduce new commands to reset the revision git-rebase--interactive: clarify arguments sequencer: offer helpful advice when a command was rescheduled sequencer: refactor how original todo list lines are accessed sequencer: make rearrange_squash() a bit more obvious sequencer: avoid using errno clobbered by rollback_lock_file()
Diffstat (limited to 't/t0064-sha1-array.sh')
0 files changed, 0 insertions, 0 deletions