projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'jk/rebase-no-autostash' into maint
[git] / Documentation / git-merge.txt
2015-12-08  Junio C HamanoMerge branch 'jk/rebase-no-autostash' into maint blob | commitdiff | raw
2015-12-04  Junio C HamanoMerge branch 'da/difftool' into maint blob | commitdiff | raw
2015-12-04  Junio C HamanoMerge branch 'dk/gc-idx-wo-pack' into maint blob | commitdiff | raw
2015-12-01  Jeff KingMerge branch 'ld/p4-detached-head' into maint blob | commitdiff | raw
2015-12-01  Jeff KingMerge branch 'pt/http-socks-proxy' into maint blob | commitdiff | raw
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a... blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'rs/daemon-plug-child-leak' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'rs/wt-status-detached-branch-fix' into... blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule... blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'js/misc-fixes' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'jk/delete-modechange-conflict' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'js/imap-send-curl-compilation-fix' into... blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'rp/link-curl-before-ssl' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'nd/clone-linked-checkout' into maint blob | commitdiff | raw
2015-11-05  Junio C HamanoMerge branch 'sa/send-email-smtp-batch-data-limit'... blob | commitdiff | raw
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint blob | commitdiff | raw
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-markup' into maint blob | commitdiff | raw
2015-11-04  Junio C HamanoMerge branch 'jc/everyday-markup' into maint blob | commitdiff | raw
2015-11-04  Junio C HamanoMerge branch 'jc/em-dash-in-doc' into maint blob | commitdiff | raw
2015-11-04  Junio C HamanoMerge branch 'es/worktree-add' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'mk/blame-error-message' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'jk/merge-file-exit-code' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'dt/name-hash-dir-entry-fix' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'jc/am-3-fallback-regression-fix' into... blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'rt/placeholder-in-usage' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'dt/t7063-fix-flaky-test' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'mk/submodule-gitdir-path' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'nd/gc-auto-background-fix' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'ls/p4-translation-failure' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'js/clone-dissociate' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'ld/p4-import-labels' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'tk/stripspace' into maint blob | commitdiff | raw
2015-11-03  Junio C HamanoMerge branch 'jk/repository-extension' into maint blob | commitdiff | raw
2015-10-20  Junio C HamanoMerge branch 'js/gc-with-stale-symref' into maint blob | commitdiff | raw
2015-10-20  Junio C HamanoMerge branch 'rd/test-path-utils' into maint blob | commitdiff | raw
2015-10-20  Junio C HamanoMerge branch 'jc/doc-gc-prune-now' into maint blob | commitdiff | raw
2015-10-20  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete... blob | commitdiff | raw
2015-10-19  Junio C HamanoMerge branch 'maint' of git://github.com/git-l10n/git... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'cc/quote-comments' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'es/worktree-add-cleanup' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo' into... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'tk/typofix-connect-unknown-proto-error... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'nd/ls-remote-does-not-have-u-option'... blob | commitdiff | raw
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
next
Unnamed repository; edit this file 'description' to name the repository.