Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅ next
commit
grep
author
committer
pickaxe
?
re
Merge gitk to pick up emergency build fix
[gitweb.git]
/
Documentation
/
technical
/
rerere.txt
2018-09-24
Merge branch 'en/sequencer-empty-edit-result-aborts'
blob
|
diff
|
raw
2018-09-24
Merge branch 'ds/reachable'
blob
|
diff
|
raw
2018-09-24
Merge branch 'nd/attr-pathspec-fix'
blob
|
diff
|
raw
2018-09-24
Merge branch 'bw/protocol-v2'
blob
|
diff
|
raw
2018-09-24
Merge branch 'sb/string-list-remove-unused'
blob
|
diff
|
raw
2018-09-24
Merge branch 'jk/dev-build-format-security'
blob
|
diff
|
raw
2018-09-24
Merge branch 'sg/t3701-tighten-trace'
blob
|
diff
|
raw
2018-09-24
Merge branch 'sb/diff-color-move-more'
blob
|
diff
|
raw
2018-09-24
Merge branch 'en/rerere-multi-stage-1-fix'
blob
|
diff
|
raw
2018-09-24
Merge branch 'js/mingw-o-append'
blob
|
diff
|
raw
2018-09-24
Merge branch 'en/double-semicolon-fix'
blob
|
diff
|
raw
2018-09-24
Merge branch 'jk/reopen-tempfile-truncate'
blob
|
diff
|
raw
2018-09-24
Merge branch 'bp/mv-submodules-with-fsmonitor'
blob
|
diff
|
raw
2018-09-24
Merge branch 'ds/format-patch-range-diff-test'
blob
|
diff
|
raw
2018-09-24
Merge branch 'tb/void-check-attr'
blob
|
diff
|
raw
2018-09-24
Merge branch 'js/rebase-i-autosquash-fix'
blob
|
diff
|
raw
2018-09-20
Merge branch 'ab/fetch-tags-noclobber'
blob
|
diff
|
raw
2018-09-20
Merge branch 'bp/checkout-new-branch-optim'
blob
|
diff
|
raw
2018-09-17
Merge branch 'nd/bisect-show-list-fix'
blob
|
diff
|
raw
2018-09-17
Merge branch 'ab/fetch-tags-noclobber'
blob
|
diff
|
raw
2018-09-17
Merge branch 'es/worktree-forced-ops-fix'
blob
|
diff
|
raw
2018-09-17
Merge branch 'sg/doc-trace-appends'
blob
|
diff
|
raw
2018-09-17
Merge branch 'jk/diff-rendered-docs'
blob
|
diff
|
raw
2018-09-17
Merge branch 'jk/patch-corrupted-delta-fix'
blob
|
diff
|
raw
2018-09-17
Merge branch 'ds/commit-graph-tests'
blob
|
diff
|
raw
2018-09-17
Merge branch 'jk/pack-objects-with-bitmap-fix'
blob
|
diff
|
raw
2018-09-17
Merge branch 'rs/mailinfo-format-flowed'
blob
|
diff
|
raw
2018-09-17
Merge branch 'jk/cocci'
blob
|
diff
|
raw
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 'cc/delta-islands'
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 '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