Merge git://repo.or.cz/git-gui
[gitweb.git] / t / t6020-merge-df.sh
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-12 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-08 Merge branch 'jk/test-must-fail-missing'
2010-09-08 Merge branch 'jh/error-removing-missing-note'
2010-09-08 Merge branch 'kf/askpass-config'
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'jk/maint-pass-c-config-in-env'
2010-09-07 Merge branch 'maint'
2010-09-06 Merge branch 'jh/clean-exclude'
2010-09-06 Merge branch 'maint' v1.7.3-rc0
2010-09-04 Merge branch 'jl/submodule-ignore-diff'
2010-09-04 Merge branch 'ab/test-2'
2010-09-04 Merge branch 'js/detached-stash'
2010-09-04 Merge branch 'js/maint-reflog-beyond-horizon'
2010-09-04 Merge branch 'dg/local-mod-error-messages'
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-03 Merge branch 'ab/compat-regex'
2010-09-03 Merge branch 'nd/clone-depth-zero'
2010-09-03 Merge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03 Merge branch 'cb/maint-mergetool-no-tty'
2010-09-03 Merge branch 'jn/apply-filename-with-sp'
2010-09-03 Merge branch 'jn/merge-custom-no-trivial'
2010-09-03 Merge branch 'jc/maint-doc-em-dash'
2010-09-03 Merge branch 'mg/doc-bundle'
2010-09-03 Merge branch 'jn/doc-backslash'
2010-09-03 Merge branch 'jn/update-contrib-example-merge'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-09-03 Sync with 1.7.2.3
2010-09-01 Merge branch 'maint'
2010-08-31 Merge branch 'np/maint-huge-delta-generation'
2010-08-31 Merge branch 'da/fix-submodule-sync-superproject-config'
2010-08-31 Merge branch 'jn/cherry-revert-message-clean-up'
2010-08-31 Merge branch 'cb/binary-patch-id'
2010-08-31 Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-31 Merge branch 'dj/fetch-tagopt'
2010-08-31 Merge branch 'en/d-f-conflict-fix'
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-07-26 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 merge_recursive: Fix renames across paths below D/F...
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'maint-1.6.2' into maint
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
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-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'jc/mailinfo-remove-brackets'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
next