Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
convert ewah/bitmap code to use xmalloc
[gitweb.git]
/
merge.c
2016-02-05
Merge branch 'lv/add-doc-working-tree' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ss/clone-depth-single-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'sg/t6050-failing-editor-test-fix' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/for-each-ref-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ss/user-manual' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'js/dirname-basename' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'tb/complete-word-diff-regex' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/diff-with-path-params' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'dw/subtree-split-do-not-drop-merge' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/svn-1.9.0-auth' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/sanity' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/filter-branch-no-index' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'ho/gitweb-squelch-undef-warning' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'js/fopen-harder' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/exclusion-regression-fix' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'dk/reflog-walk-with-non-commit' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'dw/signoff-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/clang-pedantic' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/send-email-mutt-alias-fix' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/dir-exclude-cleanup' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/stop-setenv-work-tree' into maint
blob
|
diff
|
raw
2016-01-04
Sync with 2.6.5
blob
|
diff
|
raw
2016-01-04
Merge branch 'jk/pending-keep-tag-name' into maint
blob
|
diff
|
raw
|
diff to current
2015-12-28
Merge branch 'jk/pending-keep-tag-name'
blob
|
diff
|
raw
2015-12-28
Merge branch 'jk/symbolic-ref-maint'
blob
|
diff
|
raw
2015-12-22
Merge branch 'js/emu-write-epipe-on-windows'
blob
|
diff
|
raw
2015-12-21
Merge branch 'jk/ident-loosen-getpwuid'
blob
|
diff
|
raw
2015-12-21
Merge branch 'jk/send-email-ssl-errors'
blob
|
diff
|
raw
2015-12-21
Merge branch 'sg/completion-no-column'
blob
|
diff
|
raw
2015-12-21
Merge branch 'mc/push-recurse-submodules-config'
blob
|
diff
|
raw
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-12-16
Merge branch 'fr/rebase-i-continue-preserve-options'
blob
|
diff
|
raw
2015-12-16
Merge branch 'maint'
blob
|
diff
|
raw
2015-12-15
Sync with maint
blob
|
diff
|
raw
2015-12-15
Merge branch 'jk/send-email-complete-aliases'
blob
|
diff
|
raw
2015-12-15
Merge branch 'ep/ident-with-getaddrinfo'
blob
|
diff
|
raw
2015-12-15
Merge branch 'jk/prune-mtime' into maint
blob
|
diff
|
raw
|
diff to current
2015-12-15
Merge branch 'ls/p4-keep-empty-commits'
blob
|
diff
|
raw
2015-12-15
Merge branch 'jk/prune-mtime'
blob
|
diff
|
raw
2015-12-11
Merge branch 'maint'
blob
|
diff
|
raw
2015-12-11
Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
blob
|
diff
|
raw
2015-12-11
Merge branch 'sb/doc-submodule-sync-recursive'
blob
|
diff
|
raw
2015-12-11
Merge branch 'cb/t3404-shellquote'
blob
|
diff
|
raw
2015-12-11
Merge branch 'sg/lock-file-commit-error'
blob
|
diff
|
raw
2015-12-11
Merge branch 'master' of git://github.com/git-l10n...
blob
|
diff
|
raw
2015-12-10
Sync with maint
blob
|
diff
|
raw
2015-12-10
Merge branch 'nd/doc-check-ref-format-typo'
blob
|
diff
|
raw
2015-12-10
Merge branch 'bc/object-id'
blob
|
diff
|
raw
2015-12-01
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
diff
|
raw
|
diff to current
2015-11-25
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
diff
|
raw
|
diff to current
2015-11-20
Convert struct object to object_id
blob
|
diff
|
raw
2015-11-05
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
|
diff to current
2015-11-05
Merge branch 'jc/add-u-A-default-to-top' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-04
Merge branch 'xf/user-manual-ff' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-04
Merge branch 'xf/user-manual-markup' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-04
Merge branch 'jc/everyday-markup' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-03
Merge branch 'jk/merge-file-exit-code' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-03
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge branch 'jk/merge-file-exit-code'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge branch 'xf/user-manual-ff'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge branch 'jc/add-u-A-default-to-top'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-29
Merge branch 'jc/everyday-markup'
blob
|
diff
|
raw
|
diff to current
2015-10-29
Merge branch 'xf/user-manual-markup'
blob
|
diff
|
raw
|
diff to current
2015-10-20
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'tk/doc-interpret-trailers-grammo' into...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'sb/http-flaky-test-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jw/make-arflags-customizable' into maint
blob
|
diff
|
raw
|
diff to current
2015-10-15
Merge branch 'tk/doc-interpret-trailers-grammo'
blob
|
diff
|
raw
|
diff to current
2015-10-15
Merge branch 'sb/http-flaky-test-fix'
blob
|
diff
|
raw
|
diff to current
2015-10-14
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jw/make-arflags-customizable'
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'as/config-doc-markup-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'br/svn-doc-include-paths-config' into...
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'ah/submodule-typofix-in-error' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge branch 'mp/t7060-diff-index-test'
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge branch 'gb/apply-comment-typofix'
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'ee/clean-test-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'sg/t3020-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'jh/strbuf-read-use-read-in-full' into...
blob
|
diff
|
raw
|
diff to current
2015-09-02
Merge branch 'ee/clean-test-fixes'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/submodule-typofix-in-error'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/reflog-typofix-in-error'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/read-tree-usage-string'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/pack-objects-usage-strings'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'br/svn-doc-include-paths-config'
blob
|
diff
|
raw
|
diff to current
2015-08-31
Merge branch 'sg/describe-contains'
blob
|
diff
|
raw
|
diff to current
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-08-25
Merge branch 'jh/strbuf-read-use-read-in-full'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'jc/finalize-temp-file'
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 'nd/export-worktree' 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
next