notes: add notes.mergeStrategy option to select default strategy
[gitweb.git] / Documentation / git-describe.txt
2015-07-27 Merge branch 'jk/pretty-encoding-doc' into maint
2015-07-27 Merge branch 'tb/checkout-doc' into maint
2015-07-27 Merge branch 'ls/hint-rev-list-count' into maint
2015-07-27 Merge branch 'mm/branch-doc-updates' into maint
2015-07-27 Merge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27 Merge branch 'et/http-proxyauth' into maint
2015-07-27 Merge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27 Merge branch 'mh/strbuf-read-file-returns-ssize-t'...
2015-07-27 Merge branch 'kb/config-unmap-before-renaming' into...
2015-07-27 Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27 Merge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-27 Merge branch 'jk/fix-refresh-utime' into maint
2015-07-27 Merge branch 'cb/rebase-am-exit-code' into maint
2015-07-27 Merge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21 Merge branch 'tf/gitweb-typofix'
2015-07-17 Merge branch 'jk/still-interesting'
2015-07-17 Merge branch 'es/worktree-add'
2015-07-15 Merge branch 'jc/diff-ws-error-highlight'
2015-07-15 Merge branch 'mm/describe-doc' into maint
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-07-13 Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git...
2015-07-13 Merge branch 'es/worktree-add'
2015-07-13 Merge branch 'nd/multiple-work-trees'
2015-07-13 Merge branch 'ss/clone-guess-dir-name-simplify'
2015-07-13 Merge branch 'kb/config-unmap-before-renaming'
2015-07-13 Merge branch 'mh/strbuf-read-file-returns-ssize-t'
2015-07-13 Merge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13 Merge branch 'kb/use-nsec-doc'
2015-07-13 Merge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-07-13 Merge branch 'et/http-proxyauth'
2015-07-13 Merge branch 'jc/fsck-retire-require-eoh'
2015-07-10 Merge branch 'cb/rebase-am-exit-code'
2015-07-10 Merge branch 'jk/fix-refresh-utime'
2015-07-10 Merge branch 'mm/branch-doc-updates'
2015-07-10 Merge branch 'ls/hint-rev-list-count'
2015-07-10 Merge branch 'jk/rev-list-no-bitmap-while-pruning'
2015-07-10 Merge branch 'cb/subtree-tests-update'
2015-07-10 Merge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-10 Merge branch 'sb/p5310-and-chain'
2015-07-10 Merge branch 'tb/checkout-doc'
2015-07-10 Merge branch 'jk/pretty-encoding-doc'
2015-07-10 Merge branch 'nd/dwim-wildcards-as-pathspecs'
2015-07-09 Merge branch 'jk/maint-for-each-packed-object'
2015-07-09 Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'
2015-07-01 Merge branch 'me/fetch-into-shallow-safety'
2015-07-01 Merge branch 'jc/prompt-document-ps1-state-separator'
2015-07-01 Merge branch 'mm/describe-doc'
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-16 Documentation/describe: improve one-line summary
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jc/max-io-size-and-ssize-max'
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-17 Merge branch 'jk/status-read-branch-name-fix'
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'mh/find-uniq-abbrev' into maint
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22 Merge branch 'mh/find-uniq-abbrev'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-25 Merge branch 'jc/shortlog-ref-exclude' into maint
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-06-09 Merge branch 'jc/shortlog-ref-exclude'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
next