Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2009-12-31	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw
2009-12-30	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw
2009-12-30	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-12-27	Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...	blob \| diff \| raw
2009-12-22	Merge branch 'maint'	blob \| diff \| raw
2009-12-20	Merge branch 'maint'	blob \| diff \| raw
2009-12-16	Merge branch 'maint' to sync with 1.6.5.7	blob \| diff \| raw
2009-12-11	Sync with 1.6.5.6	blob \| diff \| raw
2009-12-09	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2009-12-09	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2009-12-09	Merge branch 'maint'	blob \| diff \| raw
2009-12-09	Merge branch 'mm/maint-merge-ff-error-message-fix'...	blob \| diff \| raw \| diff to current
2009-12-09	Merge branch 'jn/maint-pull-rebase-error-message' into...	blob \| diff \| raw \| diff to current
2009-12-09	Merge branch 'jk/maint-add-p-delete-fix' into maint	blob \| diff \| raw \| diff to current
2009-12-05	Sync with 1.6.5.5	blob \| diff \| raw
2009-12-03	Merge branch 'maint'	blob \| diff \| raw
2009-12-03	Merge branch 'uk/maint-shortlog-encoding' into maint	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'fc/maint-format-patch-pathspec-dashes...	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'ap/maint-merge-strategy-list-fix' into...	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'jc/maint-am-keep' into maint	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'rs/work-around-grep-opt-insanity' into...	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'rj/maint-cygwin-count-objects' into maint	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'mm/maint-hint-failed-merge' into maint	blob \| diff \| raw \| diff to current
2009-12-03	Merge branch 'np/maint-sideband-favor-status' into...	blob \| diff \| raw \| diff to current
2009-12-03	Merge in 1.6.5.4	blob \| diff \| raw
2009-12-03	Merge branch 'maint'	blob \| diff \| raw
2009-12-02	Merge branch 'maint'	blob \| diff \| raw
2009-12-01	Merge branch 'maint'	blob \| diff \| raw
2009-12-01	Merge branch 'jc/deprecate-old-syntax-from-merge'	blob \| diff \| raw
2009-12-01	Merge branch 'bw/remote-get-ref-states-fix'	blob \| diff \| raw
2009-12-01	Merge branch 'jn/gitweb-blame'	blob \| diff \| raw
2009-11-30	Merge branch 'fc/maint-format-patch-pathspec-dashes'	blob \| diff \| raw
2009-11-30	Merge branch 'mm/maint-merge-ff-error-message-fix'	blob \| diff \| raw
2009-11-30	Merge branch 'ap/maint-merge-strategy-list-fix'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'jc/pretty-lf'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'cc/bisect-doc'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'em/commit-claim'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'jc/mailinfo-remove-brackets'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'fc/send-email-envelope'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'uk/maint-shortlog-encoding'	blob \| diff \| raw \| diff to current
2009-11-30	Merge branch 'jc/maint-am-keep'	blob \| diff \| raw \| diff to current
2009-11-30	merge-recursive: make the error-message generation...	blob \| diff \| raw \| diff to current
2009-11-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-11-25	Merge branch 'rs/work-around-grep-opt-insanity'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'rj/maint-cygwin-count-objects'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'rs/color-escape-has-zero-width'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'bg/apply-doc'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'mm/maint-hint-failed-merge'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'jc/log-stdin'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'mr/gitweb-snapshot'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'cc/replace'	blob \| diff \| raw \| diff to current
2009-11-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'bg/fetch-multi'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-11-23	Merge git://git.bogomips.org/git-svn	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'th/maint-remote-update-help-string'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'jn/faster-completion-startup'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'rj/maint-t9700'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'ls/maint-mailinfo-no-inbody'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'mo/maint-crlf-doc'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'th/remote-usage'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'pb/maint-use-custom-perl'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'mm/config-pathname-tilde-expand'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'bc/grep-i-F'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'jk/maint-break-rename-reduce-memory'	blob \| diff \| raw \| diff to current
2009-11-23	Merge branch 'tc/format-attribute'	blob \| diff \| raw \| diff to current
2009-11-23	merge-recursive: point the user to commit when file...	blob \| diff \| raw \| diff to current
2009-11-21	Merge branch 'jc/fix-tree-walk' (early part)	blob \| diff \| raw \| diff to current
2009-11-18	Merge branch 'np/maint-sideband-favor-status'	blob \| diff \| raw \| diff to current
2009-11-16	Merge branch 'jk/maint-1.6.3-ls-files-i' into maint	blob \| diff \| raw \| diff to current
2009-11-16	Merge branch 'jc/maint-blank-at-eof' into maint	blob \| diff \| raw \| diff to current
2009-11-16	Check the format of more printf-type functions	blob \| diff \| raw \| diff to current
2009-11-16	Merge branch 'jc/maint-1.6.3-graft-trailing-space'...	blob \| diff \| raw \| diff to current
2009-11-16	Merge branch 'tr/maint-roff-quote' into maint	blob \| diff \| raw \| diff to current
2009-11-10	Merge branch 'jk/maint-1.6.3-ls-files-i'	blob \| diff \| raw \| diff to current
2009-10-31	Merge branch 'jc/maint-1.6.3-graft-trailing-space'	blob \| diff \| raw \| diff to current
2009-10-31	Merge branch 'tr/maint-roff-quote'	blob \| diff \| raw \| diff to current
2009-10-28	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2009-10-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2009-10-25	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2009-10-25	Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...	blob \| diff \| raw \| diff to current
2009-10-25	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...	blob \| diff \| raw \| diff to current
2009-10-24	Merge branch 'jp/maint-send-email-fold' into maint	blob \| diff \| raw \| diff to current
2009-10-24	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...	blob \| diff \| raw \| diff to current
2009-10-24	Merge branch 'pv/maint-add-p-no-exclude' into maint	blob \| diff \| raw \| diff to current
2009-10-19	Merge branch 'jp/maint-send-email-fold'	blob \| diff \| raw \| diff to current
2009-10-19	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'	blob \| diff \| raw \| diff to current
2009-10-19	Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'	blob \| diff \| raw \| diff to current
2009-10-19	Merge branch 'jn/gitweb-show-size'	blob \| diff \| raw \| diff to current
2009-10-17	Merge branch 'jc/maint-blank-at-eof'	blob \| diff \| raw \| diff to current
2009-10-17	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2009-10-14	Merge branch 'pv/maint-add-p-no-exclude'	blob \| diff \| raw \| diff to current
2009-10-13	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2009-10-09	Merge branch 'rs/maint-archive-prefix'	blob \| diff \| raw \| diff to current
2009-10-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-10-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-10-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-10-04	Merge branch 'jc/maint-1.6.4-show-branch-default' into...	blob \| diff \| raw \| diff to current
2009-09-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2009-09-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
next