undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
git-commit-vandalism/builtin
History
Sergey Organov 17c13e60fd diff-merges: introduce log.diffMerges config variable 
New log.diffMerges configuration variable sets the format that
--diff-merges=on will be using. The default is "separate".

t4013: add the following tests for log.diffMerges config:

* Test that wrong values are denied.

* Test that the value of log.diffMerges properly affects both
--diff-merges=on and -m.

t9902: fix completion tests for log.d* to match log.diffMerges.

Added documentation for log.diffMerges.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-04-16 23:38:35 -07:00
..
add.c
add: propagate --chmod errors to exit status
2021-02-24 12:14:51 -08:00
am.c
builtin/*: update usage format
2021-01-06 15:10:49 -08:00
annotate.c
strvec: rename struct fields
2020-07-30 19:18:06 -07:00
apply.c
…
archive.c
…
bisect--helper.c
Merge branch 'jk/bisect-peel-tag-fix'
2021-03-19 15:25:37 -07:00
blame.c
Merge branch 'rs/blame-optim'
2021-02-25 16:43:29 -08:00
branch.c
Merge branch 'ph/use-delete-refs'
2021-02-05 16:40:45 -08:00
bugreport.c
builtin/bugreport.c: use thread-safe localtime_r()
2020-12-01 13:05:37 -08:00
bundle.c
Merge branch 'bc/sha-256-part-3'
2020-08-11 18:04:11 -07:00
cat-file.c
Merge branch 'cc/cat-file-usage-update' into master
2020-07-09 14:00:41 -07:00
check-attr.c
…
check-ignore.c
dir: fix problematic API to avoid memory leaks
2020-08-18 17:17:31 -07:00
check-mailmap.c
shortlog: remove unused(?) "repo-abbrev" feature
2021-01-12 14:04:42 -08:00
check-ref-format.c
…
checkout-index.c
checkout-index: omit entries with no tempname from --temp output
2021-02-16 11:27:18 -08:00
checkout.c
cache-tree: clean up cache_tree_update()
2021-01-23 17:14:07 -08:00
clean.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
clone.c
Merge branch 'jt/clone-unborn-head'
2021-02-17 17:21:40 -08:00
column.c
…
commit-graph.c
builtin/*: update usage format
2021-01-06 15:10:49 -08:00
commit-tree.c
…
commit.c
shortlog: remove unused(?) "repo-abbrev" feature
2021-01-12 14:04:42 -08:00
config.c
config: implement --fixed-value with --get*
2020-11-25 14:43:48 -08:00
count-objects.c
…
credential-cache--daemon.c
make credential helpers builtins
2020-08-13 11:02:08 -07:00
credential-cache.c
Merge branch 'jc/undash-in-tree-git-callers'
2020-09-03 12:37:03 -07:00
credential-store.c
crendential-store: use timeout when locking file
2020-11-25 12:30:18 -08:00
credential.c
credential: load default config
2020-10-16 12:30:45 -07:00
describe.c
refs: switch peel_ref() to peel_iterated_oid()
2021-01-21 15:51:31 -08:00
diff-files.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff-index.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff-tree.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
difftool.c
Use new HASHMAP_INIT macro to simplify hashmap initialization
2020-11-11 12:55:27 -08:00
env--helper.c
assert PARSE_OPT_NONEG in parse-options callbacks
2020-09-30 12:53:47 -07:00
fast-export.c
builtin/*: update usage format
2021-01-06 15:10:49 -08:00
fast-import.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
fetch-pack.c
connect, transport: encapsulate arg in struct
2021-02-05 13:49:54 -08:00
fetch.c
Merge branch 'jt/clone-unborn-head'
2021-02-17 17:21:40 -08:00
fmt-merge-msg.c
…
for-each-ref.c
ref-filter: move ref_sorting flags to a bitfield
2021-01-07 15:13:21 -08:00
for-each-repo.c
for-each-repo: do nothing on empty config
2021-01-07 19:12:02 -08:00
fsck.c
fsck: make fsck_config() re-usable
2021-01-05 14:58:29 -08:00
gc.c
maintenance: fix incorrect maintenance.repo path with bare repository
2021-02-23 00:22:45 -08:00
get-tar-commit-id.c
…
grep.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
hash-object.c
…
help.c
help: drop usage of 'common' and 'useful' for guides
2020-08-04 18:34:01 -07:00
index-pack.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
init-db.c
get_default_branch_name(): prepare for showing some advice
2020-12-13 15:53:50 -08:00
interpret-trailers.c
…
log.c
diff-merges: introduce log.diffMerges config variable
2021-04-16 23:38:35 -07:00
ls-files.c
ls-files.c: add --deduplicate option
2021-01-23 11:48:20 -08:00
ls-remote.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
ls-tree.c
…
mailinfo.c
…
mailsplit.c
…
merge-base.c
…
merge-file.c
…
merge-index.c
…
merge-ours.c
…
merge-recursive.c
…
merge-tree.c
merge-base, xdiff: zero out xpparam_t structures
2020-10-20 12:53:26 -07:00
merge.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
mktag.c
mktag: add a --[no-]strict option
2021-01-06 14:22:24 -08:00
mktree.c
…
multi-pack-index.c
…
mv.c
git mv foo FOO ; git mv foo bar gave an assert
2021-03-03 17:07:12 -08:00
name-rev.c
oid_pos(): access table through const pointers
2021-01-28 12:03:26 -08:00
notes.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
pack-objects.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
pack-redundant.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
pack-refs.c
…
patch-id.c
…
prune-packed.c
…
prune.c
…
pull.c
pull: display default warning only when non-ff
2020-12-15 17:39:42 -08:00
push.c
Merge branch 'jc/push-delete-nothing'
2021-02-25 16:43:33 -08:00
range-diff.c
Merge branch 'js/range-diff-one-side-only'
2021-02-17 17:21:41 -08:00
read-tree.c
…
rebase.c
rebase: add a config option for --no-fork-point
2021-02-24 11:49:10 -08:00
receive-pack.c
Merge branch 'rs/calloc-array'
2021-03-19 15:25:38 -07:00
reflog.c
reflog expire --stale-fix: be generous about missing objects
2021-02-11 09:21:52 -08:00
remote-ext.c
strvec: convert builtin/ callers away from argv_array name
2020-07-28 15:02:18 -07:00
remote-fd.c
…
remote.c
config: convert multi_replace to flags
2020-11-25 14:43:47 -08:00
repack.c
packfile: prepare for the existence of '*.rev' files
2021-01-25 18:32:43 -08:00
replace.c
strvec: rename struct fields
2020-07-30 19:18:06 -07:00
rerere.c
…
reset.c
wt-status: tolerate dangling marks
2020-09-02 14:39:25 -07:00
rev-list.c
rev-list: add --disk-usage option for calculating disk usage
2021-02-11 09:57:55 -08:00
rev-parse.c
rev-parse: add option for absolute or relative path formatting
2020-12-12 23:35:51 -08:00
revert.c
Merge branch 'en/merge-ort-api-null-impl'
2020-11-18 13:32:53 -08:00
rm.c
…
send-pack.c
push: parse and set flag for "--force-if-includes"
2020-10-03 09:59:19 -07:00
shortlog.c
Merge branch 'ab/mailmap'
2021-01-25 14:19:19 -08:00
show-branch.c
Merge branch 'jt/interpret-branch-name-fallback'
2020-09-09 13:53:09 -07:00
show-index.c
…
show-ref.c
refs: switch peel_ref() to peel_iterated_oid()
2021-01-21 15:51:31 -08:00
sparse-checkout.c
sparse-checkout: load sparse-checkout patterns
2021-01-23 17:14:07 -08:00
stash.c
Merge branch 'js/params-vs-args'
2021-02-25 16:43:32 -08:00
stripspace.c
…
submodule--helper.c
Merge branch 'tb/precompose-prefix-too'
2021-02-12 14:21:04 -08:00
symbolic-ref.c
…
tag.c
Merge branch 'js/params-vs-args'
2021-02-25 16:43:32 -08:00
unpack-file.c
…
unpack-objects.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
update-index.c
…
update-ref.c
update-ref: disallow "start" for ongoing transactions
2020-11-16 13:44:01 -08:00
update-server-info.c
…
upload-archive.c
strvec: rename struct fields
2020-07-30 19:18:06 -07:00
upload-pack.c
…
var.c
…
verify-commit.c
…
verify-pack.c
Merge branch 'bc/sha-256-part-3'
2020-08-11 18:04:11 -07:00
verify-tag.c
…
worktree.c
worktree: teach list verbose mode
2021-01-30 09:57:40 -08:00
write-tree.c
…