rebase-helper --make-script: introduce a flag to rebase merges

Johannes Schindelin committed over 8 years ago

git-rebase--interactive: clarify arguments

Stefan Beller committed over 8 years ago

sequencer: fast-forward `merge` commands, if possible

Johannes Schindelin committed over 8 years ago

sequencer: offer helpful advice when a command was rescheduled

Johannes Schindelin committed over 8 years ago

sequencer: introduce the `merge` command

Johannes Schindelin committed over 8 years ago

sequencer: refactor how original todo list lines are accessed

Johannes Schindelin committed over 8 years ago

sequencer: make rearrange_squash() a bit more obvious

Johannes Schindelin committed over 8 years ago

sequencer: avoid using errno clobbered by rollback_lock_file()

Johannes Schindelin committed over 8 years ago

perf/aggregate: use Getopt::Long for option parsing

Christian Couder committed over 8 years ago

cache.h: allow oid_object_info to handle arbitrary repositories

Stefan Beller committed over 8 years ago

packfile: add repository argument to cache_or_unpack_entry

Stefan Beller committed over 8 years ago

packfile: add repository argument to unpack_entry

Stefan Beller committed over 8 years ago

packfile: add repository argument to read_object

Stefan Beller committed over 8 years ago

packfile: add repository argument to packed_object_info

Jonathan Nieder committed over 8 years ago

packfile: add repository argument to packed_to_object_type

Stefan Beller committed over 8 years ago

packfile: add repository argument to retry_bad_packed_offset

Stefan Beller committed over 8 years ago

cache.h: add repository argument to oid_object_info

Stefan Beller committed over 8 years ago

cache.h: add repository argument to oid_object_info_extended

Stefan Beller committed over 8 years ago

The fourth batch for 2.18

Junio C Hamano committed over 8 years ago

Merge branch 'jm/mem-pool'

Junio C Hamano committed over 8 years ago