Merge branch 'jk/python-styles'
[git] / builtin / merge-index.c
2013-02-07  Junio C HamanoMerge branch 'ab/gitweb-use-same-scheme'
2013-02-06  Junio C HamanoMerge branch 'jn/auto-depend-workaround-buggy-ccache'
2013-02-06  Junio C HamanoMerge branch 'jc/fake-ancestor-with-non-blobs'
2013-02-06  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak'
2013-02-06  Junio C HamanoMerge branch 'ft/transport-report-segv'
2013-02-04  Junio C HamanoMerge branch 'mm/add-u-A-sans-pathspec'
2013-02-04  Junio C HamanoMerge branch 'jc/push-reject-reasons'
2013-02-04  Junio C HamanoMerge branch 'jc/custom-comment-char'
2013-02-04  Junio C HamanoMerge branch 'bc/git-p4-for-python-2.4' into maint
2013-02-04  Junio C HamanoMerge branch 'nd/edit-branch-desc-while-detached' into...
2013-02-04  Junio C HamanoMerge branch 'jn/do-not-drop-username-when-reading...
2013-02-04  Junio C HamanoMerge branch 'jk/cvsimport-does-not-work-with-cvsps3...
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/help' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/merge-blobs' into maint
2013-02-01  Junio C HamanoMerge branch 'nd/edit-branch-desc-while-detached'
2013-02-01  Junio C HamanoMerge branch 'jk/gc-auto-after-fetch'
2013-02-01  Junio C HamanoMerge branch 'bc/git-p4-for-python-2.4'
2013-02-01  Junio C HamanoMerge branch 'jn/do-not-drop-username-when-reading...
2013-02-01  Junio C HamanoMerge branch 'jk/cvsimport-does-not-work-with-cvsps3'
2013-02-01  Junio C HamanoMerge branch 'jc/do-not-let-random-file-interfere-with...
2013-02-01  Junio C HamanoMerge branch 'as/test-cleanup'
2013-02-01  Junio C HamanoMerge branch 'jc/no-git-config-in-clone'
2013-02-01  Junio C HamanoMerge branch 'nd/fetch-depth-is-broken'
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-30  Junio C HamanoMerge branch 'maint'
2013-01-28  Junio C HamanoSync with 1.8.1.2
2013-01-28  Junio C HamanoMerge branch 'tb/t0050-maint'
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-28  Junio C HamanoMerge branch 'jc/help'
2013-01-28  Junio C HamanoMerge branch 'bc/fix-array-syntax-for-3.0-in-completion...
2013-01-25  Junio C HamanoMerge branch 'nd/retire-fnmatch'
2013-01-25  Junio C HamanoMerge branch 'jc/doc-maintainer'
2013-01-24  Junio C HamanoMerge branch 'ch/add-auto-submitted-in-sample-post...
2013-01-24  Junio C HamanoMerge branch 'as/check-ignore'
2013-01-24  Junio C HamanoMerge branch 'rs/clarify-entry-cmp-sslice'
2013-01-24  Junio C HamanoMerge branch 'jk/suppress-clang-warning'
2013-01-24  Junio C HamanoMerge branch 'cr/push-force-tag-update'
2013-01-24  Junio C HamanoMerge branch 'mh/imap-send-shrinkage'
2013-01-24  Junio C HamanoMerge branch 'mo/cvs-server-updates'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-22  Junio C HamanoMerge branch 'mz/reset-misc'
2013-01-22  Junio C HamanoMerge branch 'nd/fix-directory-attrs-off-by-one'
2013-01-22  Junio C HamanoMerge branch 'pw/p4-branch-fixes'
2013-01-22  Junio C HamanoMerge branch 'zk/clean-report-failure'
2013-01-22  Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges'
2013-01-22  Junio C HamanoMerge branch 'nd/clone-no-separate-git-dir-with-bare'
2013-01-22  Junio C HamanoMerge branch 'maint'
2013-01-21  Junio C HamanoMerge branch 'maint'
2013-01-21  Junio C HamanoMerge branch 'rt/commit-cleanup-config'
2013-01-21  Junio C HamanoMerge branch 'ap/log-mailmap'
2013-01-18  Junio C HamanoMerge branch 'ss/help-htmlpath-config-doc'
2013-01-18  Junio C HamanoMerge branch 'nd/fix-perf-parameters-in-tests'
2013-01-18  Junio C HamanoMerge branch 'nd/attr-debug-fix'
2013-01-18  Junio C HamanoMerge branch 'rs/pretty-use-prefixcmp'
2013-01-18  Junio C HamanoMerge branch 'ds/completion-silence-in-tree-path-probe'
2013-01-18  Junio C HamanoMerge branch 'jn/maint-trim-vim-contrib'
2013-01-18  Junio C HamanoMerge branch 'pe/doc-email-env-is-trumped-by-config'
2013-01-18  Junio C HamanoMerge branch 'mk/complete-tcsh'
2013-01-14  Junio C HamanoSync with 1.8.1.1
2013-01-14  Junio C HamanoMerge branch 'jc/blame-no-follow'
2013-01-14  Junio C HamanoMerge branch 'fc/remote-testgit-feature-done'
2013-01-14  Junio C HamanoMerge branch 'nd/upload-pack-shallow-must-be-commit'
2013-01-14  Junio C HamanoMerge branch 'ap/status-ignored-in-ignored-directory'
2013-01-14  Junio C HamanoMerge branch 'nz/send-email-headers-are-case-insensitive'
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-12  Junio C HamanoMerge branch 'rs/zip-with-uncompressed-size-in-the...
2013-01-12  Junio C HamanoMerge branch 'rs/zip-tests'
2013-01-12  Junio C HamanoMerge branch 'jn/xml-depends-on-asciidoc-conf'
2013-01-12  Junio C HamanoMerge branch 'jk/unify-exit-code-by-receiving-signal'
2013-01-12  Junio C HamanoMerge branch 'jc/merge-blobs'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2012-12-10  Junio C HamanoWhich merge_file() function do you mean?
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-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' 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-25  Junio C HamanoMerge branch 'lm/git-blame-el'
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-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
next