Merge branch 'tr/notes-display'
[gitweb.git] / git-gui / lib / merge.tcl
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-24 Merge branch 'jk/maint-add-ignored-dir' into maint
2010-03-22 Merge branch 'maint-1.6.6' into maint
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-15 Merge branch 'jh/notes'
2010-03-10 Merge branch 'cp/add-u-pathspec'
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-08 Merge branch 'jk/maint-add--interactive-delete' into...
2010-03-08 Merge branch 'jc/grep-author-all-match-implicit' into...
2010-03-08 Merge branch 'jc/checkout-detached' into maint
2010-03-08 Merge branch 'maint-1.6.6' into maint
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
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-07 Merge branch 'nd/root-git'
2010-03-07 Merge branch 'jk/maint-add--interactive-delete'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'rs/optim-text-wrap' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-05 Merge branch 'cc/maint-bisect-paths' into maint
2010-03-05 Merge branch 'maint-1.6.6' into maint
2010-03-03 Merge branch 'hm/maint-imap-send-crlf' into maint
2010-03-03 Merge branch 'sp/maint-push-sideband' 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 'rs/optim-text-wrap'
2010-03-02 Merge branch 'jn/makedepend'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-03-02 Merge branch 'ac/cvsimport-revision-mapping'
2010-03-02 Merge branch 'jc/grep-author-all-match-implicit'
2010-03-01 Merge branch 'cc/maint-bisect-paths'
2010-02-26 Merge branch 'maint-1.6.6' into maint
2010-02-24 Merge branch 'ml/maint-grep-doc' into maint
2010-02-21 Merge branch 'ml/maint-grep-doc'
2010-02-21 Merge branch 'hm/maint-imap-send-crlf'
2010-02-21 Merge branch 'sp/push-sideband'
2010-02-21 Merge branch 'jc/checkout-detached'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-21 Merge branch 'jn/makefile-script-lib'
2010-02-21 Merge branch 'mv/request-pull-modernize'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-17 Merge branch 'jk/grep-double-dash' into maint
2010-02-17 Merge branch 'jc/typo' into maint
2010-02-17 Merge branch 'jc/typo'
2010-02-16 Merge branch 'maint-1.6.6' into maint
2010-02-15 Merge branch 'maint-1.6.6' into maint
2010-02-13 Merge branch 'rs/git-dir-cleanup'
2010-02-13 Merge branch 'jk/grep-double-dash'
2010-02-12 Merge branch 'maint'
2010-02-12 Merge branch 'maint'
2010-02-10 Sync with 1.6.6.2
2010-02-09 Merge branch '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-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-10 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
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-11-30 Merge branch 'jc/maint-am-keep'
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Merge branch 'maint-1.6.0' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
next