checkout -p: handle tree arguments correctly again

Johannes Schindelin committed almost 6 years ago

t4013: add tests for --diff-merges=first-parent

Sergey Organov committed almost 6 years ago

doc/git-show: include --diff-merges description

Sergey Organov committed almost 6 years ago

doc/rev-list-options: document --first-parent changes merges format

Sergey Organov committed almost 6 years ago

doc/diff-generate-patch: mention new --diff-merges option

Sergey Organov committed almost 6 years ago

doc/git-log: describe new --diff-merges options

Sergey Organov committed almost 6 years ago

diff-merges: add '--diff-merges=1' as synonym for 'first-parent'

Sergey Organov committed almost 6 years ago

diff-merges: add old mnemonic counterparts to --diff-merges

Sergey Organov committed almost 6 years ago

diff-merges: let new options enable diff without -p

Sergey Organov committed almost 6 years ago

diff-merges: do not imply -p for new options

Sergey Organov committed almost 6 years ago

diff-merges: implement new values for --diff-merges

Sergey Organov committed almost 6 years ago

diff-merges: make -m/-c/--cc explicitly mutually exclusive

Sergey Organov committed almost 6 years ago

diff-merges: refactor opt settings into separate functions

Sergey Organov committed almost 6 years ago

diff-merges: get rid of now empty diff_merges_init_revs()

Sergey Organov committed almost 6 years ago

diff-merges: group diff-merge flags next to each other inside 'rev_info'

Sergey Organov committed almost 6 years ago

diff-merges: split 'ignore_merges' field

Sergey Organov committed almost 6 years ago

diff-merges: fix -m to properly override -c/--cc

Sergey Organov committed almost 6 years ago

t4013: add tests for -m failing to override -c/--cc

Sergey Organov committed almost 6 years ago

t4013: support test_expect_failure through ':failure' magic

Sergey Organov committed almost 6 years ago

diff-merges: revise revs->diff flag handling

Sergey Organov committed almost 6 years ago