whitespace: add tab-in-indent support for --whitespace=fix
[gitweb.git] / merge-recursive.h
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 'bg/maint-remote-update-default'
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 'bg/maint-add-all-doc'
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-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09 Merge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-07 Merge branch 'master' into il/vcs-helper
2009-12-05 Sync with 1.6.5.5
2009-12-03 Merge branch 'maint'
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge in 1.6.5.4
2009-12-03 Merge branch 'maint'
2009-12-02 Merge branch 'maint'
2009-12-01 Merge branch 'maint'
2009-12-01 Merge branch 'jc/deprecate-old-syntax-from-merge'
2009-12-01 Merge branch 'bw/remote-get-ref-states-fix'
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'fc/maint-format-patch-pathspec-dashes'
2009-11-30 Merge branch 'mm/maint-merge-ff-error-message-fix'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-30 merge-recursive: make the error-message generation...
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-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...
2009-04-18 Merge branch 'maint-1.6.0' into maint
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-12 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-05 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Merge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
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-26 Merge branch 'js/maint-1.6.0-exec-path-env'
2009-03-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-22 Merge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22 Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
next