]> git.ipfire.org Git - thirdparty/git.git/history - ll-merge.h
Merge branch 'maint-2.1' into maint
[thirdparty/git.git] / ll-merge.h
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-08-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06  Junio C HamanoMerge branch 'jn/block-sha1' into maint
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-07-24  Junio C HamanoMerge branch 'jn/block-sha1'
2012-07-22  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-07-16  Junio C HamanoMerge branch 'tg/maint-cache-name-compare'
2012-07-16  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch'
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix'
2012-04-26  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10  David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02  Junio C HamanoMerge branch 'pt/gitk'
2012-03-24  Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16  Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-02-27  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-16  Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-13  Junio C HamanoMerge branch 'mm/empty-loose-error-message'
2011-12-28  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-22  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init'
2011-12-21  Junio C HamanoMerge branch 'jl/submodule-status-failure-report' into...
2011-12-21  Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21  Junio C HamanoMerge branch 'ms/commit-cc-option-helpstring' into...
2011-12-18  Junio C HamanoUpdate jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14  Junio C HamanoMerge branch 'jl/submodule-status-failure-report'
2011-12-14  Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer'
2011-12-14  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14  Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14  Junio C HamanoMerge branch 'ml/mailmap' into maint-1.7.6
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2011-12-05  Junio C HamanoMerge branch 'nd/maint-ignore-exclude'
2011-11-28  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into nd/ignore...
2011-11-23  Junio C HamanoMerge branch 'maint' into tj/imap-send-remove-unused
2011-11-21  Junio C HamanoMerge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18  Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint
2011-11-18  Junio C HamanoMerge branch 'ml/mailmap' into maint
2011-11-12  Junio C HamanoMerge branch 'ly/mktree-using-strbuf'
2011-11-10  Junio C HamanoMerge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-10  Junio C HamanoMerge 'build-in git-mktree'
2011-11-09  Junio C HamanoMerge branch 'jc/remote-setbranches-usage-fix'
2011-11-09  Junio C HamanoMerge branch 'fc/remote-seturl-usage-fix'
2011-11-09  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-08  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01  Junio C HamanoMerge branch 'md/smtp-tls-hello-again' into maint
2011-11-01  Junio C HamanoMerge branch 'jc/maint-diffstat-numstat-context' into...
2011-11-01  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.3' into maint-1.7.4
2011-10-26  Junio C HamanoMerge branch 'sn/doc-update-index-assume-unchanged...
2011-10-24  Junio C HamanoMerge branch 'maint-1.7.3' into maint
2011-10-21  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref'
2011-10-21  Junio C HamanoMerge branch 'cn/doc-config-bare-subsection'
2011-10-21  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-21  Junio C HamanoMerge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-19  Junio C HamanoMerge branch 'js/log-show-children'
2011-10-19  Junio C HamanoMerge branch 'cb/httpd-test-fix-port'
next