git-merge: document the -S option
[git] / preload-index.c
2011-10-19  Junio C HamanoMerge branch 'js/log-show-children'
2011-10-19  Junio C HamanoMerge branch 'cb/httpd-test-fix-port'
2011-10-19  Junio C HamanoMerge branch 'md/smtp-tls-hello-again'
2011-10-18  Junio C HamanoMerge branch 'jk/pull-rebase-with-work-tree'
2011-10-18  Junio C HamanoMerge branch 'mm/maint-config-explicit-bool-display'
2011-10-18  Junio C HamanoMerge branch 'jc/checkout-from-tree-keep-local-changes'
2011-10-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2011-10-16  Junio C HamanoMerge branch 'bk/ancestry-path' into maint
2011-10-16  Junio C HamanoMerge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16  Junio C HamanoMerge branch 'jc/maint-grep-untracked-exclude' into...
2011-10-14  Junio C HamanoMerge branch 'js/maint-merge-one-file-osx-expr'
2011-10-14  Junio C HamanoMerge branch 'jc/is-url-simplify'
2011-10-14  Junio C HamanoMerge branch 'nd/git-daemon-error-msgs'
2011-10-14  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix'
2011-10-14  Junio C HamanoMerge branch 'bw/grep-no-index-no-exclude'
2011-10-12  Junio C HamanoMerge branch 'rs/name-rev-usage'
2011-10-12  Junio C HamanoMerge branch 'zj/send-email-authen-sasl'
2011-10-10  Junio C HamanoMerge branch 'jp/get-ref-dir-unsorted'
2011-10-10  Junio C HamanoMerge branch 'jc/maint-diffstat-numstat-context'
2011-10-05  Junio C HamanoMerge branch 'jc/ls-remote-short-help'
2011-10-05  Junio C HamanoMerge branch 'sn/doc-update-index-assume-unchanged'
2011-10-05  Junio C HamanoMerge branch 'rj/quietly-create-dep-dir'
2011-10-05  Junio C HamanoMerge branch 'jc/fetch-pack-fsck-objects'
2011-10-05  Junio C HamanoMerge branch 'gb/am-hg-patch'
2011-10-05  Junio C HamanoMerge branch 'bk/ancestry-path'
2011-10-05  Junio C HamanoMerge branch 'nm/grep-object-sha1-lock'
2011-10-05  Junio C HamanoMerge branch 'jc/maint-grep-untracked-exclude' into...
2011-09-23  Junio C HamanoMerge branch 'mh/check-ref-format-print-normalize'...
2011-09-23  Junio C HamanoMerge branch 'gb/maint-am-patch-format-error-message...
2011-09-22  Junio C HamanoMerge branch 'bk/ancestry-path' into jc/branch-desc
2011-09-12  Junio C HamanoMerge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12  Junio C HamanoMerge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-09-06  Junio C HamanoMerge branch 'mh/check-ref-format-print-normalize'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-t3903-misquoted-command'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-patch-format-error-message'
2011-09-02  Junio C HamanoMerge branch 'bg/t5540-osx-grep'
2011-08-25  Junio C HamanoMerge branch 'jn/plug-empty-tree-leak'
2011-08-23  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-18  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree'
2011-08-16  Junio C HamanoMerge branch 'jk/fast-export-quote-path' into maint
2011-08-16  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-08-16  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-11  Junio C HamanoMerge branch 'jk/fast-export-quote-path'
2011-08-01  Junio C HamanoMerge branch 'jk/clone-detached'
2011-08-01  Junio C HamanoMerge branch 'jc/legacy-loose-object' into maint
2011-08-01  Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22  Junio C HamanoMerge branch 'jk/tag-contains-ab'
2011-07-22  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc'
2011-07-22  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd'
2011-07-19  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-07-19  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-13  Junio C HamanoMerge branch 'js/rebase-typo-branch-squelch-usage'
2011-07-13  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13  Junio C HamanoMerge branch 'jc/legacy-loose-object'
2011-07-06  Junio C HamanoMerge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06  Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-30  Junio C HamanoMerge branch 'ef/maint-win-verify-path'
2011-06-30  Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30  Junio C HamanoMerge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30  Junio C HamanoMerge branch 'jc/advice-about-to-lose-commit'
2011-06-29  Junio C HamanoMerge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-24  Junio C HamanoMerge branch 'maint-1.7.4' into maint
2011-06-15  Jonathan NiederMerge branch 'db/delta-applier' into db/text-delta
2011-06-15  Jonathan NiederMerge branch 'db/delta-applier' into svn-fe
2011-06-06  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-06-06  Junio C HamanoMerge branch 'jk/diff-not-so-quick'
2011-06-06  Junio C HamanoMerge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01  Junio C HamanoMerge branch 'jk/maint-config-alias-fix' into maint
2011-06-01  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31  Junio C HamanoMerge branch 'jk/format-patch-am'
2011-05-31  Junio C HamanoMerge branch 'jc/log-quiet-fix'
2011-05-31  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak'
2011-05-31  Junio C HamanoMerge branch 'jk/maint-remote-mirror-safer'
2011-05-31  Junio C HamanoMerge branch 'rr/doc-content-type' into maint
2011-05-31  Junio C HamanoMerge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31  Junio C HamanoMerge branch 'jk/maint-config-alias-fix'
2011-05-30  Junio C HamanoMerge branch 'jm/maint-misc-fix' into maint
2011-05-26  Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26  Junio C HamanoMerge branch 'jc/require-work-tree-exists'
2011-05-26  Junio C HamanoMerge branch 'maint-1.7.4' into maint
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26  Junio C HamanoMerge branch 'ss/doc-svn' into maint
2011-05-26  Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26  Junio C HamanoMerge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-26  Jonathan NiederMerge branch 'db/delta-applier' into db/text-delta
2011-05-26  Jonathan NiederMerge branch 'db/svn-fe-code-purge' into svn-fe
2011-05-26  Jonathan NiederMerge branch 'db/vcs-svn-incremental' into svn-fe
2011-05-23  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe'
2011-05-23  Junio C HamanoMerge branch 'js/mingw-shutdown'
2011-05-20  Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20  Junio C HamanoMerge branch 'rg/copy-gecos-username'
2011-05-20  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix'
next