Merge branch 'jn/maint-test-return'
[gitweb.git] / builtin / merge-base.c
2011-05-13 Merge branch 'jh/dirstat-lines'
2011-05-13 Merge branch 'jc/fix-add-u-unmerged'
2011-05-13 Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
2011-05-13 Merge branch 'cn/log-parse-opt'
2011-05-13 Merge branch 'maint'
2011-05-13 Merge branch 'jk/merge-one-file-working-tree' into...
2011-05-13 Merge branch 'nd/struct-pathspec'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jn/gitweb-dependency'
2011-05-11 Merge branch 'jc/maint-branch-mergeoptions'
2011-05-11 Merge branch 'jn/maint-test-merge-verify-parents'
2011-05-11 Merge branch 'vh/config-interactive-singlekey-doc'
2011-05-11 Merge branch 'jc/maint-add-p-overlapping-hunks'
2011-05-11 Merge branch 'sr/maint-fast-import-tighten-option-parsing'
2011-05-11 Merge branch 'dm/http-cleanup'
2011-05-11 Merge branch 'jn/ctags'
2011-05-06 Merge branch 'jc/maint-branch-mergeoptions' into mg...
2011-05-06 Merge branch 'jn/run-command-error-failure'
2011-05-06 Merge branch 'js/info-man-path'
2011-05-06 Merge branch 'im/hashcmp-optim'
2011-05-06 Merge branch 'jk/merge-one-file-working-tree'
2011-05-06 Merge branch 'jc/fix-diff-files-unmerged'
2011-05-06 Merge branch 'cj/p4merge'
2011-05-06 Merge branch 'gr/cvsimport-alternative-cvspass-location'
2011-05-06 Merge branch 'sg/completion-cleanup'
2011-05-06 Merge branch 'js/blame-parsename'
2011-05-06 Merge branch 'jk/format-patch-quote-special-in-from'
2011-05-06 Merge branch 'nd/struct-pathspec'
2011-05-06 Merge branch 'aw/maint-rebase-i-p-no-ff'
2011-05-06 Merge branch 'mg/alias-expose-prefix'
2011-05-06 Merge branch 'mg/diff-uiconfig-doc'
2011-05-06 Merge branch 'maint'
2011-05-05 Merge branch 'maint'
2011-05-04 Merge branch 'ml/test-readme'
2011-05-04 Merge branch 'ft/gitweb-tar-with-gzip-n'
2011-05-04 Merge branch 'mg/rev-list-count-cherry'
2011-05-04 Merge branch 'ss/doc-svn'
2011-05-04 Merge branch 'jn/format-patch-doc'
2011-05-04 Merge branch 'vr/merge-base-doc'
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint
2011-04-28 Merge branch 'sp/maint-clear-postfields'
2011-04-27 Merge branch 'ef/maint-strbuf-init'
2011-04-15 Documentation: update to git-merge-base --octopus
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-26 Merge git-gui 0.14.0
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-04 Merge branch 'jk/diffstat-binary'
2011-02-28 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-16 Merge branch 'maint-1.7.2' into maint-1.7.3
2011-02-16 Merge branch 'maint-1.7.0' into maint-1.7.1
2011-02-10 Merge branch 'tr/merge-unborn-clobber'
2011-02-10 Merge branch 'maint-1.7.0' into maint
2011-01-31 Merge branch 'jl/fetch-submodule-recursive' into maint
2011-01-27 Merge branch 'jn/fast-import-empty-tree-removal' into...
2011-01-19 Merge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19 Merge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19 Merge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-19 Merge branch 'nd/maint-relative' into maint
2011-01-13 Merge branch 'jk/diff-driver-binary-doc'
2011-01-13 Merge branch 'tr/submodule-relative-scp-url'
2011-01-10 Merge branch 'maint-1.7.2' into maint
2011-01-10 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'jl/fetch-submodule-recursive'
2010-12-16 Merge branch 'nd/maint-relative'
2010-12-16 Merge branch 'jn/maint-svn-fe'
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.3.4 v1.7.3.4
2010-12-15 Git 1.7.1.4 v1.7.1.4
2010-12-15 Merge branch 'master' (early part) into pd/bash-4-compl...
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'jk/maint-reflog-bottom' into maint
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'jk/maint-reflog-bottom'
2010-12-13 Merge branch 'mz/maint-rebase-stat-config'
2010-12-09 Merge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09 Merge branch 'cm/diff-check-at-eol' into maint
2010-12-08 Merge branch 'jh/notes-merge'
2010-12-04 Merge branch 'jj/icase-directory'
2010-12-02 Prepare for 1.7.3.3
2010-12-02 Git 1.7.1.3 v1.7.1.3
2010-12-02 Merge branch 'cb/maint-orphan-merge-noclobber' into...
2010-12-02 Merge branch 'ks/no-textconv-symlink' into maint
2010-12-02 Merge branch 'maint-1.7.2' into maint
2010-12-02 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-01 Merge branch 'js/maint-apply-tab-in-indent-fix' into...
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
2010-11-24 Merge branch 'cb/diff-fname-optim' into maint
2010-11-24 Merge branch 'jk/no-textconv-symlink' into maint
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
next