Add -y/--no-prompt option to mergetool
[gitweb.git] / branch.c
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'jk/maint-commit-v-strip'
2008-11-13 Merge branch 'mk/maint-cg-push'
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-12 Merge branch 'maint'
2008-11-11 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 Merge branch 'maint'
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-31 Merge branch 'maint'
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
2008-10-22 Merge branch 'jk/diff-convfilter'
2008-10-22 Merge branch 'js/maint-fetch-update-head'
2008-10-22 Merge branch 'jc/maint-co-track'
2008-10-22 Merge branch 'rs/alloc-ref'
2008-10-22 Merge branch 'jk/fix-ls-files-other'
2008-10-21 Merge branch 'jc/maint-reset-remove-unmerged-new'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'sh/maint-rebase3'
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-19 Merge branch 'mv/clonev'
2008-10-19 Merge branch 'ml/cygwin-filemode'
2008-10-19 Merge branch 'gb/refactor-pathinfo'
2008-10-19 Merge branch 'dp/checkattr'
2008-10-19 Merge branch 'gb/formatpatch-autonbr'
2008-10-19 Merge branch 'sp/describe-lwtag'
2008-10-19 Merge branch 'ae/preservemerge'
2008-10-19 Merge branch 'mv/merge-noff'
2008-10-17 Fix "checkout --track -b newbranch" on detached HEAD
2008-10-03 builtin-commit: use reduce_heads() only when appropriate
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'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-17 Merge branch 'rs/archive'
2008-07-17 Merge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'sp/win'
2008-07-16 Merge branch 'js/more-win'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'js/merge-rr'
2008-07-13 Move MERGE_RR from .git/rr-cache/ into .git/
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
next