Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Sync with v2.1.4
[gitweb.git]
/
ll-merge.c
2014-09-19
Merge branch 'jp/index-with-corrupt-stages'
blob
|
diff
|
raw
2014-09-19
Merge branch 'jk/index-pack-threading-races'
blob
|
diff
|
raw
2014-09-19
Merge branch 'jk/commit-author-parsing'
blob
|
diff
|
raw
2014-09-19
Merge branch 'bb/date-iso-strict'
blob
|
diff
|
raw
2014-09-19
Merge branch 'mb/build-contrib-svn-fe'
blob
|
diff
|
raw
2014-09-19
Merge branch 'jk/fast-export-anonymize'
blob
|
diff
|
raw
2014-09-19
Merge branch 'jk/send-pack-many-refspecs'
blob
|
diff
|
raw
2014-09-12
Merge branch 'js/fsck-tag-validation' into HEAD
blob
|
diff
|
raw
2014-09-11
Merge branch 'br/imap-send-simplify-tunnel-child-process'
blob
|
diff
|
raw
2014-09-11
Merge branch 'jk/name-decoration-alloc'
blob
|
diff
|
raw
2014-09-11
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
blob
|
diff
|
raw
2014-09-11
Merge branch 'rs/list-optim'
blob
|
diff
|
raw
2014-09-11
Merge branch 'jk/fast-import-fixes'
blob
|
diff
|
raw
2014-09-11
Merge branch 'jk/prune-top-level-refs-after-packing'
blob
|
diff
|
raw
2014-09-11
Merge branch 'nd/large-blobs'
blob
|
diff
|
raw
2014-09-11
Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'
blob
|
diff
|
raw
2014-09-11
Merge branch 'dt/cache-tree-repair'
blob
|
diff
|
raw
2014-09-11
Merge branch 'rs/ref-transaction-1'
blob
|
diff
|
raw
2014-09-11
Merge branch 'nd/mv-code-cleaning'
blob
|
diff
|
raw
2014-09-11
Merge branch 'mm/discourage-commit-a-to-finish-conflict...
blob
|
diff
|
raw
2014-09-11
Merge branch 'jk/make-simplify-dependencies'
blob
|
diff
|
raw
2014-09-11
Merge branch 'et/spell-poll-infinite-with-minus-one...
blob
|
diff
|
raw
2014-09-11
Merge branch 'br/http-init-fix'
blob
|
diff
|
raw
2014-09-11
Merge branch 'rs/child-process-init'
blob
|
diff
|
raw
2014-09-11
Merge branch 'jk/contrib-subtree-make-all'
blob
|
diff
|
raw
2014-09-11
Merge branch 'ta/config-set-2'
blob
|
diff
|
raw
2014-08-13
ll-merge.c: refactor `read_merge_config()` to use ...
blob
|
diff
|
raw
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-03-31
Merge branch 'wt/doc-submodule-name-path-confusion-1'
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jc/check-attr-honor-working-tree' into...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/config-path-include-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-14
Merge branch 'jc/check-attr-honor-working-tree'
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jc/push-2.0-default-to-simple'
blob
|
diff
|
raw
|
diff to current
2014-02-27
Merge branch 'bs/stdio-undef-before-redef'
blob
|
diff
|
raw
|
diff to current
2014-02-27
Merge branch 'jk/config-path-include-fix'
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2013-12-17
Merge branch 'jk/two-way-merge-corner-case-fix' into...
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
|
diff to current
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
|
diff to current
2013-11-07
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
|
diff to current
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
|
diff to current
2013-11-04
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'sg/t3600-nul-sha1-fix'
blob
|
diff
|
raw
|
diff to current
2013-10-28
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
|
diff to current
2013-10-28
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
|
diff to current
2013-10-28
Merge branch 'jk/diff-algo' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'jc/cvsserver-perm-bit-fix' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'nv/doc-config-signingkey'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'jk/diff-algo'
blob
|
diff
|
raw
|
diff to current
2013-10-08
Merge branch 'tz/credential-netrc'
blob
|
diff
|
raw
|
diff to current
2013-09-26
Merge branch 'js/xread-in-full' into maint
blob
|
diff
|
raw
|
diff to current
2013-09-18
Merge branch 'jc/cvsserver-perm-bit-fix'
blob
|
diff
|
raw
|
diff to current
2013-09-12
Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
blob
|
diff
|
raw
|
diff to current
2013-09-11
Merge branch 'js/xread-in-full'
blob
|
diff
|
raw
|
diff to current
2013-09-04
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
|
diff to current
2013-08-05
Merge branch 'dn/test-reject-utf-16'
blob
|
diff
|
raw
|
diff to current
2013-07-31
Merge branch 'jk/commit-how-to-abort-cherry-pick'
blob
|
diff
|
raw
|
diff to current
2013-07-31
Merge branch 'ds/doc-two-kinds-of-tags'
blob
|
diff
|
raw
|
diff to current
2013-07-30
Merge branch 'jk/capabilities-doc'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'jk/t0008-sigpipe-fix'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'tr/protect-low-3-fds'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'sb/parse-object-buffer-eaten'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'dk/maint-t5150-dirname' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'dk/version-gen-gitdir' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'nk/config-local-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'kb/diff-blob-blob-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'mm/merge-in-dirty-worktree-doc' into...
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'mh/maint-lockfile-overflow' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-22
Merge branch 'jc/maint-diff-core-safecrlf' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-19
Merge branch 'rr/name-rev-stdin-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-19
Merge branch 'ft/diff-rename-default-score-is-half...
blob
|
diff
|
raw
|
diff to current
2013-07-19
Merge branch 'jc/t1512-fix' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-19
Merge branch 'mm/push-force-is-dangerous' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-15
Merge branch 'tr/maint-apply-non-git-patch-parsefix...
blob
|
diff
|
raw
|
diff to current
2013-07-15
Merge branch 'bc/http-keep-memory-given-to-curl' into...
blob
|
diff
|
raw
|
diff to current
2013-07-12
Merge branch 'rs/pickaxe-simplify'
blob
|
diff
|
raw
|
diff to current
2013-07-12
Merge branch 'rr/name-rev-stdin-doc'
blob
|
diff
|
raw
|
diff to current
2013-07-12
Merge branch 'ft/diff-rename-default-score-is-half'
blob
|
diff
|
raw
|
diff to current
2013-07-11
Merge branch 'jc/t1512-fix'
blob
|
diff
|
raw
|
diff to current
2013-07-11
Merge branch 'jc/maint-diff-core-safecrlf'
blob
|
diff
|
raw
|
diff to current
2013-07-11
Merge branch 'mh/maint-lockfile-overflow'
blob
|
diff
|
raw
|
diff to current
2013-07-03
Merge branch 'cr/git-work-tree-sans-git-dir' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-03
Merge branch 'fc/do-not-use-the-index-in-add-to-index...
blob
|
diff
|
raw
|
diff to current
next