git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin-merge.c

projects / thirdparty / git.git / history

2010-01-18	Junio C Hamano	Make "subtree" part more orthogonal to the rest of...	blob \| commitdiff \| raw
2010-01-18	Avery Pennarun	git merge -X<option>	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge remote branch 'ko/master' into HEAD	blob \| commitdiff \| raw \| diff to current
2009-11-30	Avery Pennarun	builtin-merge.c: call exclude_cmds() correctly.	blob \| commitdiff \| raw \| diff to current
2009-11-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-25	Junio C Hamano	Merge branch 'rs/work-around-grep-opt-insanity'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'rj/maint-cygwin-count-objects'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'mm/maint-hint-failed-merge'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'jc/log-stdin'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'mr/gitweb-snapshot'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'bg/fetch-multi'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'th/maint-remote-update-help-string'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'jn/faster-completion-startup'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'rj/maint-t9700'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'ls/maint-mailinfo-no-inbody'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'mo/maint-crlf-doc'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'th/remote-usage'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'pb/maint-use-custom-perl'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'mm/config-pathname-tilde-expand'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'bc/grep-i-F'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'jk/maint-break-rename-reduce-memory'	blob \| commitdiff \| raw \| diff to current
2009-11-23	Junio C Hamano	Merge branch 'tr/maint-merge-ours-clarification' (early...	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jc/fix-tree-walk' (early part)	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jh/notes' (early part)	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'sp/smart-http'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'bw/autoconf-more'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jn/editor-pager'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'rj/cygwin-msvc'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'rj/maint-simplify-cygwin-makefile'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'bg/format-patch-doc-update'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'tr/filter-branch'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'sc/protocol-doc'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jl/submodule-add-noname'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'sb/ls-tree-parseopt'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'rg/doc-workflow'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jn/gitweb-log-history'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jn/help-everywhere'	blob \| commitdiff \| raw \| diff to current
2009-11-21	Junio C Hamano	Merge branch 'jp/fetch-cull-many-refs'	blob \| commitdiff \| raw \| diff to current
2009-11-18	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status'	blob \| commitdiff \| raw \| diff to current
2009-11-18	Junio C Hamano	Merge branch 'sb/tutorial-test'	blob \| commitdiff \| raw \| diff to current
2009-11-18	Junio C Hamano	Merge branch 'ef/msys-imap'	blob \| commitdiff \| raw \| diff to current
2009-11-17	Junio C Hamano	Merge git://git.bogomips.org/git-svn	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Sync with 1.6.5.3	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'bs/maint-pre-commit-hook-sample' into...	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-add-p-empty' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'js/maint-diff-color-words' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'tz/maint-rpm' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-format-patch-p-suppress-stat...	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'pb/maint-gitweb-blob-lineno' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-i' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'vl/maint-openssl-signature-change' into...	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-push-config' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'sr/blame-incomplete' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jc/maint-blank-at-eof' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'bs/maint-pre-commit-hook-sample'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'js/maint-diff-color-words'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'rs/pretty-wrap'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'js/log-rewrap'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'fc/doc-fast-forward'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'sc/difftool-p4merge'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-add-p-empty'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'lt/revision-bisect'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jc/maint-1.6.3-graft-trailing-space'...	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'tr/maint-roff-quote' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'ja/fetch-doc' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'cb/doc-fetch-pull-merge' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-cvsimport-pathname' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jc/receive-pack-auto' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'gb/maint-gitweb-esc-param' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jn/gitweb-patch' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jk/maint-format-patch-p-suppress-stat'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'pb/maint-gitweb-blob-lineno'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'tr/describe-advice'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-i'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'bg/merge-ff-only'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'vl/maint-openssl-signature-change'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jk/maint-push-config'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jk/gitignore-anchored'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jp/dirty-describe'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'sr/blame-incomplete'	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jn/maint-http-fetch-mingw' into jn/help...	blob \| commitdiff \| raw \| diff to current
2009-11-10	Jonathan Nieder	merge: do not setup worktree twice	blob \| commitdiff \| raw \| diff to current
2009-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-07	Junio C Hamano	Merge branch 'jc/commit-s-subject-is-not-a-footer'	blob \| commitdiff \| raw \| diff to current
2009-11-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-11-02	Junio C Hamano	Merge branch 'jn/show-normalized-refs'	blob \| commitdiff \| raw \| diff to current
2009-11-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-10-31	Junio C Hamano	fixup tr/stash-format merge	blob \| commitdiff \| raw \| diff to current
2009-10-31	Junio C Hamano	Merge branch 'jc/maint-1.6.3-graft-trailing-space'	blob \| commitdiff \| raw \| diff to current
2009-10-31	Junio C Hamano	Merge branch 'tr/maint-roff-quote'	blob \| commitdiff \| raw \| diff to current
2009-10-30	Björn Gustavsson	Teach 'git merge' and 'git pull' the option --ff-only	blob \| commitdiff \| raw \| diff to current
2009-10-28	Junio C Hamano	Merge branch 'maint-1.6.4' into maint	blob \| commitdiff \| raw \| diff to current
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-10-25	Junio C Hamano	Merge branch 'maint-1.6.4' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom