Merge branch 'maint'
[gitweb.git] / merge-recursive.c
2010-02-06 Merge branch 'maint'
2010-02-05 Merge branch 'jc/maint-limit-note-output' into maint
2010-02-01 Merge branch 'sp/maint-fast-import-large-blob' into...
2010-01-30 Merge branch 'maint'
2010-01-30 Merge branch 'maint-1.6.5' into maint
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-28 Merge branch 'maint'
2010-01-28 Merge branch 'gp/maint-cvsserver'
2010-01-27 Merge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27 Merge branch 'il/maint-colon-address'
2010-01-27 Merge branch 'il/maint-xmallocz'
2010-01-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-25 Merge branch 'jc/fix-tree-walk'
2010-01-24 Merge branch 'maint'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-24 Merge branch 'doc-style/for-next' of git://repo.or...
2010-01-23 Merge branch 'maint'
2010-01-23 Merge branch 'jc/branch-d'
2010-01-23 Merge branch 'il/rev-glob'
2010-01-23 Merge branch 'js/refer-upstream'
2010-01-23 Merge branch 'jl/submodule-diff'
2010-01-23 Merge branch 'il/remote-updates'
2010-01-23 Merge branch 'il/branch-set-upstream'
2010-01-23 Merge branch 'jc/maint-limit-note-output'
2010-01-23 Merge branch 'nd/ls-files-sparse-fix'
2010-01-22 Merge branch 'maint'
2010-01-22 merge-recursive: do not return NULL only to cause segfault
2010-01-21 Merge branch 'bw/cvsimport'
2010-01-21 Merge branch 'jc/checkout-merge-base'
2010-01-21 Merge branch 'ag/patch-header-verify'
2010-01-21 Merge branch 'jc/conflict-marker-size'
2010-01-21 Merge branch 'ag/maint-apply-too-large-p'
2010-01-21 Merge branch 'ap/merge-backend-opts'
2010-01-20 Merge branch 'bg/maint-remote-update-default' into...
2010-01-20 Merge branch 'sb/maint-octopus' into maint
2010-01-20 Merge branch 'bg/maint-add-all-doc' into maint
2010-01-20 Merge branch 'maint-1.6.5' into maint
2010-01-20 Merge branch 'jk/maint-1.6.5-reset-hard' into maint...
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-19 Merge branch 'maint-1.6.3' into maint-1.6.4
2010-01-19 Merge branch 'maint-1.6.2' into maint-1.6.3
2010-01-19 Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
2010-01-19 Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
2010-01-18 Make "subtree" part more orthogonal to the rest of...
2010-01-18 git merge -X<option>
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'tr/http-updates'
2010-01-10 Merge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10 Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-10 Merge branch 'bg/maint-remote-update-default'
2010-01-10 Merge branch 'maint-1.6.2' into maint
2010-01-10 Merge branch 'maint-1.6.1' into maint-1.6.2
2010-01-10 Merge branch 'maint-1.6.0' into maint-1.6.1
2010-01-07 Merge branch 'js/filter-branch-prime'
2010-01-07 Merge branch 'sb/maint-octopus'
2010-01-07 Merge branch 'bg/maint-add-all-doc'
2010-01-07 Merge branch 'mo/bin-wrappers'
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Merge branch 'gb/1.7.0-diff-whitespace-only-output'
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Merge branch 'jc/1.7.0-push-safety'
2009-12-26 Merge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-26 Merge branch 'sr/vcs-helper'
2009-12-22 Merge branch 'maint'
2009-12-20 Merge branch 'maint'
2009-12-16 Merge branch 'maint' to sync with 1.6.5.7
2009-12-11 Sync with 1.6.5.6
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09 Merge branch 'maint'
2009-12-09 Merge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-09 Merge branch 'jn/maint-pull-rebase-error-message' into...
2009-12-09 Merge branch 'jk/maint-add-p-delete-fix' into maint
2009-12-07 Merge branch 'master' into il/vcs-helper
2009-12-05 Sync with 1.6.5.5
2009-12-03 Merge branch 'maint'
2009-12-03 Merge branch 'uk/maint-shortlog-encoding' into maint
2009-12-03 Merge branch 'fc/maint-format-patch-pathspec-dashes...
2009-12-03 Merge branch 'ap/maint-merge-strategy-list-fix' into...
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'rs/work-around-grep-opt-insanity' into...
2009-12-03 Merge branch 'rj/maint-cygwin-count-objects' into maint
2009-12-03 Merge branch 'mm/maint-hint-failed-merge' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-03 Merge in 1.6.5.4
2009-12-03 Merge branch 'maint'
2009-12-02 Merge branch 'maint'
2009-12-01 Merge branch 'maint'
2009-12-01 Merge branch 'jc/deprecate-old-syntax-from-merge'
2009-12-01 Merge branch 'bw/remote-get-ref-states-fix'
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'fc/maint-format-patch-pathspec-dashes'
2009-11-30 Merge branch 'mm/maint-merge-ff-error-message-fix'
next