Merge branch 'nd/diff-parseopt'
[gitweb.git] / Documentation / technical / rerere.txt
2018-09-17 Merge branch 'jk/patch-corrupted-delta-fix'
2018-09-17 Merge branch 'ds/commit-graph-tests'
2018-09-17 Merge branch 'jk/pack-objects-with-bitmap-fix'
2018-09-17 Merge branch 'rs/mailinfo-format-flowed'
2018-09-17 Merge branch 'jk/cocci'
2018-09-17 Merge branch 'tg/rerere-doc-updates'
2018-09-17 Merge branch 'es/format-patch-rangediff'
2018-09-17 Merge branch 'cc/delta-islands'
2018-09-17 Merge branch 'es/format-patch-interdiff'
2018-09-17 Merge branch 'jk/trailer-fixes'
2018-09-17 Merge branch 'sb/range-diff-colors'
2018-09-17 Merge branch 'jk/pack-delta-reuse-with-bitmap'
2018-09-17 Merge branch 'nd/unpack-trees-with-cache-tree'
2018-09-17 Merge branch 'ds/reachable'
2018-09-17 Merge branch 'sb/submodule-update-in-c'
2018-09-17 Merge branch 'tg/rerere'
2018-08-29 rerere: mention caveat about unmatched conflict markers
2018-08-06 rerere: teach rerere to handle nested conflicts
2018-08-06 rerere: add documentation for conflict normalization