Merge branch 'fr_2.30_rnd2' of github.com:jnavila/git

Jiang Xin committed over 5 years ago

t7900-maintenance: test for magic markers

Martin Ågren committed over 5 years ago

gc: fix handling of crontab magic markers

Martin Ågren committed over 5 years ago

git-maintenance.txt: add missing word

Martin Ågren committed over 5 years ago

checkout -p: handle tree arguments correctly again

Johannes Schindelin committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

diff-merges: refactor opt settings into separate functions

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

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

Sergey Organov committed over 5 years ago

diff-merges: split 'ignore_merges' field

Sergey Organov committed over 5 years ago