index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
diff-merges.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
diff-merges: introduce '--dd' option
Sergey Organov
2023-10-09
1
-0
/
+3
*
object.h: stop depending on cache.h; make cache.h depend on object.h
Elijah Newren
2023-02-24
1
-0
/
+1
*
treewide: ensure one of the appropriate headers is sourced first
Elijah Newren
2023-02-24
1
-0
/
+1
*
diff-merges: cleanup set_diff_merges()
Sergey Organov
2022-09-16
1
-11
/
+19
*
diff-merges: cleanup func_by_opt()
Sergey Organov
2022-09-16
1
-5
/
+5
*
Merge branch 'ja/i18n-common-messages'
Junio C Hamano
2022-02-26
1
-1
/
+1
|
\
|
*
i18n: factorize "invalid value" messages
Jean-Noël Avila
2022-02-04
1
-1
/
+1
*
|
diff-merges: avoid history simplifications when diffing merges
Elijah Newren
2022-02-02
1
-0
/
+2
*
|
show, log: provide a --remerge-diff capability
Elijah Newren
2022-02-02
1
-0
/
+12
|
/
*
diff-index: restore -c/--cc options handling
Sergey Organov
2021-09-07
1
-10
/
+4
*
Revert 'diff-merges: let "-m" imply "-p"'
Jonathan Nieder
2021-08-09
1
-1
/
+0
*
diff-merges: let "-m" imply "-p"
Sergey Organov
2021-05-21
1
-0
/
+1
*
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
Sergey Organov
2021-05-21
1
-5
/
+5
*
diff-merges: move specific diff-index "-m" handling to diff-index
Sergey Organov
2021-05-21
1
-12
/
+13
*
diff-merges: introduce log.diffMerges config variable
Sergey Organov
2021-04-17
1
-0
/
+11
*
diff-merges: adapt -m to enable default diff format
Sergey Organov
2021-04-17
1
-4
/
+4
*
diff-merges: refactor set_diff_merges()
Sergey Organov
2021-04-17
1
-15
/
+21
*
diff-merges: introduce --diff-merges=on
Sergey Organov
2021-04-17
1
-0
/
+7
*
diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
Sergey Organov
2020-12-21
1
-1
/
+1
*
diff-merges: add old mnemonic counterparts to --diff-merges
Sergey Organov
2020-12-21
1
-3
/
+3
*
diff-merges: let new options enable diff without -p
Sergey Organov
2020-12-21
1
-5
/
+12
*
diff-merges: do not imply -p for new options
Sergey Organov
2020-12-21
1
-8
/
+12
*
diff-merges: implement new values for --diff-merges
Sergey Organov
2020-12-21
1
-3
/
+16
*
diff-merges: make -m/-c/--cc explicitly mutually exclusive
Sergey Organov
2020-12-21
1
-0
/
+3
*
diff-merges: refactor opt settings into separate functions
Sergey Organov
2020-12-21
1
-22
/
+41
*
diff-merges: get rid of now empty diff_merges_init_revs()
Sergey Organov
2020-12-21
1
-4
/
+0
*
diff-merges: split 'ignore_merges' field
Sergey Organov
2020-12-21
1
-18
/
+13
*
diff-merges: fix -m to properly override -c/--cc
Sergey Organov
2020-12-21
1
-0
/
+1
*
diff-merges: revise revs->diff flag handling
Sergey Organov
2020-12-21
1
-3
/
+1
*
diff-merges: handle imply -p on -c/--cc logic for log.c
Sergey Organov
2020-12-21
1
-0
/
+5
*
diff-merges: introduce revs->first_parent_merges flag
Sergey Organov
2020-12-21
1
-0
/
+2
*
diff-merges: new function diff_merges_set_dense_combined_if_unset()
Sergey Organov
2020-12-21
1
-2
/
+14
*
diff-merges: new function diff_merges_suppress()
Sergey Organov
2020-12-21
1
-2
/
+15
*
diff-merges: re-arrange functions to match the order they are called in
Sergey Organov
2020-12-21
1
-10
/
+14
*
diff-merges: rename diff_merges_default_to_enable() to match semantics
Sergey Organov
2020-12-21
1
-1
/
+1
*
diff-merges: move checks for first_parent_only out of the module
Sergey Organov
2020-12-21
1
-6
/
+4
*
diff-merges: rename all functions to have common prefix
Sergey Organov
2020-12-21
1
-5
/
+5
*
revision: move diff merges functions to its own diff-merges.c
Sergey Organov
2020-12-21
1
-0
/
+76
