git.oblomov.eu Git - git/history - builtin-merge-ours.c

2009-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-16	Junio C Hamano	Merge branch 'maint' to sync with 1.6.5.7	blob \| commitdiff \| raw
2009-12-11	Junio C Hamano	Sync with 1.6.5.6	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-05	Junio C Hamano	Sync with 1.6.5.5	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge in 1.6.5.4	blob \| commitdiff \| raw
2009-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'jc/deprecate-old-syntax-from-merge'	blob \| commitdiff \| raw
2009-12-01	Junio C Hamano	Merge branch 'jn/gitweb-blame'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'fc/maint-format-patch-pathspec-dashes'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'mm/maint-merge-ff-error-message-fix'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'ap/maint-merge-strategy-list-fix'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/pretty-lf'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'cc/bisect-doc'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'em/commit-claim'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/mailinfo-remove-brackets'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'fc/send-email-envelope'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'uk/maint-shortlog-encoding'	blob \| commitdiff \| raw
2009-11-30	Junio C Hamano	Merge branch 'jc/maint-am-keep'	blob \| commitdiff \| raw
2009-11-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-25	Junio C Hamano	Merge branch 'rs/work-around-grep-opt-insanity'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'rj/maint-cygwin-count-objects'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'mm/maint-hint-failed-merge'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'jc/log-stdin'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'mr/gitweb-snapshot'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'cc/replace'	blob \| commitdiff \| raw
2009-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'bg/fetch-multi'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'th/maint-remote-update-help-string'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'jn/faster-completion-startup'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'rj/maint-t9700'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'ls/maint-mailinfo-no-inbody'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'mo/maint-crlf-doc'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'th/remote-usage'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'pb/maint-use-custom-perl'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'mm/config-pathname-tilde-expand'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'bc/grep-i-F'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'jk/maint-break-rename-reduce-memory'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'tc/format-attribute'	blob \| commitdiff \| raw
2009-11-23	Junio C Hamano	Merge branch 'tr/maint-merge-ours-clarification' (early...	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jc/fix-tree-walk' (early part)	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jh/notes' (early part)	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'sp/smart-http'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'bw/autoconf-more'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jn/editor-pager'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'rj/cygwin-msvc'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'rj/maint-simplify-cygwin-makefile'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'bg/format-patch-doc-update'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'tr/filter-branch'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'sc/protocol-doc'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jl/submodule-add-noname'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'sb/ls-tree-parseopt'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'rg/doc-workflow'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jn/gitweb-log-history'	blob \| commitdiff \| raw
2009-11-21	Junio C Hamano	Merge branch 'jn/help-everywhere'	blob \| commitdiff \| raw
2009-11-10	Junio C Hamano	Merge branch 'jn/maint-http-fetch-mingw' into jn/help...	blob \| commitdiff \| raw
2009-11-10	Jonathan Nieder	Show usage string for 'git merge-ours -h'	blob \| commitdiff \| raw
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-09-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-11	Junio C Hamano	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| commitdiff \| raw \| diff to current
2009-05-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-05-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-03-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-10-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-07-30	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-06-11	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-05-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-05-24	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-05-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-05-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom