Documentation/git-merge-file: document option "--diff3"
[git] / help.h
2013-07-22  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22  Junio C HamanoMerge branch 'dk/maint-t5150-dirname' into maint
2013-07-22  Junio C HamanoMerge branch 'dk/version-gen-gitdir' into maint
2013-07-22  Junio C HamanoMerge branch 'nk/config-local-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22  Junio C HamanoMerge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22  Junio C HamanoMerge branch 'ft/doc-git-transport' into maint
2013-07-22  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19  Junio C HamanoMerge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half...
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-19  Junio C HamanoMerge branch 'vl/typofix' into maint
2013-07-19  Junio C HamanoMerge branch 'wk/doc-git-has-grown' into maint
2013-07-19  Junio C HamanoMerge branch 'ys/cygstart' into maint
2013-07-19  Junio C HamanoMerge branch 'mm/push-force-is-dangerous' into maint
2013-07-19  Junio C HamanoMerge branch 'rs/logical-vs-binary-or' into maint
2013-07-19  Junio C HamanoMerge branch 'js/test-ln-s-add' into maint
2013-07-19  Junio C HamanoMerge branch 'jk/apache-test-for-2.4' into maint
2013-07-19  Junio C HamanoMerge branch 'tr/test-commit-only-on-orphan' into maint
2013-07-19  Junio C HamanoMerge branch 'sb/archive-zip-double-assignment-fix...
2013-07-19  Junio C HamanoMerge branch 'th/bisect-skip-report-range-fix' into...
2013-07-19  Junio C HamanoMerge branch 'rs/tar-tests' into maint
2013-07-19  Junio C HamanoMerge branch 'rr/column-doc' into maint
2013-07-19  Junio C HamanoMerge branch 'rs/discard-index-discard-array' into...
2013-07-19  Junio C HamanoMerge branch 'tr/coverage' into maint
2013-07-15  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15  Junio C HamanoMerge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-15  Junio C HamanoMerge branch 'jk/pull-into-dirty-unborn' into maint
2013-07-15  Junio C HamanoMerge branch 'fg/submodule-non-ascii-path' into maint
2013-07-15  Junio C HamanoMerge branch 'fc/sequencer-plug-leak' into maint
2013-07-15  Junio C HamanoMerge branch 'mt/send-email-cc-match-fix' into maint
2013-07-03  Junio C HamanoMerge branch 'rr/diffcore-pickaxe-doc' into maint
2013-07-03  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03  Junio C HamanoMerge branch 'dm/unbash-subtree' into maint
2013-07-03  Junio C HamanoMerge branch 'jc/core-checkstat' into maint
2013-07-03  Junio C HamanoMerge branch 'jc/t5551-posix-sed-bre' into maint
2013-07-03  Junio C HamanoMerge branch 'vv/help-unknown-ref' into maint
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-08  Vikrant Varmahelp: add help_unknown_ref()
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup'
2013-03-26  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify'
2013-02-20  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-02-07  Junio C HamanoMerge branch 'ft/transport-report-segv' into maint
2013-02-07  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak' into maint
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 'dl/am-hg-locale' into maint
2013-02-01  Junio C HamanoMerge branch 'jc/no-git-config-in-clone'
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-29  Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges' into maint
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-22  Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges'
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar...
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 'os/gitweb-highlight-uncaptured' into...
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar'
2013-01-10  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-09  Junio C HamanoMerge branch 'os/gitweb-highlight-uncaptured'
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2013-01-08  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'
2012-12-23  Junio C HamanoMerge branch 'nd/index-format-doc' into maint
2012-12-21  Junio C HamanoMerge branch 'nd/index-format-doc'
2012-11-21  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-19  Junio C HamanoMerge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-15  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite'
2012-11-15  Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09  Jeff KingMerge branch 'nd/tree-walk-enum-cleanup'
2012-10-29  Jeff KingMerge branch 'jk/maint-http-init-not-in-result-handler'
2012-10-25  Jeff KingMerge branch 'jk/strbuf-detach-always-non-null'
2012-10-25  Jeff KingMerge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-08  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08  Junio C HamanoMerge branch 'jc/merge-bases-paint-fix'
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-08  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
next