merge script: --squash, --ff from unborn branch are errors
[gitweb.git] / levenshtein.h
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-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-16 Merge branch 'np/index-pack-memsave' 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 'rc/maint-curl-helper' into maint
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 'np/index-pack-memsave'
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 'bg/apply-blank-trailing-context'
2010-05-09 Merge branch 'rc/maint-curl-helper'
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09 Merge branch 'sd/log-decorate'
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 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
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-06 Merge branch 'sg/bash-completion'
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 'jh/maint-submodule-status-in-void'
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jl/submodule-diff-dirtiness'
2010-03-24 Merge branch 'pb/log-first-parent-p-m'
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-24 Merge branch 'bg/apply-fix-blank-at-eof' 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-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
2010-03-15 Merge branch 'ld/push-porcelain'
2010-03-15 Merge branch 'jh/notes'
2010-03-10 Merge branch 'sd/init-template'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'mw/maint-gcc-warns-unused-write' into...
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'gb/maint-submodule-env' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Merge branch 'jc/fetch-param' into maint
2010-03-08 Merge branch 'jk/maint-add--interactive-delete' into...
2010-03-08 Merge branch 'mm/mkstemps-mode-for-packfiles' 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 'mw/maint-gcc-warns-unused-write'
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'gb/maint-submodule-env'
2010-03-07 Merge branch 'mb/shortlog-nongit-stdin'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-07 Merge branch 'jc/fetch-param'
2010-03-07 Merge branch 'il/loosen-remote-helper-names'
2010-03-07 Merge branch 'nd/root-git'
2010-03-07 Merge branch 'js/runtime-prefix-trace-not-warn'
2010-03-07 Merge branch 'mm/mkstemps-mode-for-packfiles'
2010-03-07 Merge branch 'jk/maint-add--interactive-delete'
2010-03-05 Merge branch 'jn/gitweb-config-error-die' into maint
2010-03-05 Merge branch 'jn/maint-fix-pager' into maint
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'ld/maint-diff-quiet-w' into maint
2010-03-05 Merge branch 'rs/optim-text-wrap' into maint
2010-03-05 Merge branch 'dp/read-not-mmap-small-loose-object'...
2010-03-05 Merge branch 'np/compress-loose-object-memsave' into...
2010-03-05 Merge branch 'jc/maint-status-preload' 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 'jh/maint-submodule-status-in-void' (early...
2010-03-03 Merge branch 'tc/maint-transport-ls-remote-with-void...
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-03 Merge branch 'np/fast-import-idx-v2' into maint
2010-03-02 Merge branch 'jn/maint-fix-pager'
next