git.oblomov.eu Git - git/history - Documentation/merge-options.txt

[git] / Documentation / merge-options.txt

2014-07-22	Junio C Hamano	Merge branch 'maint-1.8.5' into maint-1.9	blob \| commitdiff \| raw
2014-07-16	Junio C Hamano	Merge branch 'maint-1.8.5' into maint-1.9	blob \| commitdiff \| raw
2014-05-28	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...	blob \| commitdiff \| raw
2014-05-28	Junio C Hamano	Merge branch 'mw/symlinks' into maint	blob \| commitdiff \| raw
2014-05-08	Junio C Hamano	Merge branch 'cl/p4-use-diff-tree' into maint	blob \| commitdiff \| raw
2014-05-08	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...	blob \| commitdiff \| raw
2014-05-08	Junio C Hamano	Merge branch 'tb/unicode-6.3-zero-width' into maint	blob \| commitdiff \| raw
2014-05-08	Junio C Hamano	Merge branch 'km/avoid-bs-in-shell-glob' into maint	blob \| commitdiff \| raw
2014-05-08	Junio C Hamano	Merge branch 'km/avoid-cp-a' into maint	blob \| commitdiff \| raw
2014-04-09	Junio C Hamano	Merge branch 'jl/nor-or-nand-and' into maint	blob \| commitdiff \| raw
2014-04-09	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-04-09	Junio C Hamano	Merge commit 'doc/http-backend: missing accent grave...	blob \| commitdiff \| raw \| diff to current
2014-04-03	Junio C Hamano	Merge branch 'mh/remove-subtree-long-pathname-fix'...	blob \| commitdiff \| raw \| diff to current
2014-04-03	Junio C Hamano	Merge branch 'jc/stash-pop-not-popped' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-31	Justin Lebar	Documentation: fix misuses of "nor"	blob \| commitdiff \| raw
2014-03-18	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'tr/diff-submodule-no-reuse-worktree'...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'bk/refresh-missing-ok-in-merge-recursive...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'ds/rev-parse-required-args' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/config-path-include-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'nd/diff-quiet-stat-dirty' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'bm/merge-base-octopus-dedup' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jk/allow-fetch-onelevel-refname' into...	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jk/interpret-branch-name-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'rk/send-email-ssl-cert' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'sb/repack-in-c' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'as/tree-walk-fix-aggressive-short-cut...	blob \| commitdiff \| raw \| diff to current
2014-02-07	Junio C Hamano	Merge branch 'aj/ada-diff-word-pattern'	blob \| commitdiff \| raw \| diff to current
2014-02-07	Junio C Hamano	Merge branch 'nd/tag-doc'	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'jc/maint-pull-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'tb/repack-fix-renames' (early part)	blob \| commitdiff \| raw \| diff to current
2014-01-31	Junio C Hamano	Merge git://github.com/git-l10n/git-po	blob \| commitdiff \| raw \| diff to current
2014-01-31	Junio C Hamano	Merge branch 'jn/pager-lv-default-env'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'as/tree-walk-fix-aggressive-short-cut'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'ta/doc-http-protocol-in-html'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'mh/doc-wo-names'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/revision-o-is-in-libgit-a'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'sb/repack-in-c'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/test-fixes'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'nd/negative-pathspec'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'pw/git-p4'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'ss/safe-create-leading-dir-with-slash'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'mh/safe-create-leading-directories'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'tr/nth-previous-is-a-commit'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'tr/gitk-doc-range-trace'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/mark-edges-uninteresting'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/diff-filespec-cleanup'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'ef/mingw-write'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'rk/send-email-ssl-cert'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jn/ignore-doc'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/interpret-branch-name-fix'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jk/allow-fetch-onelevel-refname'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'mh/retire-ref-fetch-rules'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'mh/attr-macro-doc'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jc/maint-pull-docfix'	blob \| commitdiff \| raw \| diff to current
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2014-01-14	Junio C Hamano	Documentation: "git pull" does not have the "-m" option	blob \| commitdiff \| raw \| diff to current
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| raw \| diff to current
2014-01-13	Junio C Hamano	Merge branch 'jk/t5531-prepare-to-default-to-non-matching'	blob \| commitdiff \| raw \| diff to current
2013-12-17	Junio C Hamano	Merge branch 'jk/two-way-merge-corner-case-fix' into...	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-12-05	Junio C Hamano	Merge branch 'jk/two-way-merge-corner-case-fix'	blob \| commitdiff \| raw \| diff to current
2013-12-05	Junio C Hamano	Merge branch 'jk/replace-perl-in-built-scripts'	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'hn/log-graph-color-octopus' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw \| diff to current
2013-11-04	Junio C Hamano	Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'nd/gc-lock-against-each-other'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'hn/log-graph-color-octopus'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'sg/t3600-nul-sha1-fix'	blob \| commitdiff \| raw \| diff to current
2013-10-28	Junio C Hamano	Merge branch 'ew/keepalive'	blob \| commitdiff \| raw \| diff to current
2013-10-28	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| raw \| diff to current
2013-10-28	Junio C Hamano	Merge branch 'jx/relative-path-regression-fix'	blob \| commitdiff \| raw \| diff to current
2013-10-28	Junio C Hamano	Merge branch 'jk/shortlog-tolerate-broken-commit' into...	blob \| commitdiff \| raw \| diff to current
2013-10-28	Junio C Hamano	Merge branch 'jk/diff-algo' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'jc/ls-files-killed-optim' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'jh/checkout-auto-tracking' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'mg/more-textconv'	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'jc/pack-objects'	blob \| commitdiff \| raw \| diff to current
2013-10-18	Junio C Hamano	Merge branch 'jc/reflog-doc'	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'jk/upload-pack-keepalive' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'bc/http-backend-allow-405' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'rj/highlight-test-hang'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'nv/doc-config-signingkey'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'nd/clone-local-with-colon'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'jx/clean-interactive'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'jk/diff-algo'	blob \| commitdiff \| raw \| diff to current
2013-10-08	Jonathan Nieder	Merge branch 'tz/credential-netrc'	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'mm/rebase-continue-freebsd-WB' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'km/svn-1.8-serf-only' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'js/xread-in-full' into maint	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom