Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
completion: add support for completing email aliases
[gitweb.git]
/
rerere.c
2015-08-31
Merge branch 'hv/submodule-config'
blob
|
diff
|
raw
2015-08-31
Merge branch 'sg/config-name-only'
blob
|
diff
|
raw
2015-08-28
Sync with 2.5.1
blob
|
diff
|
raw
2015-08-28
Merge branch 'cc/trailers-corner-case-fix'
blob
|
diff
|
raw
2015-08-28
Merge branch 'dt/untracked-subdir'
blob
|
diff
|
raw
2015-08-26
Merge branch 'sg/help-group'
blob
|
diff
|
raw
2015-08-26
Merge branch 'sg/wt-status-header-inclusion'
blob
|
diff
|
raw
2015-08-26
Merge branch 'as/docfix-reflog-expire-unreachable'
blob
|
diff
|
raw
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
2015-08-26
Merge branch 'jc/calloc-pathspec'
blob
|
diff
|
raw
2015-08-26
Merge branch 'dt/untracked-sparse'
blob
|
diff
|
raw
2015-08-26
Merge branch 'pt/am-builtin'
blob
|
diff
|
raw
2015-08-26
Merge branch 'pt/am-builtin-abort-fix'
blob
|
diff
|
raw
2015-08-26
Merge branch 'po/po-readme'
blob
|
diff
|
raw
2015-08-26
Merge branch 'jv/send-email-selective-smtp-auth'
blob
|
diff
|
raw
2015-08-26
Merge branch 'ep/http-configure-ssl-version'
blob
|
diff
|
raw
2015-08-26
Merge branch 'ss/fix-config-fd-leak'
blob
|
diff
|
raw
2015-08-25
Sync with maint
blob
|
diff
|
raw
2015-08-25
Merge branch 'jk/test-with-x' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-25
Merge branch 'sb/check-return-from-read-ref' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-25
Merge branch 'cb/open-noatime-clear-errno'
blob
|
diff
|
raw
2015-08-25
Merge branch 'mh/tempfile'
blob
|
diff
|
raw
2015-08-25
Merge branch 'pt/am-builtin-options'
blob
|
diff
|
raw
2015-08-25
Merge branch 'dt/refs-pseudo'
blob
|
diff
|
raw
2015-08-25
Merge branch 'dt/notes-multiple'
blob
|
diff
|
raw
2015-08-25
Merge branch 'nd/dwim-wildcards-as-pathspecs'
blob
|
diff
|
raw
2015-08-25
Merge branch 'jk/long-error-messages'
blob
|
diff
|
raw
2015-08-25
Merge branch 'ee/clean-remove-dirs'
blob
|
diff
|
raw
2015-08-25
Merge branch 'jh/strbuf-read-use-read-in-full'
blob
|
diff
|
raw
2015-08-24
Merge 'jk/git-path' into kn/for-each-tag
blob
|
diff
|
raw
2015-08-19
Sync with maint
blob
|
diff
|
raw
2015-08-19
Merge branch 'tb/complete-rebase-i-edit-todo'
blob
|
diff
|
raw
2015-08-19
Merge branch 'jk/git-path'
blob
|
diff
|
raw
2015-08-19
Merge branch 'jc/finalize-temp-file'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'jk/test-with-x'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'sb/check-return-from-read-ref'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'ta/docfix-index-format-tech' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'sb/remove-unused-var-from-builtin-add...
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'kn/tag-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'es/doc-clean-outdated-tools' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'nd/export-worktree' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'se/doc-checkout-ours-theirs' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'cb/uname-in-untracked' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'as/sparse-checkout-removal' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'jx/do-not-crash-receive-pack-wo-head...
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge 'hv/submodule-config' to 'sb/submodule-helper'
blob
|
diff
|
raw
2015-08-17
Merge branch 'ta/docfix-index-format-tech'
blob
|
diff
|
raw
|
diff to current
2015-08-17
Merge branch 'mh/get-remote-group-fix'
blob
|
diff
|
raw
|
diff to current
2015-08-12
Merge branch 'sb/remove-unused-var-from-builtin-add'
blob
|
diff
|
raw
|
diff to current
2015-08-12
Merge branch 'dt/unpack-trees-cache-tree-revalidate'
blob
|
diff
|
raw
|
diff to current
2015-08-12
Merge branch 'es/worktree-add-cleanup'
blob
|
diff
|
raw
|
diff to current
2015-08-12
Merge branch 'es/worktree-add'
blob
|
diff
|
raw
|
diff to current
2015-08-10
memoize common git-path "constant" files
blob
|
diff
|
raw
2015-08-03
Merge branch 'es/doc-clean-outdated-tools'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'as/sparse-checkout-removal'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'cb/uname-in-untracked'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'se/doc-checkout-ours-theirs'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'kn/tag-doc-fix'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'mh/fast-import-get-mark'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'jc/commit-slab'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'nd/export-worktree'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'bc/gpg-verify-raw'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'pt/am-foreign'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'js/rebase-i-clean-up-upon-continue-to...
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'sg/completion-commit-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'pt/am-abort-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'mh/reporting-broken-refs-from-for-each...
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'sg/commit-cleanup-scissors' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/pretty-encoding-doc' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'mm/branch-doc-updates' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jc/fsck-retire-require-eoh' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'et/http-proxyauth' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jc/unexport-git-pager-in-use-in-pager...
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'rh/test-color-avoid-terminfo-in-original...
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/fix-refresh-utime' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'cb/rebase-am-exit-code' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/index-pack-reduce-recheck' into maint
blob
|
diff
|
raw
|
diff to current
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
|
diff to current
next