projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'jc/fsck-dropped-errors' into maint
[git] / Documentation / git-merge.txt
2015-10-16  Junio C HamanoMerge branch 'jc/fsck-dropped-errors' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'sb/perf-without-installed-git' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'js/icase-wt-detection' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'pt/am-builtin' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'mm/detach-at-HEAD-reflog' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'dt/log-follow-config' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'ti/glibc-stdio-mutex-from-signal-handler... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/notes-dwim-doc' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/connect-clear-env' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/blame-first-parent' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'mm/keyid-docs' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'pt/pull-builtin' into maint blob | commitdiff | raw | diff to current
2015-09-29  Junio C HamanoSync with v2.5.4 blob | commitdiff | raw | diff to current
2015-09-28  Junio C HamanoSync with 2.4.10 blob | commitdiff | raw | diff to current
2015-09-28  Junio C HamanoSync with 2.3.10 blob | commitdiff | raw | diff to current
2015-09-21  Junio C HamanoMerge branch 'rj/mailmap-ramsay' blob | commitdiff | raw | diff to current
2015-09-21  Junio C HamanoMerge branch 'bn/send-email-smtp-auth-error-message... blob | commitdiff | raw | diff to current
2015-09-21  Junio C HamanoMerge tag 'l10n-2.6.0-rnd2+de' of git://github.com... blob | commitdiff | raw | diff to current
2015-09-21  Matthieu MoyDocumentation: explain optional arguments better blob | commitdiff | raw | diff to current
2015-09-21  Matthieu MoyDocumentation: use 'keyid' consistently, not 'key-id' blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoSync with 2.5.3 blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'po/doc-branch-desc' blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix' blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into... blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint blob | commitdiff | raw | diff to current
2015-09-17  Junio C HamanoMerge branch 'js/maint-am-skip-performance-regression... blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'js/maint-am-skip-performance-regression' blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'sg/help-group' blob | commitdiff | raw | diff to current
2015-09-14  Philip Oakleydoc: show usage of branch description blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test' blob | commitdiff | raw | diff to current
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix' blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoSync with 2.4.9 blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoSync with 2.3.9 blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'rs/archive-zip-many' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'jc/calloc-pathspec' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'sg/wt-status-header-inclusion' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable'... blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings... blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into... blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'sg/help-group' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into... blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno' into maint blob | commitdiff | raw | diff to current
2015-09-04  Junio C HamanoMerge branch 'mh/get-remote-group-fix' into maint blob | commitdiff | raw | diff to current
2015-09-02  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' blob | commitdiff | raw | diff to current
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'rs/archive-zip-many' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings' blob | commitdiff | raw | diff to current
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' blob | commitdiff | raw | diff to current
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains' blob | commitdiff | raw | diff to current
2015-08-31  Junio C HamanoMerge branch 'db/push-sign-if-asked' blob | commitdiff | raw | diff to current
2015-08-31  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings' blob | commitdiff | raw | diff to current
2015-08-28  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'sg/help-group' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'sg/wt-status-header-inclusion' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix' blob | commitdiff | raw | diff to current
2015-08-26  Junio C HamanoMerge branch 'jc/calloc-pathspec' blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'jk/guess-repo-name-regression-fix' into... blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'jk/test-with-x' into maint blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'sb/check-return-from-read-ref' into maint blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno' blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'dt/notes-multiple' blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' blob | commitdiff | raw | diff to current
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'ps/guess-repo-name-at-root' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jk/guess-repo-name-regression-fix' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jk/test-with-x' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'sb/check-return-from-read-ref' blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'ta/docfix-index-format-tech' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add... blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'kn/tag-doc-fix' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'cb/uname-in-untracked' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'db/send-pack-user-signingkey' into maint blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head... blob | commitdiff | raw | diff to current
2015-08-19  Junio C HamanoMerge branch 'da/subtree-date-confusion' into maint blob | commitdiff | raw | diff to current
2015-08-17  Junio C HamanoMerge branch 'ta/docfix-index-format-tech' blob | commitdiff | raw | diff to current
2015-08-17  Junio C HamanoMerge branch 'mh/get-remote-group-fix' blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add' blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'dt/unpack-trees-cache-tree-revalidate' blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'dt/reflog-tests' blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add-cleanup' blob | commitdiff | raw | diff to current
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' blob | commitdiff | raw | diff to current
2015-08-03  Junio C HamanoMerge branch 'jk/refspec-parse-wildcard' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.