summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-05 16:31:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-05 16:31:28 -0800
commit53ac9ac9d384d6ca5090e0d02cd35c3ea2f110c0 (patch)
tree84aef511fa84be05b46ad2ca2fec6122d27d916e /Documentation/technical/trivial-merge.txt
parentMerge branch 'jk/log-cherry-pick-duplicate-patches' into maint (diff)
parentfsck doc: remove ancient out-of-date diagnostics (diff)
downloadtgif-53ac9ac9d384d6ca5090e0d02cd35c3ea2f110c0.tar.xz
Merge branch 'ab/fsck-doc-fix' into maint
Documentation for "git fsck" lost stale bits that has become incorrect. * ab/fsck-doc-fix: fsck doc: remove ancient out-of-date diagnostics
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions