?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
diff-merges: adapt -m to enable default diff format
2021-04-17 Sergey Organovdiff-merges: adapt -m to enable default diff format
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2021-04-17 Sergey Organovdiff-merges: refactor set_diff_merges()
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2021-04-17 Sergey Organovdiff-merges: introduce --diff-merges=on
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovt4013: add tests for --diff-merges=first-parent
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdoc/git-show: include --diff-merges description
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdoc/rev-list-options: document --first-parent changes...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdoc/diff-generate-patch: mention new --diff-merges...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdoc/git-log: describe new --diff-merges options
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: add '--diff-merges=1' as synonym for ...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: add old mnemonic counterparts to --diff...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: let new options enable diff without -p
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: do not imply -p for new options
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: implement new values for --diff-merges
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: make -m/-c/--cc explicitly mutually exclusive
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: refactor opt settings into separate functions
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: get rid of now empty diff_merges_init_revs()
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: group diff-merge flags next to each other...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: split 'ignore_merges' field
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: fix -m to properly override -c/--cc
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovt4013: add tests for -m failing to override -c/--cc
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovt4013: support test_expect_failure through ':failure...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: revise revs->diff flag handling
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: handle imply -p on -c/--cc logic for log.c
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: introduce revs->first_parent_merges flag
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: new function diff_merges_set_dense_combined_if_...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: new function diff_merges_suppress()
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: re-arrange functions to match the order...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: rename diff_merges_default_to_enable(...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: move checks for first_parent_only out...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovdiff-merges: rename all functions to have common prefix
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovrevision: move diff merges functions to its own diff...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovrevision: provide implementation for diff merges tweaks
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovrevision: factor out initialization of diff-merge related...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovrevision: factor out setup of diff-merge related settings
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-21 Sergey Organovrevision: factor out parsing of diff-merge related...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-12-02 Sergey Organovglossary: improve "branch" definition
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-10-31 Sergey Organovdoc/diff-options: fix out of place mentions of '--patch/-p'
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-09-29 Sergey Organovdiff: get rid of redundant 'dense' argument
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-09-06 Sergey Organovlog_tree_diff: get rid of extra check for NULL
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-09-06 Sergey Organovlog_tree_diff: get rid of code duplication for first_parent_only
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-31 Sergey Organovrevision: add separate field for "-m" of "diff-index -m"
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-27 Sergey Organovpretty-options.txt: fix --no-abbrev-commit description
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-11 Sergey Organovt/t4013: add test for --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-11 Sergey Organovdoc/git-log: describe --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-11 Sergey Organovrevision: change "--diff-merges" option to require...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2020-08-05 Sergey Organovrevision: fix die() message for "--unpacked="
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2019-01-07 Sergey Organovt3506: validate '-m 1 -ff' is now accepted for non...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2019-01-07 Sergey Organovt3502: validate '-m 1' argument is now accepted for...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2018-12-26 Sergey Organovcherry-pick: do not error on non-merge commits when...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2018-12-26 Sergey Organovt3510: stop using '-m 1' to force failure mid-sequence...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2018-04-17 Sergey Organovglossary: substitute "ancestor" for "direct ancestor...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2014-09-29 Sergey OrganovDocumentation/git-rebase.txt: document when --fork...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2014-09-16 Sergey OrganovDocumentation/git-rebase.txt: <upstream> must be given...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
2014-08-12 Sergey OrganovDocumentation/git-rebase.txt: -f forces a rebase that...
Signed-off-by: Sergey Organov <sorganov@gmail.com>
 commit | commitdiff | tree
Alternate source for your git.git needs