.gitattributes: add a diff driver for Python

Ævar Arnfjörð Bjarmason committed over 8 years ago

.gitattributes: use the "perl" differ for Perl

Ævar Arnfjörð Bjarmason committed over 8 years ago

.gitattributes: add *.pl extension for Perl

Ævar Arnfjörð Bjarmason committed over 8 years ago

replace: avoid using die() to indicate a bug

Johannes Schindelin committed over 8 years ago

commit: Let the callback of for_each_mergetag return on error

Johannes Schindelin committed over 8 years ago

argv_array: offer to split a string by whitespace

Johannes Schindelin committed over 8 years ago

rebase -i --rebase-merges: add a section to the man page

Johannes Schindelin committed over 8 years ago

rebase -i: introduce --rebase-merges=[no-]rebase-cousins

Johannes Schindelin committed over 8 years ago

pull: accept --rebase=merges to recreate the branch topology

Johannes Schindelin committed over 8 years ago

rebase --rebase-merges: avoid "empty merges"

Johannes Schindelin committed over 8 years ago

sequencer: handle post-rewrite for merge commands

Johannes Schindelin committed over 8 years ago

sequencer: make refs generated by the `label` command worktree-local

Johannes Schindelin committed over 8 years ago

rebase --rebase-merges: add test for --keep-empty

Phillip Wood committed over 8 years ago

rebase: introduce the --rebase-merges option

Johannes Schindelin committed over 8 years ago

sequencer: introduce new commands to reset the revision

Johannes Schindelin committed over 8 years ago

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