rebase -m: don't print exit code 2 when merge fails

Martin von Zweigbergk committed almost 16 years ago

rebase -m: remember allow_rerere_autoupdate option

Martin von Zweigbergk committed almost 16 years ago

rebase: remember strategy and strategy options

Martin von Zweigbergk committed almost 16 years ago

rebase: remember verbose option

Martin von Zweigbergk committed almost 16 years ago

rebase: extract code for writing basic state

Martin von Zweigbergk committed almost 16 years ago

rebase: factor out sub command handling

Martin von Zweigbergk committed almost 16 years ago

rebase: make -v a tiny bit more verbose

Martin von Zweigbergk committed almost 16 years ago

rebase -i: align variable names

Martin von Zweigbergk committed almost 16 years ago

rebase: show consistent conflict resolution hint

Martin von Zweigbergk committed almost 16 years ago

rebase: extract am code to new source file

Martin von Zweigbergk committed almost 16 years ago

rebase: extract merge code to new source file

Martin von Zweigbergk committed almost 16 years ago

rebase: remove $branch as synonym for $orig_head

Martin von Zweigbergk committed almost 16 years ago

rebase: factor out reference parsing

Martin von Zweigbergk committed almost 16 years ago

rebase -i: support --stat

Martin von Zweigbergk committed almost 16 years ago

rebase: reorder validation steps

Martin von Zweigbergk committed almost 16 years ago

rebase: factor out call to pre-rebase hook

Martin von Zweigbergk committed almost 16 years ago

rebase -i: remove now unnecessary directory checks

Martin von Zweigbergk committed almost 16 years ago

rebase: factor out clean work tree check

Martin von Zweigbergk committed almost 16 years ago

rebase: factor out command line option processing

Martin von Zweigbergk committed almost 16 years ago

rebase: align variable content

Martin von Zweigbergk committed almost 16 years ago