Aggressive three-way merge: fix D/F case
[gitweb.git] / git-request-pull.sh
2009-08-05 Merge branch 'sb/maint-pull-rebase'
2009-08-05 Merge branch 'ne/futz-upload-pack'
2009-08-05 Merge branch 'maint'
2009-07-29 request-pull: optionally show a patch as well
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-29 Sync with 1.6.3.4
2009-07-29 request-pull: allow ls-remote to notice remote.$nicknam...
2009-07-26 Merge branch 'en/fast-export'
2009-07-11 Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-09 Merge branch 'ld/push-porcelain-output-format'
2009-07-09 Merge branch 'gb/gitweb-avatar'
2009-07-09 Merge branch 'ml/http'
2009-07-09 Merge branch 'rs/grep-p'
2009-07-08 Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint
2009-07-08 Merge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-06 Merge branch 'tr/die_errno'
2009-07-06 Merge branch 'cb/maint-fetch-refspec-wo-dst'
2009-07-06 Merge branch 'sb/show-ref-parse-options'
2009-07-06 Merge branch 'gb/am-foreign'
2009-07-06 Merge branch 'jk/use-our-regexp'
2009-07-06 Merge branch 'uk/rev-parse-parse-opt'
2009-07-02 Merge branch 'cc/bisect'
2009-07-02 Merge branch 'js/daemon-log'
2009-07-02 Merge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-02 Merge branch 'sb/quiet-porcelains'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-07-02 Merge branch 'maint'
2009-07-01 request-pull: really really disable pager
2009-06-30 Merge branch 'maint'
2009-06-30 request-pull: really disable pager
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-05 Merge branch 'jc/blame'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2009-01-01 Merge branch 'cb/mergetool'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-03 Merge branch 'jk/maint-commit-v-strip' into maint
2008-12-03 Merge branch 'bc/maint-keep-pack' into maint
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-12-01 Merge branch 'st/maint-tag' into maint
2008-12-01 Merge branch 'mk/maint-cg-push' into maint
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28 Merge branch 'lt/preload-lstat'
2008-11-28 Merge branch 'ta/quiet-pull'
2008-11-28 Merge branch 'ph/send-email'
2008-11-17 Merge branch 'maint'
2008-11-17 request-pull: make usage string match manpage
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-06 Sync with 1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'maint'
next