Merge branch 'jc/rev-list-options-fix'
[gitweb.git] / git-gui / lib / merge.tcl
2011-04-04 Merge branch 'jc/rev-list-options-fix'
2011-04-04 Merge branch 'nm/maint-conflicted-submodule-entries'
2011-04-03 Merge branch 'maint'
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-03 Sync with 1.7.4.3
2011-04-02 Merge branch 'nd/init-gitdir'
2011-04-02 Merge branch 'jc/merge-sans-branch'
2011-04-02 Merge branch 'ab/i18n-st'
2011-04-02 Merge branch 'jk/pull-into-empty'
2011-04-02 Merge branch 'sb/sparse-more'
2011-04-02 Merge branch 'maint'
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-31 Merge branch 'maint'
2011-03-30 Merge branch 'maint'
2011-03-30 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-29 Merge branch 'maint'
2011-03-29 Merge branch 'jc/fetch-progressive-stride'
2011-03-29 Merge branches 'sp/maint-fetch-pack-stop-early' and...
2011-03-28 Merge branch 'maint'
2011-03-27 Merge branch 'mg/rev-list-n-parents'
2011-03-27 Merge branch 'js/remove-unused-variables'
2011-03-27 Merge branch 'jp/completion-help-alias'
2011-03-27 Merge branch 'jc/index-update-if-able'
2011-03-27 Merge branch 'jk/checkout-orphan-warning'
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-27 Merge branch 'nd/index-doc'
2011-03-27 Merge branch 'jc/fetch-progressive-stride'
2011-03-26 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
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'
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-15 Git 1.7.0.9 v1.7.0.9
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-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
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-06-16 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
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 'jc/conflict-marker-size' into maint
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'sb/notes-parse-opt'
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
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
next