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

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

projects / thirdparty / git.git / history

2011-02-16	Junio C Hamano	Merge branch 'maint-1.7.3' into maint	blob \| commitdiff \| raw
2011-02-16	Junio C Hamano	Merge branch 'maint-1.7.2' into maint-1.7.3	blob \| commitdiff \| raw \| diff to current
2011-02-16	Junio C Hamano	Merge branch 'maint-1.7.1' into maint-1.7.2	blob \| commitdiff \| raw \| diff to current
2011-02-16	Junio C Hamano	Merge branch 'maint-1.7.0' into maint-1.7.1	blob \| commitdiff \| raw \| diff to current
2011-02-10	Junio C Hamano	Merge branch 'tr/merge-unborn-clobber'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'jc/unpack-trees'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'tr/diff-words-test'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'rr/fi-import-marks-if-exists'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'jn/unpack-lstat-failure-report'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'ef/alias-via-run-command'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'cb/setup'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'ae/better-template-failure-report'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'jn/cherry-pick-strategy-option'	blob \| commitdiff \| raw
2011-02-10	Junio C Hamano	Merge branch 'maint-1.7.0' into maint	blob \| commitdiff \| raw
2011-01-31	Junio C Hamano	Merge branch 'jl/fetch-submodule-recursive' into maint	blob \| commitdiff \| raw
2011-01-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-01-27	Junio C Hamano	Merge branch 'jn/fast-import-empty-tree-removal' into...	blob \| commitdiff \| raw \| diff to current
2011-01-24	Junio C Hamano	Merge branch 'as/userdiff-pascal'	blob \| commitdiff \| raw
2011-01-24	Junio C Hamano	Merge branch 'jn/setup-fixes'	blob \| commitdiff \| raw
2011-01-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-01-19	Junio C Hamano	Merge branch 'jk/diff-driver-binary-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-01-19	Junio C Hamano	Merge branch 'tr/submodule-relative-scp-url' into maint	blob \| commitdiff \| raw \| diff to current
2011-01-19	Junio C Hamano	Merge branch 'jn/maint-fast-import-object-reuse' into...	blob \| commitdiff \| raw \| diff to current
2011-01-19	Junio C Hamano	Merge branch 'nd/maint-relative' into maint	blob \| commitdiff \| raw \| diff to current
2011-01-16	Jonathan Nieder	ll-merge: simplify opts == NULL case	blob \| commitdiff \| raw
2011-01-13	Junio C Hamano	Merge branch 'jn/gitweb-no-logo'	blob \| commitdiff \| raw \| diff to current
2011-01-13	Junio C Hamano	Merge branch 'jk/diff-driver-binary-doc'	blob \| commitdiff \| raw \| diff to current
2011-01-13	Junio C Hamano	Merge branch 'tr/submodule-relative-scp-url'	blob \| commitdiff \| raw \| diff to current
2011-01-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-01-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-01-10	Junio C Hamano	Merge branch 'maint-1.7.2' into maint	blob \| commitdiff \| raw \| diff to current
2011-01-10	Junio C Hamano	Merge branch 'maint-1.7.1' into maint-1.7.2	blob \| commitdiff \| raw \| diff to current
2011-01-10	Junio C Hamano	Merge branch 'maint-1.7.0' into maint-1.7.1	blob \| commitdiff \| raw \| diff to current
2011-01-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-01-05	Junio C Hamano	Merge branch 'maint' to sync with 1.7.3.5	blob \| commitdiff \| raw \| diff to current
2011-01-05	Junio C Hamano	Merge branch 'mg/cvsimport'	blob \| commitdiff \| raw \| diff to current
2011-01-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-28	Junio C Hamano	Merge branch 'jc/maint-rebase-rewrite-last-skip'	blob \| commitdiff \| raw \| diff to current
2010-12-26	Junio C Hamano	Merge branch 'rs/maint-diff-fd-leak' into maint	blob \| commitdiff \| raw \| diff to current
2010-12-23	Junio C Hamano	Merge branch 'rj/maint-difftool-cygwin-workaround'	blob \| commitdiff \| raw \| diff to current
2010-12-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-22	Junio C Hamano	Merge branch 'rj/maint-test-fixes'	blob \| commitdiff \| raw \| diff to current
2010-12-22	Junio C Hamano	Merge branch 'jc/maint-am-abort-safely'	blob \| commitdiff \| raw \| diff to current
2010-12-22	Junio C Hamano	Merge branch 'jk/commit-die-on-bogus-ident'	blob \| commitdiff \| raw \| diff to current
2010-12-22	Junio C Hamano	Merge branch 'nd/maint-fix-add-typo-detection'	blob \| commitdiff \| raw \| diff to current
2010-12-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-21	Junio C Hamano	Merge branch 'ks/blame-worktree-textconv-cached'	blob \| commitdiff \| raw \| diff to current
2010-12-21	Junio C Hamano	Merge branch 'jk/maint-decorate-01-bool'	blob \| commitdiff \| raw \| diff to current
2010-12-21	Junio C Hamano	Merge branch 'jn/maint-gitweb-pathinfo-fix'	blob \| commitdiff \| raw \| diff to current
2010-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'jl/fetch-submodule-recursive'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'nd/extended-sha1-relpath'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'ak/describe-exact'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'nd/maint-relative'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'jn/maint-svn-fe'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'jc/maint-svn-info-test-fix'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'jn/submodule-b-current'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Merge branch 'jn/maint-fast-import-object-reuse'	blob \| commitdiff \| raw \| diff to current
2010-12-16	Junio C Hamano	Sync with 1.7.3.4	blob \| commitdiff \| raw \| diff to current
2010-12-15	Junio C Hamano	Git 1.7.3.4 v1.7.3.4	blob \| commitdiff \| raw \| diff to current
2010-12-15	Junio C Hamano	Git 1.7.2.5 v1.7.2.5	blob \| commitdiff \| raw \| diff to current
2010-12-15	Junio C Hamano	Git 1.7.1.4 v1.7.1.4	blob \| commitdiff \| raw \| diff to current
2010-12-15	Junio C Hamano	Git 1.7.0.9 v1.7.0.9	blob \| commitdiff \| raw \| diff to current
2010-12-15	Junio C Hamano	Git 1.6.5.9 v1.6.5.9	blob \| commitdiff \| raw \| diff to current
2010-12-15	Jonathan Nieder	Merge branch 'master' (early part) into pd/bash-4-compl...	blob \| commitdiff \| raw \| diff to current
2010-12-14	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2010-12-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-14	Junio C Hamano	Merge branch 'jk/maint-reflog-bottom' into maint	blob \| commitdiff \| raw \| diff to current
2010-12-14	Junio C Hamano	Merge branch 'mz/maint-rebase-stat-config' into maint	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'jn/parse-options-extra'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'ja/maint-pull-rebase-doc'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'gb/web--browse'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'nd/maint-hide-checkout-index-from-error'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'tc/http-urls-ends-with-slash'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'mz/rebase-abort-reflog-fix'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'jk/maint-reflog-bottom'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'mz/maint-rebase-stat-config'	blob \| commitdiff \| raw \| diff to current
2010-12-13	Junio C Hamano	Merge branch 'jn/git-cmd-h-bypass-setup'	blob \| commitdiff \| raw \| diff to current
2010-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-09	Junio C Hamano	Merge branch 'np/diff-in-corrupt-repository' into maint	blob \| commitdiff \| raw \| diff to current
2010-12-09	Junio C Hamano	Merge branch 'cm/diff-check-at-eol' into maint	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'nd/maint-fix-add-typo-detection' (early...	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'il/remote-fd-ext'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'jk/pager-per-command'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'jk/maint-decorate-01-bool'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'gc/http-with-non-ascii-username-url'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'ks/maint-getenv-fix'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'mg/maint-tag-rfc1991'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'jh/notes-merge'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'jk/diff-CBM'	blob \| commitdiff \| raw \| diff to current
2010-12-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-12-04	Junio C Hamano	Merge branch 'jn/ignore-doc'	blob \| commitdiff \| raw \| diff to current
2010-12-04	Junio C Hamano	Merge branch 'kb/maint-status-cquote'	blob \| commitdiff \| raw \| diff to current
2010-12-04	Junio C Hamano	Merge branch 'pn/commit-autosquash'	blob \| commitdiff \| raw \| diff to current
2010-12-04	Junio C Hamano	Merge branch 'sp/emfile'	blob \| commitdiff \| raw \| diff to current
2010-12-04	Junio C Hamano	Merge branch 'jj/icase-directory'	blob \| commitdiff \| raw \| diff to current
2010-12-03	Junio C Hamano	Merge branch 'maint' to sync with Git 1.7.3.3	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom