Andrew's git / gitweb.git / history
?
Merge branch 'js/http-custom-headers'
[gitweb.git] / Documentation / merge-options.txt
2016-05-17 Merge branch 'js/http-custom-headers' blob | diff | raw
2016-05-17 Merge branch 'jk/rebase-interative-eval-fix' blob | diff | raw
2016-05-17 Merge branch 'jc/fsck-nul-in-commit' blob | diff | raw
2016-05-17 Merge branch 'nd/test-helpers' blob | diff | raw
2016-05-17 Merge branch 'ls/travis-build-doc' blob | diff | raw
2016-05-17 Merge branch 'jc/ll-merge-internal' blob | diff | raw
2016-05-17 Merge branch 'jc/linkgit-fix' blob | diff | raw
2016-05-17 Merge branch 'va/i18n-remote-comment-to-align' blob | diff | raw
2016-05-17 Merge branch 'tb/t5601-sed-fix' blob | diff | raw
2016-05-17 Merge branch 'nd/error-errno' blob | diff | raw
2016-05-17 Merge branch 'jc/test-seq' blob | diff | raw
2016-05-17 Merge branch 'es/test-gpg-tags' blob | diff | raw
2016-05-17 Merge branch 'ak/t4151-ls-files-could-be-empty' blob | diff | raw
2016-05-17 Merge branch 'jk/submodule-c-credential' blob | diff | raw
2016-05-17 Merge branch 'nd/remote-plural-ours-plus-theirs' blob | diff | raw
2016-05-17 Merge branch 'bn/config-doc-tt-varnames' blob | diff | raw
2016-05-17 Merge branch 'va/i18n-misc-updates' blob | diff | raw
2016-05-17 Merge branch 'sb/z-is-gnutar-ism' blob | diff | raw
2016-05-17 Merge branch 'lp/typofixes' blob | diff | raw
2016-05-17 Merge branch 'sb/submodule-deinit-all' blob | diff | raw
2016-05-17 Merge branch 'jc/config-pathname-type' blob | diff | raw
2016-05-17 Merge branch 'bn/http-cookiefile-config' blob | diff | raw
2016-05-17 Merge branch 'ab/hooks' blob | diff | raw
2016-05-17 Merge branch 'sb/submodule-init' blob | diff | raw
2016-05-13 Merge branch 'sb/submodule-module-list-pathspec-fix' blob | diff | raw
2016-05-13 Merge branch 'jc/commit-tree-ignore-commit-gpgsign' blob | diff | raw
2016-05-10 Merge branch 'sk/gitweb-highlight-encoding' blob | diff | raw
2016-05-10 Merge branch 'sb/clean-test-fix' blob | diff | raw
2016-05-10 Merge branch 'rn/glossary-typofix' blob | diff | raw
2016-05-10 Merge branch 'ls/travis-submitting-patches' blob | diff | raw
2016-05-10 Merge branch 'js/close-packs-before-gc' blob | diff | raw
2016-05-10 Merge branch 'ew/normal-to-e' blob | diff | raw
2016-05-10 Merge branch 'ls/p4-lfs' blob | diff | raw
2016-05-10 Merge branch 'sb/misc-cleanups' blob | diff | raw
2016-05-10 Merge branch 'ew/doc-split-pack-disables-bitmap' blob | diff | raw
2016-05-06 Sync with maint blob | diff | raw
2016-05-06 Merge branch 'jk/diff-compact-heuristic' blob | diff | raw
2016-05-06 Merge branch 'ls/p4-lfs-test-fix-2.7.0' blob | diff | raw
2016-05-06 Merge branch 'bc/object-id' blob | diff | raw
2016-05-06 Merge branch 'bw/rebase-merge-entire-branch' blob | diff | raw
2016-05-06 Merge branch 'jc/drop-git-spec-in' blob | diff | raw
2016-05-06 Merge branch 'js/http-custom-headers' blob | diff | raw
2016-05-06 Merge branch 'sb/clone-shallow-passthru' blob | diff | raw
2016-05-06 Merge branch 'ld/p4-test-py3' blob | diff | raw
2016-05-06 Merge branch 'sb/config-exit-status-list' blob | diff | raw
2016-05-03 Sync with maint blob | diff | raw
2016-05-03 Merge branch 'nf/mergetool-prompt' blob | diff | raw
2016-05-03 Merge branch 'jd/send-email-to-whom' blob | diff | raw
2016-05-03 Merge branch 'rt/string-list-lookup-cleanup' blob | diff | raw
2016-05-03 Merge branch 'jk/fix-attribute-macro-in-2.5' blob | diff | raw
2016-05-03 Merge branch 'sg/test-lib-simplify-expr-away' blob | diff | raw
2016-05-03 Merge branch 'nd/remove-unused' blob | diff | raw
2016-05-03 Merge branch 'js/name-rev-use-oldest-ref' blob | diff | raw
2016-05-03 Merge branch 'jd/p4-jobs-in-commit' blob | diff | raw
2016-05-03 Merge branch 'en/merge-fixes' blob | diff | raw
2016-05-02 Sync with maint blob | diff | raw
2016-04-29 Sync with 2.8.2 blob | diff | raw
2016-04-29 Merge branch 'st/verify-tag' blob | diff | raw
2016-04-29 Merge branch 'js/win32-mmap' blob | diff | raw
2016-04-29 Merge branch 'jc/merge-refuse-new-root' blob | diff | raw
2016-04-21 pull: pass --allow-unrelated-histories to "git merge" blob | diff | raw
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n' blob | diff | raw | diff to current
2016-02-22 Merge branch 'jk/config-include' blob | diff | raw | diff to current
2015-12-21 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule... blob | diff | raw | diff to current
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule... blob | diff | raw | diff to current
2015-10-30 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into... blob | diff | raw | diff to current
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix' blob | diff | raw | diff to current
2015-09-17 Merge branch 'as/config-doc-markup-fix' blob | diff | raw | diff to current
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into... blob | diff | raw | diff to current
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint blob | diff | raw | diff to current
2015-09-14 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2015-09-14 Merge branch 'mp/t7060-diff-index-test' blob | diff | raw | diff to current
2015-09-14 Merge branch 'gb/apply-comment-typofix' blob | diff | raw | diff to current
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint blob | diff | raw | diff to current
2015-09-04 Merge branch 'sg/t3020-typofix' into maint blob | diff | raw | diff to current
2015-09-02 Merge branch 'ee/clean-test-fixes' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/submodule-typofix-in-error' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/reflog-typofix-in-error' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/read-tree-usage-string' blob | diff | raw | diff to current
2015-09-01 Merge branch 'ah/pack-objects-usage-strings' blob | diff | raw | diff to current
2015-09-01 Merge branch 'br/svn-doc-include-paths-config' blob | diff | raw | diff to current
2015-08-26 Merge branch 'sg/t3020-typofix' blob | diff | raw | diff to current
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add... blob | diff | raw | diff to current
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add' blob | diff | raw | diff to current
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator... blob | diff | raw | diff to current
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint blob | diff | raw | diff to current
2015-07-01 Merge branch 'jc/prompt-document-ps1-state-separator' blob | diff | raw | diff to current
2015-06-24 Merge branch 'fk/doc-format-patch-vn' blob | diff | raw | diff to current
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint blob | diff | raw | diff to current
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint blob | diff | raw | diff to current
2015-06-01 Merge branch 'mc/commit-doc-grammofix' blob | diff | raw | diff to current
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into... blob | diff | raw | diff to current
2015-05-19 Merge branch 'jc/gitignore-precedence' blob | diff | raw | diff to current
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into... blob | diff | raw | diff to current
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long' blob | diff | raw | diff to current
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report' blob | diff | raw | diff to current
2015-04-28 Merge branch 'mg/show-notes-doc' blob | diff | raw | diff to current
next