Merge branch 'maint'
[gitweb.git] / merge-recursive.c
2009-11-30 Merge branch 'ap/maint-merge-strategy-list-fix'
2009-11-30 Merge branch 'jc/pretty-lf'
2009-11-30 Merge branch 'cc/bisect-doc'
2009-11-30 Merge branch 'em/commit-claim'
2009-11-30 Merge branch 'jc/mailinfo-remove-brackets'
2009-11-30 Merge branch 'fc/send-email-envelope'
2009-11-30 Merge branch 'uk/maint-shortlog-encoding'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-30 merge-recursive: make the error-message generation...
2009-11-30 Merge remote branch 'ko/master' into HEAD
2009-11-27 Merge branch 'maint'
2009-11-25 Merge branch 'rs/work-around-grep-opt-insanity'
2009-11-24 Merge branch 'rj/maint-cygwin-count-objects'
2009-11-24 Merge branch 'rs/color-escape-has-zero-width'
2009-11-24 Merge branch 'bg/apply-doc'
2009-11-24 Merge branch 'mm/maint-hint-failed-merge'
2009-11-24 Merge branch 'jc/log-stdin'
2009-11-24 Merge branch 'mr/gitweb-snapshot'
2009-11-24 Merge branch 'cc/replace'
2009-11-24 Merge branch 'maint'
2009-11-23 Merge branch 'bg/fetch-multi'
2009-11-23 Merge branch 'maint'
2009-11-23 Merge git://git.bogomips.org/git-svn
2009-11-23 Merge branch 'th/maint-remote-update-help-string'
2009-11-23 Merge branch 'jn/faster-completion-startup'
2009-11-23 Merge branch 'rj/maint-t9700'
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 'tc/format-attribute'
2009-11-23 merge-recursive: point the user to commit when file...
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Check the format of more printf-type functions
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-19 Merge branch 'jn/gitweb-show-size'
2009-10-17 Merge branch 'jc/maint-blank-at-eof'
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-14 Merge branch 'pv/maint-add-p-no-exclude'
2009-10-13 Merge branch 'maint-1.6.4' into maint
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-16 Merge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16 Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-16 Merge branch 'jc/maint-checkout-index-to-prefix' 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-14 Merge branch 'maint'
2009-09-13 Merge branch 'pk/fast-import-tars'
2009-09-13 Merge branch 'pk/fast-import-dirs'
2009-09-13 Merge branch 'jt/pushinsteadof'
2009-09-13 Merge branch 'jk/unwanted-advices'
2009-09-13 Merge branch 'jc/merge-saner-messages'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-08 merge-recursive: give less scary messages when merge...
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-29 Merge branch 'rc/maint-http-fix' into maint
2009-08-28 Merge branch 'maint-1.6.3' into maint
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
next