merge script: handle --no-ff --no-commit correctly
[gitweb.git] / git-gui / lib / blame.tcl
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-30 Merge branch 'maint-1.6.5' into maint
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-28 Merge branch 'gp/maint-cvsserver'
2010-01-27 Merge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27 Merge branch 'il/maint-colon-address'
2010-01-27 Merge branch 'il/maint-xmallocz'
2010-01-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-21 Merge branch 'jc/checkout-merge-base'
2010-01-21 Merge branch 'ap/merge-backend-opts'
2010-01-21 Merge branch 'jh/notes' (early part)
2010-01-20 Merge branch 'js/exec-error-report'
2010-01-20 Merge branch 'mh/rebase-fixup'
2010-01-20 Merge branch 'ns/rebase-auto-squash'
2010-01-20 Merge branch 'mh/rebase-fixup' (early part)
2010-01-20 Merge branch 'bg/maint-remote-update-default' into...
2010-01-20 Merge branch 'sb/maint-octopus' into maint
2010-01-20 Merge branch 'bg/maint-add-all-doc' into maint
2010-01-20 Merge branch 'maint-1.6.5' into maint
2010-01-19 Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
2010-01-19 Merge branch 'jc/rerere'
2010-01-19 Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
2010-01-18 Merge branch 'jh/commit-status'
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17 Merge branch 'sr/gfi-options'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'il/vcs-helper'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'tr/http-updates'
2010-01-10 Merge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10 Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-10 Merge branch 'bg/maint-remote-update-default'
2010-01-10 Merge branch 'mm/diag-path-in-treeish'
2010-01-10 Merge branch 'fc/opt-quiet-gc-reset'
2010-01-10 Merge branch 'maint-1.6.2' into maint
2010-01-10 Merge branch 'maint-1.6.0' into maint-1.6.1
2010-01-07 Merge branch 'js/filter-branch-prime'
2010-01-07 Merge branch 'sb/maint-octopus'
2010-01-07 Merge branch 'bg/maint-add-all-doc'
2010-01-07 Merge branch 'mv/commit-date'
2010-01-07 Merge branch 'mo/bin-wrappers'
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Merge branch 'gb/1.7.0-diff-whitespace-only-output'
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Merge branch 'jc/1.7.0-push-safety'
2009-12-26 Merge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-26 Merge branch 'sr/vcs-helper'
2009-12-22 Merge branch 'maint'
2009-12-20 Merge branch 'maint'
2009-12-16 Merge branch 'maint' to sync with 1.6.5.7
2009-12-11 Sync with 1.6.5.6
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
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-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-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
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-21 Merge branch 'maint-1.6.0' into maint-1.6.1
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.0' into maint-1.6.1
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Merge branch 'maint-1.6.0' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
next