Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tg/rerere-doc-updates'
[gitweb.git]
/
Documentation
/
technical
/
rerere.txt
2018-09-17
Merge branch 'tg/rerere-doc-updates'
blob
|
diff
|
raw
2018-09-17
Merge branch 'es/format-patch-rangediff'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'es/format-patch-interdiff'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'cc/delta-islands'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'jk/trailer-fixes'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'sb/range-diff-colors'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'jk/pack-delta-reuse-with-bitmap'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'nd/unpack-trees-with-cache-tree'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'ds/reachable'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'sb/submodule-update-in-c'
blob
|
diff
|
raw
|
diff to current
2018-09-17
Merge branch 'tg/rerere'
blob
|
diff
|
raw
|
diff to current
2018-08-29
rerere: mention caveat about unmatched conflict markers
blob
|
diff
|
raw
2018-08-06
rerere: teach rerere to handle nested conflicts
blob
|
diff
|
raw
|
diff to current
2018-08-06
rerere: add documentation for conflict normalization
blob
|
diff
|
raw
|
diff to current