merge script: --squash, --ff from unborn branch are errors
[gitweb.git] / git-gui /
2009-11-23 Merge branch 'ls/maint-mailinfo-no-inbody'
2009-11-23 Merge branch 'mo/maint-crlf-doc'
2009-11-23 Merge branch 'th/remote-usage'
2009-11-23 Merge branch 'pb/maint-use-custom-perl'
2009-11-23 Merge branch 'mm/config-pathname-tilde-expand'
2009-11-23 Merge branch 'bc/grep-i-F'
2009-11-23 Merge branch 'jk/maint-break-rename-reduce-memory'
2009-11-23 Merge branch 'tr/maint-merge-ours-clarification' (early...
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
2009-11-21 Merge branch 'jh/notes' (early part)
2009-11-21 Merge branch 'sp/smart-http'
2009-11-21 Merge branch 'rj/cygwin-msvc'
2009-11-21 Merge branch 'rj/maint-simplify-cygwin-makefile'
2009-11-21 Merge branch 'bg/format-patch-doc-update'
2009-11-21 Merge branch 'tr/filter-branch'
2009-11-21 Merge branch 'sc/protocol-doc'
2009-11-21 Merge branch 'jl/submodule-add-noname'
2009-11-21 Merge branch 'sb/ls-tree-parseopt'
2009-11-21 Merge branch 'rg/doc-workflow'
2009-11-21 Merge branch 'jp/fetch-cull-many-refs'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-18 Merge branch 'ef/msys-imap'
2009-11-16 Sync with 1.6.5.3
2009-11-16 Merge branch 'maint'
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample'
2009-11-16 Merge branch 'js/maint-diff-color-words'
2009-11-16 Merge branch 'rs/pretty-wrap'
2009-11-16 Merge branch 'js/log-rewrap'
2009-11-16 Merge branch 'fc/doc-fast-forward'
2009-11-16 Merge branch 'jk/maint-add-p-empty'
2009-11-16 Merge branch 'lt/revision-bisect'
2009-11-15 Merge branch 'maint'
2009-11-11 Merge branch 'maint'
2009-11-10 Merge branch 'maint'
2009-11-10 Merge branch 'jk/maint-format-patch-p-suppress-stat'
2009-11-10 Merge branch 'pb/maint-gitweb-blob-lineno'
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-11-10 Merge branch 'vl/maint-openssl-signature-change'
2009-11-10 Merge branch 'jk/maint-push-config'
2009-11-10 Merge branch 'jp/dirty-describe'
2009-11-10 Merge branch 'sr/blame-incomplete'
2009-11-10 Merge branch 'jn/maint-http-fetch-mingw' into jn/help...
2009-11-09 Merge branch 'maint'
2009-11-05 Merge branch 'maint'
2009-11-02 Merge branch 'jn/show-normalized-refs'
2009-11-02 Merge branch 'maint'
2009-10-31 fixup tr/stash-format merge
2009-10-31 Merge branch 'js/diff-verbose-submodule'
2009-10-31 Merge branch 'jc/checkout-auto-track'
2009-10-31 Merge branch 'jn/show-normalized-refs'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'ak/bisect-reset-to-switch'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-31 Merge branch 'ja/fetch-doc'
2009-10-31 Merge branch 'cb/doc-fetch-pull-merge'
2009-10-31 Merge branch 'maint'
2009-10-28 Merge branch 'maint'
2009-10-27 Merge git://git.bogomips.org/git-svn
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
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-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
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-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-07-29 Merge branch 'hv/cvsps-tests'
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-22 Merge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Merge branch 'maint-1.6.2' into maint
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Merge branch 'ph/submodule-rebase'
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
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.2' into maint
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Merge branch 'ph/submodule-rebase' (early part)
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-06 Merge branch 'rc/maint-http-local-slot-fix' into rc...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-05-31 Merge branch 'mw/send-email'
2009-05-29 Merge branch 'sb/maint-1.6.2-opt-filename-fix'
2009-05-26 Merge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Merge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Merge branch 'do/maint-merge-recursive-fix' into maint
next