replace: introduce --convert-graft-file

Johannes Schindelin committed over 8 years ago

replace: prepare create_graft() for converting graft files wholesale

Johannes Schindelin committed over 8 years ago

replace: "libify" create_graft() and callees

Johannes Schindelin committed over 8 years ago

tests: introduce test_unset_prereq, for debugging

Johannes Schindelin committed over 8 years ago

worktree: teach "add" to check out existing branches

Thomas Gummerer committed over 8 years ago

worktree: factor out dwim_branch function

Thomas Gummerer committed over 8 years ago

worktree: improve message when creating a new worktree

Thomas Gummerer committed over 8 years ago

worktree: remove extra members from struct add_opts

Thomas Gummerer committed over 8 years ago

.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