Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/interpret-trailers-outside-a-repository'
[gitweb.git]
/
rerere.c
2015-08-19
Merge branch 'se/doc-checkout-ours-theirs' into maint
blob
|
diff
|
raw
2015-08-19
Merge branch 'cb/uname-in-untracked' into maint
blob
|
diff
|
raw
2015-08-19
Merge branch 'as/sparse-checkout-removal' into maint
blob
|
diff
|
raw
2015-08-19
Merge branch 'jx/do-not-crash-receive-pack-wo-head...
blob
|
diff
|
raw
2015-08-17
Merge branch 'ta/docfix-index-format-tech'
blob
|
diff
|
raw
2015-08-17
Merge branch 'mh/get-remote-group-fix'
blob
|
diff
|
raw
2015-08-12
Merge branch 'sb/remove-unused-var-from-builtin-add'
blob
|
diff
|
raw
2015-08-12
Merge branch 'dt/unpack-trees-cache-tree-revalidate'
blob
|
diff
|
raw
2015-08-12
Merge branch 'es/worktree-add-cleanup'
blob
|
diff
|
raw
2015-08-12
Merge branch 'es/worktree-add'
blob
|
diff
|
raw
2015-08-10
memoize common git-path "constant" files
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'es/doc-clean-outdated-tools'
blob
|
diff
|
raw
2015-08-03
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
blob
|
diff
|
raw
2015-08-03
Merge branch 'as/sparse-checkout-removal'
blob
|
diff
|
raw
2015-08-03
Merge branch 'cb/uname-in-untracked'
blob
|
diff
|
raw
2015-08-03
Merge branch 'se/doc-checkout-ours-theirs'
blob
|
diff
|
raw
2015-08-03
Merge branch 'kn/tag-doc-fix'
blob
|
diff
|
raw
2015-08-03
Merge branch 'mh/fast-import-get-mark'
blob
|
diff
|
raw
2015-08-03
Merge branch 'jc/commit-slab'
blob
|
diff
|
raw
2015-08-03
Merge branch 'nd/export-worktree'
blob
|
diff
|
raw
2015-08-03
Merge branch 'bc/gpg-verify-raw'
blob
|
diff
|
raw
2015-08-03
Merge branch 'pt/am-foreign'
blob
|
diff
|
raw
2015-08-03
Merge branch 'js/rebase-i-clean-up-upon-continue-to...
blob
|
diff
|
raw
2015-08-03
Merge branch 'sg/completion-commit-cleanup' into maint
blob
|
diff
|
raw
2015-08-03
Merge branch 'pt/am-abort-fix' into maint
blob
|
diff
|
raw
2015-08-03
Merge branch 'mh/reporting-broken-refs-from-for-each...
blob
|
diff
|
raw
2015-08-03
Merge branch 'sg/commit-cleanup-scissors' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'jk/pretty-encoding-doc' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'mm/branch-doc-updates' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'jc/fsck-retire-require-eoh' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'et/http-proxyauth' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'jc/unexport-git-pager-in-use-in-pager...
blob
|
diff
|
raw
2015-07-27
Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
blob
|
diff
|
raw
2015-07-27
Merge branch 'rh/test-color-avoid-terminfo-in-original...
blob
|
diff
|
raw
2015-07-27
Merge branch 'jk/fix-refresh-utime' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'cb/rebase-am-exit-code' into maint
blob
|
diff
|
raw
2015-07-27
Merge branch 'jk/index-pack-reduce-recheck' into maint
blob
|
diff
|
raw
2015-07-24
rerere: un-nest merge() further
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: use "struct rerere_id" instead of "char *"...
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: call conflict-ids IDs
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: further clarify do_rerere_one_path()
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: further de-dent do_plain_rerere()
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: refactor "replay" part of do_plain_rerere()
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: explain the remainder
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: explain "rerere forget" codepath
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: explain the primary codepath
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: explain MERGE_RR management helpers
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: fix benign off-by-one non-bug and clarify code
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: explain the rerere I/O abstraction
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: do not leak mmfile[] for a path with multiple...
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: stop looping unnecessarily
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: drop want_sp parameter from is_cmarker()
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: report autoupdated paths only after actually...
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: write out each record of MERGE_RR in one go
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: lift PATH_MAX limitation
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: plug conflict ID leaks
blob
|
diff
|
raw
|
diff to current
2015-07-24
rerere: handle conflicts with multiple stage #1 entries
blob
|
diff
|
raw
|
diff to current
2015-07-21
Merge branch 'tf/gitweb-typofix'
blob
|
diff
|
raw
2015-07-17
Merge branch 'jk/still-interesting'
blob
|
diff
|
raw
2015-07-17
Merge branch 'es/worktree-add'
blob
|
diff
|
raw
2015-07-15
Merge branch 'jc/diff-ws-error-highlight'
blob
|
diff
|
raw
2015-07-15
Merge branch 'mm/describe-doc' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'jc/prompt-document-ps1-state-separator...
blob
|
diff
|
raw
2015-07-15
Merge branch 'es/osx-header-pollutes-mask-macro' into...
blob
|
diff
|
raw
2015-07-15
Merge branch 'es/utf8-stupid-compiler-workaround' into...
blob
|
diff
|
raw
2015-07-15
Merge branch 'fk/doc-format-patch-vn' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'pt/t0302-needs-sanity' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'me/fetch-into-shallow-safety' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'mh/fsck-reflog-entries' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'af/tcsh-completion-noclobber' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'pa/auto-gc-mac-osx' into maint
blob
|
diff
|
raw
2015-07-15
Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
blob
|
diff
|
raw
2015-07-13
Merge branch 'es/worktree-add'
blob
|
diff
|
raw
2015-07-13
Merge branch 'nd/multiple-work-trees'
blob
|
diff
|
raw
2015-07-13
Merge branch 'jc/unexport-git-pager-in-use-in-pager'
blob
|
diff
|
raw
2015-07-13
Merge branch 'js/rebase-i-clean-up-upon-continue-to...
blob
|
diff
|
raw
2015-07-13
Merge branch 'et/http-proxyauth'
blob
|
diff
|
raw
2015-07-13
Merge branch 'jc/fsck-retire-require-eoh'
blob
|
diff
|
raw
2015-07-10
Merge branch 'cb/rebase-am-exit-code'
blob
|
diff
|
raw
2015-07-10
Merge branch 'jk/fix-refresh-utime'
blob
|
diff
|
raw
2015-07-10
Merge branch 'mm/branch-doc-updates'
blob
|
diff
|
raw
2015-07-10
Merge branch 'jk/rev-list-no-bitmap-while-pruning'
blob
|
diff
|
raw
2015-07-10
Merge branch 'cb/subtree-tests-update'
blob
|
diff
|
raw
2015-07-10
Merge branch 'rh/test-color-avoid-terminfo-in-original...
blob
|
diff
|
raw
2015-07-10
Merge branch 'jk/pretty-encoding-doc'
blob
|
diff
|
raw
2015-07-10
Merge branch 'nd/dwim-wildcards-as-pathspecs'
blob
|
diff
|
raw
2015-07-09
Merge branch 'jk/maint-for-each-packed-object'
blob
|
diff
|
raw
2015-07-09
Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'
blob
|
diff
|
raw
2015-07-01
Merge branch 'me/fetch-into-shallow-safety'
blob
|
diff
|
raw
2015-07-01
Merge branch 'jc/prompt-document-ps1-state-separator'
blob
|
diff
|
raw
2015-07-01
Merge branch 'mm/describe-doc'
blob
|
diff
|
raw
2015-07-01
Merge branch 'da/mergetool-winmerge'
blob
|
diff
|
raw
2015-06-28
rerere: fix an off-by-one non-bug
blob
|
diff
|
raw
|
diff to current
2015-06-26
Merge branch 'jk/stash-require-clean-index' into maint
blob
|
diff
|
raw
2015-06-26
Merge branch 'cb/array-size' into maint
blob
|
diff
|
raw
2015-06-25
Merge branch 'cn/cvsimport-perl-update'
blob
|
diff
|
raw
2015-06-25
Merge branch 'cb/array-size'
blob
|
diff
|
raw
2015-06-25
Merge branch 'sg/merge-summary-config' into maint
blob
|
diff
|
raw
2015-06-25
Merge branch 'jk/make-fix-dependencies' into maint
blob
|
diff
|
raw
2015-06-25
Merge branch 'sb/pack-protocol-mention-smart-http'...
blob
|
diff
|
raw
next