Merge branch 'jk/grep-e-could-be-extended-beyond-posix'
[gitweb.git] / Documentation / howto / revert-a-faulty-merge.txt
2016-11-11 Merge branch 'as/merge-attr-sleep'
2016-11-11 Merge branch 'ls/macos-update'
2016-11-11 Merge branch 'js/prepare-sequencer'
2016-11-10 Merge branch 'jk/alt-odb-cleanup'
2016-11-10 Merge branch 'jk/filter-process-fix'
2016-11-10 Merge branch 'ls/filter-process'
2016-11-02 Merge branch 'russian-l10n' of https://github.com/DJm00...
2016-10-31 Merge branch 'nd/test-helpers'
2016-10-31 Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Merge branch 'rs/commit-pptr-simplify'
2016-10-31 Merge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31 Merge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31 Merge branch 'jk/common-main'
2016-10-31 Merge branch 'aw/numbered-stash'
2016-10-31 Merge branch 'jt/trailer-with-cruft'
2016-10-31 Merge branch 'ls/filter-process'
2016-10-31 Merge branch 'ls/git-open-cloexec'
2016-10-28 Merge branch 'pb/test-parse-options-expect' into maint
2016-10-28 Merge branch 'jc/cocci-xstrdup-or-null' into maint
2016-10-28 Merge branch 'rs/cocci' into maint
2016-10-28 Merge branch 'jc/diff-unique-abbrev-comments' into...
2016-10-28 Merge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Merge branch 'js/reset-usage' into maint
2016-10-28 Merge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-27 Merge branch 'svn-wt' of git://bogomips.org/git-svn
2016-10-27 Merge branch 'nd/ita-empty-commit'
2016-10-27 Merge branch 'js/prepare-sequencer'
2016-10-27 Merge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27 Merge branch 'rs/ring-buffer-wraparound'
2016-10-27 Merge branch 'sb/submodule-ignore-trailing-slash'
2016-10-27 Merge branch 'jc/abbrev-auto'
2016-10-27 Merge branch 'jk/abbrev-auto'
2016-10-27 Merge branch 'lt/abbrev-auto'
2016-10-26 Merge branch 'ex/deprecate-empty-pathspec-as-match...
2016-10-26 Merge branch 'po/fix-doc-merge-base-illustration'
2016-10-25 doc: fix the 'revert a faulty merge' ASCII art tab...
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-08-03 Merge branch 'jk/git-jump'
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-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
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-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
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/submodule-typofix-in-error'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-09-01 Merge branch 'br/svn-doc-include-paths-config'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add'
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-01 Merge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-19 Merge branch 'jc/gitignore-precedence'
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-21 Merge branch 'iu/fix-parse-options-h-comment' into...
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-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-20 Merge branch 'jc/decorate-leaky-separator-color'
next