completion: --edit and --no-edit for git-merge
[git] / tree-diff.c
2012-02-06  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06  Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06  Junio C HamanoSync with 1.7.6.6
2012-01-18  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-18  Junio C HamanoMerge branch 'jk/credentials'
2012-01-18  Junio C HamanoMerge branch 'mh/maint-show-ref-doc'
2012-01-18  Junio C HamanoMerge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13  Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2012-01-13  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-13  Junio C HamanoMerge branch 'jk/maint-upload-archive'
2012-01-13  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-12  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-10  Junio C HamanoMerge the attributes fix in from maint-1.6.7 branch
2012-01-09  Junio C HamanoMerge branch 'jk/credentials'
2012-01-09  Junio C HamanoMerge branch 'mh/ref-api-less-extra-refs'
2012-01-09  Junio C HamanoMerge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06  Junio C HamanoMerge branch 'jc/show-sig'
2012-01-06  Junio C HamanoMerge branch 'jn/maint-gitweb-utf8-fix' into maint
2012-01-06  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-04  Junio C HamanoMerge branch 'nd/maint-parse-depth' into maint
2012-01-03  Junio C HamanoMerge branch 'pw/p4-docs-and-tests'
2012-01-03  Junio C HamanoMerge branch 'maint-1.7.7' into maint
2011-12-28  Junio C HamanoMerge branch 'jv/maint-config-set' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/follow-rename-score' into maint
2011-12-28  Junio C HamanoMerge branch 'jc/checkout-m-twoway' into maint
2011-12-28  Junio C HamanoMerge branch 'tr/doc-sh-setup' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28  Junio C HamanoMerge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
2011-12-28  Junio C HamanoMerge branch 'ef/setenv-putenv' into maint
2011-12-28  Junio C HamanoMerge branch 'jn/maint-sequencer-fixes' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-push-over-dav' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-mv' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/fetch-no-tail-match-refs' into maint
2011-12-28  Junio C HamanoMerge branch 'ew/keepalive' into maint
2011-12-28  Junio C HamanoMerge branch 'ci/stripspace-docs' into maint
2011-12-28  Junio C HamanoMerge branch 'jh/fast-import-notes' into maint
2011-12-28  Junio C HamanoMerge branch 'aw/rebase-i-stop-on-failure-to-amend...
2011-12-28  Junio C HamanoMerge branch 'tj/maint-imap-send-remove-unused' into...
2011-12-28  Junio C HamanoMerge branch 'jn/branch-move-to-self' into maint
2011-12-28  Junio C HamanoMerge branch 'na/strtoimax' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/refresh-porcelain-output' into maint
2011-12-22  Junio C HamanoMerge branch 'tr/bash-read-unescaped'
2011-12-22  Junio C HamanoMerge branch 'ab/sun-studio-portability'
2011-12-22  Junio C HamanoMerge branch 'tr/doc-sh-setup'
2011-12-22  Junio C HamanoMerge branch 'rr/revert-cherry-pick'
2011-12-22  Junio C HamanoMerge branch 'tr/pty-all'
2011-12-22  Junio C HamanoMerge branch 'jn/maint-gitweb-utf8-fix'
2011-12-22  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init'
2011-12-22  Junio C HamanoMerge branch 'jc/maint-lf-to-crlf-keep-crlf'
2011-12-22  Junio C HamanoMerge branch 'rs/diff-tree-combined-clean-up'
2011-12-22  Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose'
2011-12-22  Junio C HamanoMerge branch 'tr/grep-threading'
2011-12-22  Junio C HamanoMerge branch 'jk/pretty-reglog-ent'
2011-12-22  Junio C HamanoMerge branch 'jk/follow-rename-score'
2011-12-22  Junio C HamanoMerge branch 'nd/war-on-nul-in-commit'
2011-12-22  Junio C HamanoMerge branch 'jk/maint-do-not-feed-stdin-to-tests'
2011-12-22  Junio C HamanoMerge branch 'jn/test-cleanup-7006'
2011-12-22  Junio C HamanoMerge branch 'ef/setenv-putenv'
2011-12-22  Junio C HamanoMerge branch 'jk/git-prompt'
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 'bc/maint-apply-check-no-patch' into maint
2011-12-21  Junio C HamanoMerge branch 'cn/maint-lf-to-crlf-filter' into maint
2011-12-21  Junio C HamanoMerge branch 'jk/maint-upload-archive' into maint
2011-12-21  Junio C HamanoMerge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20  Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2011-12-20  Junio C HamanoMerge branch 'jc/pull-signed-tag'
2011-12-20  Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20  Junio C HamanoMerge branch 'tr/cache-tree'
2011-12-20  Junio C HamanoMerge branch 'ab/enable-i18n'
2011-12-20  Junio C HamanoMerge branch 'ew/keepalive'
2011-12-20  Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20  Junio C HamanoMerge branch 'jk/maint-push-over-dav'
2011-12-20  Junio C HamanoMerge branch 'jk/fetch-no-tail-match-refs'
2011-12-20  Junio C HamanoMerge branch 'jn/maint-sequencer-fixes'
2011-12-20  Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy'
2011-12-20  Junio C HamanoMerge branch 'jk/maint-mv'
2011-12-20  Junio C HamanoMerge branch 'ci/stripspace-docs'
2011-12-20  Junio C HamanoMerge branch 'tr/cache-tree'
2011-12-20  Junio C HamanoMerge branch 'jk/credentials'
2011-12-18  Junio C HamanoUpdate jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17  Junio C HamanoMerge branch 'jc/commit-amend-no-edit'
2011-12-17  Junio C HamanoMerge branch 'jc/stream-to-pack'
2011-12-17  Junio C HamanoMerge branch 'aw/rebase-i-stop-on-failure-to-amend'
2011-12-17  Junio C HamanoMerge branch 'jh/fast-import-notes'
2011-12-17  Junio C HamanoMerge branch 'jk/upload-archive-use-start-command'
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-16  Jeff Kinguse custom rename score during --follow
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 'bc/maint-apply-check-no-patch'
2011-12-14  Junio C HamanoMerge branch 'nd/ignore-might-be-precious'
2011-12-14  Junio C HamanoMerge branch 'jn/branch-move-to-self'
2011-12-14  Junio C HamanoMerge branch 'cn/maint-lf-to-crlf-filter'
2011-12-14  Junio C HamanoMerge branch 'tj/maint-imap-send-remove-unused'
2011-12-14  Junio C HamanoMerge branch 'jk/maint-upload-archive'
2011-12-14  Junio C HamanoMerge branch 'jn/gitweb-side-by-side-diff'
2011-12-14  Junio C HamanoMerge branch 'jc/maint-pack-object-cycle' into maint
next