Use "git merge" instead of "git pull ."
[gitweb.git] / builtin / merge-base.c
2013-06-28 Sync with 1.8.3.2
2013-06-27 Merge branch 'maint'
2013-06-27 Merge branch 'jk/add-i-custom-diff-algo'
2013-06-27 Merge branch 'rr/cherry-pick-fast-forward-reflog-message'
2013-06-27 Merge branch 'mt/send-email-cc-match-fix'
2013-06-27 Merge branch 'jk/pull-into-dirty-unborn'
2013-06-27 Merge branch 'bc/http-keep-memory-given-to-curl'
2013-06-27 Merge branch 'bc/checkout-tracking-name-plug-leak'
2013-06-27 Merge branch 'rr/rebase-stash-store'
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-26 Merge branch 'ys/cygstart'
2013-06-26 Merge branch 'wk/doc-git-has-grown'
2013-06-26 Merge branch 'vl/typofix'
2013-06-26 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
2013-06-26 Merge branch 'mm/merge-in-dirty-worktree-doc'
2013-06-26 Merge branch 'kb/diff-blob-blob-doc'
2013-06-26 Merge branch 'mm/push-force-is-dangerous'
2013-06-26 Merge branch 'fg/submodule-non-ascii-path'
2013-06-24 Merge branch 'rr/am-quit-empty-then-abort-fix'
2013-06-24 Merge branch 'rt/cherry-pick-continue-advice-in-status'
2013-06-24 Merge branch 'nk/config-local-doc'
2013-06-24 Merge branch 'jk/mergetool-lib-refactor'
2013-06-24 Merge branch 'jk/doc-build-move-infordir-def'
2013-06-24 Merge branch 'fg/submodule-fixup'
2013-06-24 Merge branch 'dk/version-gen-gitdir'
2013-06-24 Merge branch 'dk/maint-t5150-dirname'
2013-06-24 Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
2013-06-24 Merge branch 'rr/rebase-sha1-by-string-query'
2013-06-24 Merge branch 'mm/rm-coalesce-errors'
2013-06-24 Merge branch 'jh/libify-note-handling'
2013-06-24 Merge branch 'fc/sequencer-plug-leak'
2013-06-23 Merge branch 'mz/rebase-tests'
2013-06-23 Merge branch 'jk/unpack-entry-fallback-to-another'
2013-06-23 Merge branch 'jk/apache-test-for-2.4'
2013-06-23 Merge branch 'cm/remote-mediawiki-perlcritique'
2013-06-23 Merge branch 'bp/remote-mw-tests'
2013-06-23 Merge branch 'rr/rebase-autostash'
2013-06-23 Merge branch 'rr/prompt-rebase-breakage-fix'
2013-06-23 Merge branch 'jg/status-config'
2013-06-21 Sync with maint
2013-06-20 Merge branch 'cm/remote-mediawiki'
2013-06-20 Merge branch 'rs/match-trees-refactor'
2013-06-20 Merge branch 'rs/logical-vs-binary-or'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-13 use logical OR (||) instead of binary OR (|) in logical...
2013-05-29 Merge branch 'as/check-ignore'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-04 Merge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Merge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Merge branch 'jk/peel-ref' into maint
2013-04-03 Merge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02 Merge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Merge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Merge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Merge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Merge branch 'jc/remove-export-from-config-mak-in'
2013-03-28 Merge branch 'rr/tests-dedup-test-config'
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'jc/reflog-reverse-walk'
2013-03-26 Merge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26 Merge branch 'jc/perl-cat-blob' into maint
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-25 Merge branch 'jk/fully-peeled-packed-ref'
2013-03-25 Merge branch 'jk/peel-ref'
2013-03-25 Merge branch 'lf/setup-prefix-pathspec'
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-25 Merge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25 Merge branch 'tk/doc-filter-branch' into maint-1.8.1
2013-03-25 Merge branch 'dm/ni-maxhost-may-be-missing' into maint...
2013-03-25 Merge branch 'jc/color-diff-doc' into maint-1.8.1
2013-03-21 Merge branch 'jk/utf-8-can-be-spelled-differently'
2013-03-21 Merge branch 'jc/perl-cat-blob'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-03-21 Merge branch 'nd/index-pack-l10n-buf-overflow'
2013-03-19 Merge branch 'lf/bundle-verify-list-prereqs'
2013-03-19 Merge branch 'tk/doc-filter-branch'
2013-03-19 Merge branch 'dm/ni-maxhost-may-be-missing'
2013-03-19 Merge branch 'jc/color-diff-doc'
2013-03-13 Merge branch 'jc/reflog-reverse-walk' into nd/branch...
2013-02-27 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-27 Merge branch 'jn/less-reconfigure' into maint
2013-02-25 Merge branch 'jn/less-reconfigure'
2013-02-25 Merge branch 'as/check-ignore'
2013-02-25 Merge branch 'ct/autoconf-htmldir'
2013-02-25 Merge branch 'wk/man-deny-current-branch-is-default...
next