Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT
[gitweb.git]
/
builtin
/
merge-tree.c
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2014-06-25
Merge branch 'rr/rebase-autostash-fix' into maint
blob
|
diff
|
raw
2014-06-16
Merge branch 'rr/rebase-autostash-fix'
blob
|
diff
|
raw
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
2014-04-09
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
2014-04-09
Merge commit 'doc/http-backend: missing accent grave...
blob
|
diff
|
raw
2014-04-08
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
2014-03-31
Merge branch 'wt/doc-submodule-name-path-confusion-1'
blob
|
diff
|
raw
2014-03-18
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
2014-03-18
Merge branch 'jc/check-attr-honor-working-tree' into...
blob
|
diff
|
raw
2014-03-18
Merge branch 'jk/config-path-include-fix' into maint
blob
|
diff
|
raw
2014-03-18
Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
blob
|
diff
|
raw
2014-03-14
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
2014-03-14
Merge branch 'jc/check-attr-honor-working-tree'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/core-checkstat-2.0'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/add-2.0-ignore-removal'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jn/add-2.0-u-A-sans-pathspec'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/push-2.0-default-to-simple'
blob
|
diff
|
raw
2014-02-27
Merge branch 'bs/stdio-undef-before-redef'
blob
|
diff
|
raw
2014-02-27
Merge branch 'jk/config-path-include-fix'
blob
|
diff
|
raw
2014-02-13
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
2014-02-05
Merge branch 'jc/maint-pull-docfix' into maint
blob
|
diff
|
raw
2014-01-27
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
2014-01-27
Merge branch 'jc/maint-pull-docfix'
blob
|
diff
|
raw
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
blob
|
diff
|
raw
2013-12-17
Merge branch 'jk/two-way-merge-corner-case-fix' into...
blob
|
diff
|
raw
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/replace-perl-in-built-scripts'
blob
|
diff
|
raw
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'hn/log-graph-color-octopus' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
2013-11-04
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
2013-10-30
Merge branch 'nd/gc-lock-against-each-other'
blob
|
diff
|
raw
2013-10-30
Merge branch 'hn/log-graph-color-octopus'
blob
|
diff
|
raw
2013-10-30
Merge branch 'sg/t3600-nul-sha1-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/diff-algo' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'jh/checkout-auto-tracking' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'mg/more-textconv'
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/pack-objects'
blob
|
diff
|
raw
2013-10-18
Merge branch 'jc/reflog-doc'
blob
|
diff
|
raw
2013-10-17
Merge branch 'bc/http-backend-allow-405' into maint
blob
|
diff
|
raw
2013-10-17
Merge branch 'jc/cvsserver-perm-bit-fix' into maint
blob
|
diff
|
raw
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
2013-10-14
Merge branch 'nv/doc-config-signingkey'
blob
|
diff
|
raw
2013-10-14
Merge branch 'nd/clone-local-with-colon'
blob
|
diff
|
raw
2013-10-14
Merge branch 'jk/diff-algo'
blob
|
diff
|
raw
2013-10-08
Merge branch 'tz/credential-netrc'
blob
|
diff
|
raw
2013-09-26
Merge branch 'mm/rebase-continue-freebsd-WB' into maint
blob
|
diff
|
raw
2013-09-26
Merge branch 'js/xread-in-full' into maint
blob
|
diff
|
raw
2013-09-20
Merge branch 'mm/rebase-continue-freebsd-WB'
blob
|
diff
|
raw
2013-09-20
Merge branch 'jh/checkout-auto-tracking'
blob
|
diff
|
raw
2013-09-20
Merge branch 'bc/http-backend-allow-405'
blob
|
diff
|
raw
2013-09-18
Merge branch 'jl/some-submodule-config-are-not-boolean...
blob
|
diff
|
raw
2013-09-18
Merge branch 'jc/cvsserver-perm-bit-fix'
blob
|
diff
|
raw
2013-09-12
Merge branch 'jc/pager-configuration-doc'
blob
|
diff
|
raw
2013-09-12
Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
blob
|
diff
|
raw
2013-09-12
Merge branch 'mm/fast-import-feature-doc'
blob
|
diff
|
raw
2013-09-11
Merge branch 'js/xread-in-full'
blob
|
diff
|
raw
2013-09-09
Merge branch 'jc/diff-filter-negation'
blob
|
diff
|
raw
2013-09-05
Merge branch 'maint-1.8.2' into maint-1.8.3
blob
|
diff
|
raw
2013-09-04
Merge branch 'jl/some-submodule-config-are-not-boolean'
blob
|
diff
|
raw
2013-09-04
Merge branch 'nd/gc-lock-against-each-other'
blob
|
diff
|
raw
2013-09-04
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
2013-09-04
Merge branch 'bc/unuse-packfile'
blob
|
diff
|
raw
2013-09-04
Merge branch 'jc/check-x-z'
blob
|
diff
|
raw
2013-09-03
Merge branch 'maint-1.8.2' into maint-1.8.3
blob
|
diff
|
raw
2013-08-05
Merge branch 'dn/test-reject-utf-16'
blob
|
diff
|
raw
2013-08-01
Merge branch 'lf/echo-n-is-not-portable'
blob
|
diff
|
raw
2013-07-31
Merge branch 'rr/rebase-autostash'
blob
|
diff
|
raw
2013-07-31
Merge branch 'rj/commit-slab-fix'
blob
|
diff
|
raw
2013-07-31
Merge branch 'jk/commit-how-to-abort-cherry-pick'
blob
|
diff
|
raw
2013-07-31
Merge branch 'ds/doc-two-kinds-of-tags'
blob
|
diff
|
raw
2013-07-30
Merge branch 'jk/capabilities-doc'
blob
|
diff
|
raw
2013-07-25
Merge branch 'rj/sparse'
blob
|
diff
|
raw
2013-07-25
Merge branch 'ml/avoid-using-grep-on-crlf-files'
blob
|
diff
|
raw
2013-07-25
Merge branch 'sb/misc-fixes'
blob
|
diff
|
raw
2013-07-25
Merge branch 'tr/line-log'
blob
|
diff
|
raw
2013-07-22
Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
blob
|
diff
|
raw
2013-07-22
Merge branch 'jk/t0008-sigpipe-fix'
blob
|
diff
|
raw
2013-07-22
Merge branch 'db/show-ref-head'
blob
|
diff
|
raw
2013-07-22
Merge branch 'tr/protect-low-3-fds'
blob
|
diff
|
raw
2013-07-22
Merge branch 'sb/parse-object-buffer-eaten'
blob
|
diff
|
raw
2013-07-22
Merge branch 'dw/request-pull-diag'
blob
|
diff
|
raw
2013-07-22
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
2013-07-22
Merge branch 'mm/color-auto-default'
blob
|
diff
|
raw
2013-07-22
Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
blob
|
diff
|
raw
next