Use "git merge" instead of "git pull ."
[gitweb.git] / t / t2001-checkout-cache-clash.sh
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-20 Merge branch 'mm/color-auto-default'
2013-06-20 Merge branch 'rs/discard-index-discard-array'
2013-06-20 Merge branch 'nd/traces'
2013-06-20 Merge branch 'fc/show-non-empty-errors-in-test'
2013-06-20 Merge branch 'fc/makefile'
2013-06-20 Merge branch 'js/test-ln-s-add'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-07 tests: use test_ln_s_add to remove SYMLINKS prerequisit...
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-10 Merge 'build-in git-mktree'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-19 Merge branch 'cb/httpd-test-fix-port'
2011-10-16 Merge git://repo.or.cz/git-gui
2011-10-14 Merge branch 'jc/apply-blank-at-eof-fix'
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-06 Merge branch 'jn/mime-type-with-params'
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-03-26 Merge git-gui 0.14.0
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-15 Merge git://repo.or.cz/git-gui
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
next