Merge branch 'wk/pull-signoff'
[git/git.git] / Documentation / merge-options.txt
2017-11-06 Junio C HamanoMerge branch 'wk/pull-signoff'
2017-11-06 Junio C HamanoMerge branch 'pc/submodule-helper'
2017-11-06 Junio C HamanoMerge branch 'pb/bisect-helper'
2017-11-06 Junio C HamanoMerge branch 'dm/run-command-ignored-hook-advise'
2017-11-06 Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2017-11-06 Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix'
2017-11-06 Junio C HamanoMerge branch 'cn/diff-indent-no-longer-is-experimental'
2017-11-06 Junio C HamanoMerge branch 'bw/grep-recurse-submodules'
2017-11-06 Junio C HamanoMerge branch 'js/submodule-in-excluded'
2017-11-06 Junio C HamanoMerge branch 'ao/check-resolve-ref-unsafe-result'
2017-11-06 Junio C HamanoMerge branch 'kd/auto-col-with-pager-fix'
2017-11-06 Junio C HamanoMerge branch 'jc/no-cmd-as-subroutine'
2017-11-06 Junio C HamanoMerge branch 'ma/lockfile-fixes'
2017-10-30 Junio C HamanoMerge tag 'l10n-2.15.0-rnd2.1' of git://github.com...
2017-10-28 Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28 Junio C HamanoMerge branch 'sb/rev-parse-show-superproject-root'
2017-10-28 Junio C HamanoMerge branch 'ao/path-use-xmalloc'
2017-10-28 Junio C HamanoMerge branch 'np/config-path-doc'
2017-10-26 Junio C HamanoMerge branch 'mh/ref-locking-fix'
2017-10-24 Junio C HamanoMerge tag 'l10n-2.15.0-rnd2' of git://github.com/git...
2017-10-23 Junio C HamanoSync with 2.14.3
2017-10-23 Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19 Junio C HamanoMerge branch 'jc/branch-force-doc-readability-fix'
2017-10-19 Junio C HamanoMerge branch 'dg/filter-branch-filter-order-doc'
2017-10-19 Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-19 Junio C HamanoMerge branch 'wk/merge-options-gpg-sign-doc'
2017-10-18 Junio C HamanoSync with maint
2017-10-18 Junio C HamanoMerge branch 'jk/ref-filter-colors-fix'
2017-10-18 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-17 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17 Junio C HamanoMerge branch 'jc/doc-checkout'
2017-10-13 W. Trevor Kingpull: pass --signoff/--no-signoff to "git merge"
2017-10-12 W. Trevor KingDocumentation/merge-options.txt: describe -S/--gpg...
2017-10-11 Junio C HamanoMerge branch 'ls/filter-process-delayed'
2017-10-11 Junio C HamanoMerge branch 'tb/complete-describe'
2017-10-11 Junio C HamanoMerge branch 'rs/rs-mailmap'
2017-10-11 Junio C HamanoMerge branch 'rs/fsck-null-return-from-lookup'
2017-10-11 Junio C HamanoMerge branch 'jk/sha1-loose-object-info-fix'
2017-10-09 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-08 Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2017-10-07 Junio C HamanoMerge branch 'tb/ref-filter-empty-modifier'
2017-10-07 Junio C HamanoMerge branch 'ks/verify-filename-non-option-error-messa...
2017-10-07 Junio C HamanoMerge branch 'ks/branch-tweak-error-message-for-extra...
2017-10-07 Junio C HamanoMerge branch 'ma/builtin-unleak'
2017-10-07 Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07 Junio C HamanoMerge branch 'tg/memfixes'
2017-10-07 Junio C HamanoMerge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07 Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-07 Junio C HamanoMerge branch 'jn/strbuf-doc-re-reuse'
2017-10-05 Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-05 Junio C HamanoMerge branch 'rs/run-command-use-alloc-array'
2017-10-05 Junio C HamanoMerge branch 'sb/git-clang-format'
2017-10-05 Junio C HamanoMerge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05 Junio C HamanoMerge branch 'rs/cocci-de-paren-call-params'
2017-10-05 Junio C HamanoMerge branch 'er/fast-import-dump-refs-on-checkpoint'
2017-10-04 Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-10-03 Junio C HamanoMerge branch 'ad/doc-markup-fix'
2017-10-03 Junio C HamanoMerge branch 'mh/mmap-packed-refs'
2017-10-03 Junio C HamanoMerge branch 'mr/doc-negative-pathspec'
2017-10-03 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-03 Junio C HamanoMerge branch 'jk/validate-headref-fix'
2017-10-03 Junio C HamanoMerge branch 'jk/no-optional-locks'
2017-10-03 Junio C HamanoMerge branch 'sd/branch-copy'
2017-10-03 Junio C HamanoMerge branch 'bc/rev-parse-parseopt-fix'
2017-10-03 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-09-29 Junio C HamanoMerge branch 'ma/leakplugs'
2017-09-29 Junio C HamanoMerge branch 'rj/no-sign-compare'
2017-09-29 Junio C HamanoMerge branch 'sb/merge-commit-msg-hook'
2017-09-29 Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix'
2017-09-29 Junio C HamanoMerge branch 'jm/status-ignored-directory-optim'
2017-09-28 Junio C HamanoMerge branch 'js/win32-lazyload-dll'
2017-09-28 Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Junio C HamanoMerge branch 'ks/doc-use-camelcase-for-config-name'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-avoid-large-offset'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-uint-may-be-shorter-than...
2017-09-28 Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/diff-blob'
2017-09-28 Junio C HamanoMerge branch 'hn/typofix'
2017-09-28 Junio C HamanoMerge branch 'ic/fix-filter-branch-to-handle-tag-withou...
2017-09-28 Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-26 Junio C HamanoSync with 2.14.2
2017-09-25 Junio C HamanoMerge branch 'ks/test-readme-phrasofix'
2017-09-25 Junio C HamanoMerge branch 'ow/rev-parse-is-shallow-repo'
2017-09-25 Junio C HamanoMerge branch 'rj/test-ulimit-on-windows'
2017-09-25 Junio C HamanoMerge branch 'jk/info-alternates-fix'
2017-09-25 Junio C HamanoMerge branch 'mh/for-each-string-list-item-empty-fix'
2017-09-25 Junio C HamanoMerge branch 'tb/test-lint-echo-e'
2017-09-25 Junio C HamanoMerge branch 'ls/travis-scriptify'
2017-09-25 Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Junio C HamanoMerge branch 'hv/mv-nested-submodules-test'
2017-09-25 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-09-25 Junio C HamanoMerge branch 'ks/commit-do-not-touch-cut-line'
2017-09-25 Junio C HamanoMerge branch 'tg/refs-allowed-flags'
2017-09-25 Junio C HamanoMerge branch 'rs/archive-excluded-directory'
2017-09-25 Junio C HamanoMerge branch 'ks/help-alias-label'
2017-09-25 Junio C HamanoMerge branch 'jk/write-in-full-fix'
next