Merge branch 'rs/mailinfo-qp-decode-fix'
[gitweb.git] / Documentation / technical / trivial-merge.txt
2017-09-28 Merge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Merge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Merge branch 'jk/diff-blob'
2017-09-28 Merge branch 'hn/typofix'
2017-09-28 Merge branch 'ic/fix-filter-branch-to-handle-tag-withou...
2017-09-28 Merge branch 'jk/describe-omit-some-refs'
2017-09-26 Sync with 2.14.2
2017-09-25 Merge branch 'ks/test-readme-phrasofix'
2017-09-25 Merge branch 'ow/rev-parse-is-shallow-repo'
2017-09-25 Merge branch 'rj/test-ulimit-on-windows'
2017-09-25 Merge branch 'jk/info-alternates-fix'
2017-09-25 Merge branch 'mh/for-each-string-list-item-empty-fix'
2017-09-25 Merge branch 'tb/test-lint-echo-e'
2017-09-25 Merge branch 'ls/travis-scriptify'
2017-09-25 Merge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Merge branch 'hv/mv-nested-submodules-test'
2017-09-25 Merge branch 'bw/git-clang-format'
2017-09-25 Merge branch 'ks/commit-do-not-touch-cut-line'
2017-09-25 Merge branch 'tg/refs-allowed-flags'
2017-09-25 Merge branch 'rs/archive-excluded-directory'
2017-09-25 Merge branch 'ks/help-alias-label'
2017-09-25 Merge branch 'jk/write-in-full-fix'
2017-09-25 Merge branch 'ez/doc-duplicated-words-fix'
2017-09-25 Merge branch 'kd/doc-for-each-ref'
2017-09-25 Merge branch 'cc/subprocess-handshake-missing-capabilities'
2017-09-25 Merge branch 'kw/write-index-reduce-alloc'
2017-09-25 Merge branch 'mg/name-rev-tests-with-short-stack'
2017-09-21 Merge branch 'jk/leak-checkers'
2017-09-19 Merge branch 'rk/commit-tree-make-F-verbatim'
2017-09-19 Merge branch 'rs/strbuf-leakfix'
2017-09-19 Merge branch 'jk/shortlog-ident-cleanup'
2017-09-19 Merge branch 'mh/packed-ref-transactions'
2017-09-19 Merge branch 'kw/merge-recursive-cleanup'
2017-09-19 Merge branch 'sb/merge-commit-msg-hook'
2017-09-19 Merge branch 'jk/leak-checkers'
2017-09-19 Merge branch 'nm/pull-submodule-recurse-config'
2017-09-19 Merge branch 'mh/packed-ref-store-prep'
2017-09-19 Merge branch 'ma/remove-config-maybe-bool'
2017-09-19 Merge branch 'jk/system-path-cleanup'
2017-09-19 Merge branch 'jh/hashmap-disable-counting'
2017-09-19 Merge branch 'bb/doc-eol-dirty'
2017-09-19 Merge branch 'jt/packmigrate'
2017-09-19 Merge branch 'jk/incore-lockfile-removal'
2017-09-19 Merge branch 'nd/prune-in-worktree'
2017-09-19 Merge branch 'ma/split-symref-update-fix'
2017-09-19 Merge branch 'mh/notes-cleanup'
2017-09-19 Merge branch 'mg/timestamp-t-fix'
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
2017-09-19 Merge branch 'jk/config-lockfile-leak-fix'
2017-09-19 Merge branch 'dw/diff-highlight-makefile-fix'
2017-09-19 Merge branch 'ti/external-sha1dc'
2017-09-10 Sync with maint
2017-09-10 Merge branch 'rs/apply-epoch'
2017-09-10 Merge branch 'jk/drop-sha1-entry-pos'
2017-09-10 Merge branch 'nd/worktree-kill-parse-ref'
2017-09-10 Merge branch 'mm/send-email-cc-cruft'
2017-09-10 Merge branch 'ls/convert-filter-progress'
2017-09-10 Merge branch 'ma/up-to-date'
2017-08-23 treewide: correct several "up-to-date" to "up to date"
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-02-22 Merge branch 'jk/config-include'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
next