Documentation/git-merge-file: document option "--diff3"
[git] / progress.c
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 '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 'mm/push-force-is-dangerous' 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-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 'mt/send-email-cc-match-fix' 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 '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 'rs/empty-archive' into maint
2013-07-03  Junio C HamanoMerge branch 'rh/merge-options-doc-fix' into maint
2013-07-03  Junio C HamanoMerge branch 'an/diff-index-doc' into maint
2013-07-03  Junio C HamanoMerge branch 'cb/log-follow-with-combined' into maint
2013-07-03  Junio C HamanoMerge branch 'maint-1.8.2' into maint
2013-06-30  Junio C HamanoMerge branch 'fc/macos-x-clipped-write' into maint
2013-06-27  Junio C HamanoMerge branch 'tg/maint-zsh-svn-remote-prompt' into...
2013-06-27  Junio C HamanoMerge branch 'nd/urls-doc-no-file-hyperlink-fix' into...
2013-06-27  Junio C HamanoMerge branch 'tr/push-no-verify-doc' into maint
2013-06-27  Junio C HamanoMerge branch 'rs/commit-m-no-edit' into maint
2013-06-27  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27  Junio C HamanoMerge branch 'jk/subtree-do-not-push-if-split-fails...
2013-06-11  Junio C HamanoMerge branch 'maint-1.8.2' into maint
2013-06-10  Junio C HamanoMerge branch 'jn/config-ignore-inaccessible' into maint
2013-06-10  Junio C HamanoMerge branch 'kb/status-ignored-optim-2' into maint
2013-05-29  Junio C HamanoMerge branch 'maint-1.8.2' into maint
2013-05-17  Junio C HamanoMerge branch 'dw/asciidoc-sources-are-dot-txt-files'
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-09  Junio C HamanoSync with v1.8.2.3
2013-05-09  Junio C HamanoMerge branch 'mv/sequencer-pick-error-diag'
2013-05-07  Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
2013-05-05  Junio C HamanoMerge branch 'fc/push-with-export-reporting-result'
2013-05-03  Junio C HamanoMerge branch 'tr/unpack-entry-use-after-free-fix'
2013-05-03  Junio C HamanoSync with maint
2013-05-01  Junio C HamanoMerge branch 'hb/git-pm-tempfile'
2013-05-01  Junio C HamanoMerge branch 'rs/pp-user-info-without-extra-allocation'
2013-05-01  Junio C HamanoMerge branch 'tr/remote-tighten-commandline-parsing'
2013-05-01  Junio C HamanoMerge branch 'zk/prompt-rebase-step'
2013-04-29  Junio C HamanoMerge branch 'maint'
2013-04-28  Junio C HamanoMerge branch 'maint'
2013-04-28  Junio C HamanoMerge branch 'nd/pretty-formats'
2013-04-28  Junio C HamanoMerge branch 'jk/check-corrupt-objects-carefully'
2013-04-28  Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
2013-04-26  Junio C HamanoMerge branch 'rr/shortlog-doc'
2013-04-26  Junio C HamanoMerge branch 'ph/rebase-original'
2013-04-26  Junio C HamanoMerge branch 'jn/glossary-revision'
2013-04-26  Junio C HamanoMerge branch 'fc/remote-bzr'
2013-04-26  Junio C HamanoSync with 1.8.2.2
2013-04-24  Junio C HamanoMerge branch 'jk/remote-helper-with-signed-tags'
2013-04-24  Junio C HamanoSync with maint
2013-04-24  Junio C HamanoMerge git://github.com/git-l10n/git-po
2013-04-23  Junio C HamanoMerge branch 'nd/pretty-formats'
2013-04-23  Junio C HamanoMerge branch 'kb/status-ignored-optim-2'
2013-04-23  Junio C HamanoMerge branch 'jn/gitweb-install-doc'
2013-04-23  Junio C HamanoMerge branch 'fc/untracked-zsh-prompt'
2013-04-23  Junio C HamanoMerge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-22  Junio C HamanoSync with maint
2013-04-22  Junio C HamanoMerge branch 'as/clone-reference-with-gitfile'
2013-04-22  Junio C HamanoMerge branch 'jc/add-2.0-delete-default' (early part)
2013-04-22  Junio C HamanoMerge branch 'nd/checkout-keep-sparse'
2013-04-22  Junio C HamanoMerge branch 'jk/chopped-ident'
2013-04-22  Junio C HamanoMerge branch 'th/bisect-final-log'
2013-04-22  Junio C HamanoMerge branch 'rs/archive-zip-raw-compression'
2013-04-22  Junio C HamanoMerge branch 'ta/glossary'
2013-04-22  Junio C HamanoMerge branch 'jk/doc-http-backend'
2013-04-22  Junio C HamanoMerge branch 'jx/i18n-branch-error-messages'
2013-04-22  Junio C HamanoMerge branch 'fc/remote-hg'
2013-04-22  Junio C HamanoMerge branch 'lf/read-blob-data-from-index'
2013-04-19  Junio C HamanoMerge branch 'jk/a-thread-only-dies-once'
2013-04-19  Junio C HamanoMerge branch 'rt/commentchar-fmt-merge-msg'
2013-04-19  Junio C HamanoMerge branch 'mv/sequencer-pick-error-diag'
2013-04-19  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin'
2013-04-19  Junio C HamanoMerge branch 'jn/add-2.0-u-A-sans-pathspec' (early...
2013-04-19  Junio C HamanoMerge branch 'ap/strbuf-humanize'
2013-04-10  Antoine Pelissestrbuf: create strbuf_humanise_bytes() to show byte...
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-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
next