Andrew's git - gitweb.git/history - Documentation/merge-options.txt

[gitweb.git] / Documentation / merge-options.txt

2014-03-31	Merge branch 'wt/doc-submodule-name-path-confusion-2'	blob \| diff \| raw
2014-03-31	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| diff \| raw
2014-03-31	Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'	blob \| diff \| raw
2014-03-28	Merge branch 'jk/pack-bitmap'	blob \| diff \| raw
2014-03-25	Merge branch 'dm/configure-iconv-locale-charset'	blob \| diff \| raw
2014-03-25	Merge branch 'jk/warn-on-object-refname-ambiguity'	blob \| diff \| raw
2014-03-25	Merge branch 'mh/remove-subtree-long-pathname-fix'	blob \| diff \| raw
2014-03-25	Merge branch 'nd/indent-fix-connect-c'	blob \| diff \| raw
2014-03-25	Merge branch 'cp/am-patch-format-doc'	blob \| diff \| raw
2014-03-21	Merge branch 'lt/request-pull'	blob \| diff \| raw
2014-03-21	Merge branch 'es/sh-i18n-envsubst'	blob \| diff \| raw
2014-03-21	Merge branch 'jc/stash-pop-not-popped'	blob \| diff \| raw
2014-03-18	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'tr/diff-submodule-no-reuse-worktree'...	blob \| diff \| raw
2014-03-18	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| diff \| raw
2014-03-18	Merge branch 'bk/refresh-missing-ok-in-merge-recursive...	blob \| diff \| raw
2014-03-18	Merge branch 'ds/rev-parse-required-args' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'jk/config-path-include-fix' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'nd/diff-quiet-stat-dirty' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'mh/simplify-cache-tree-find'	blob \| diff \| raw
2014-03-18	Merge branch 'jn/branch-lift-unnecessary-name-length...	blob \| diff \| raw
2014-03-18	Merge branch 'jk/repack-pack-keep-objects'	blob \| diff \| raw
2014-03-18	Merge branch 'fc/transport-helper-fixes'	blob \| diff \| raw
2014-03-18	Merge branch 'nd/sha1-file-delta-stack-leakage-fix'	blob \| diff \| raw
2014-03-18	Merge branch 'jk/diff-filespec-cleanup'	blob \| diff \| raw
2014-03-14	Merge branch 'sh/write-pack-file-warning-message-fix'	blob \| diff \| raw
2014-03-14	Merge branch 'jl/doc-submodule-update-checkout'	blob \| diff \| raw
2014-03-14	Merge branch 'jk/commit-dates-parsing-fix'	blob \| diff \| raw
2014-03-14	Merge branch 'jh/note-trees-record-blobs'	blob \| diff \| raw
2014-03-14	Merge branch 'tr/diff-submodule-no-reuse-worktree'	blob \| diff \| raw
2014-03-14	Merge branch 'ss/completion-rec-sub-fetch-push'	blob \| diff \| raw
2014-03-14	Merge branch 'jc/check-attr-honor-working-tree'	blob \| diff \| raw
2014-03-07	Merge branch 'cc/starts-n-ends-with-endgame'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| diff \| raw
2014-03-07	Merge branch 'gj/push-more-verbose-advice'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/core-checkstat-2.0'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/add-2.0-ignore-removal'	blob \| diff \| raw
2014-03-07	Merge branch 'jn/add-2.0-u-A-sans-pathspec'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/push-2.0-default-to-simple'	blob \| diff \| raw
2014-03-05	Merge branch 'nd/daemonize-gc'	blob \| diff \| raw
2014-03-03	Merge branch 'sh/write-pack-file-warning-message-fix...	blob \| diff \| raw
2014-02-27	Merge branch 'jk/pack-bitmap'	blob \| diff \| raw
2014-02-27	Merge branch 'dk/blame-janitorial'	blob \| diff \| raw
2014-02-27	Merge branch 'mw/symlinks'	blob \| diff \| raw
2014-02-27	Merge branch 'nd/test-rename-reset'	blob \| diff \| raw
2014-02-27	Merge branch 'wk/submodule-on-branch'	blob \| diff \| raw
2014-02-27	Merge branch 'ep/varscope'	blob \| diff \| raw
2014-02-27	Merge branch 'bs/stdio-undef-before-redef'	blob \| diff \| raw
2014-02-27	Merge branch 'jk/config-path-include-fix'	blob \| diff \| raw
2014-02-27	Merge branch 'ds/rev-parse-required-args'	blob \| diff \| raw
2014-02-27	Merge branch 'nd/diff-quiet-stat-dirty'	blob \| diff \| raw
2014-02-27	Merge branch 'bk/refresh-missing-ok-in-merge-recursive'	blob \| diff \| raw
2014-02-27	Merge branch 'da/pull-ff-configuration'	blob \| diff \| raw
2014-02-27	Merge branch 'kb/fast-hashmap'	blob \| diff \| raw
2014-02-27	Merge branch 'nv/commit-gpgsign-config'	blob \| diff \| raw
2014-02-13	Merge branch 'bm/merge-base-octopus-dedup' into maint	blob \| diff \| raw
2014-02-13	Merge branch 'jc/revision-range-unpeel' into maint	blob \| diff \| raw
2014-02-13	Merge branch 'jk/allow-fetch-onelevel-refname' into...	blob \| diff \| raw
2014-02-13	Merge branch 'jk/interpret-branch-name-fix' into maint	blob \| diff \| raw
2014-02-13	Merge branch 'rk/send-email-ssl-cert' into maint	blob \| diff \| raw
2014-02-13	Merge branch 'sb/repack-in-c' into maint	blob \| diff \| raw
2014-02-13	Merge branch 'as/tree-walk-fix-aggressive-short-cut...	blob \| diff \| raw
2014-02-07	Merge branch 'aj/ada-diff-word-pattern'	blob \| diff \| raw
2014-02-07	Merge branch 'nd/tag-doc'	blob \| diff \| raw
2014-02-05	Merge branch 'jc/maint-pull-docfix' into maint	blob \| diff \| raw
2014-02-05	Merge branch 'tb/repack-fix-renames' (early part)	blob \| diff \| raw
2014-01-31	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw
2014-01-31	Merge branch 'jn/pager-lv-default-env'	blob \| diff \| raw
2014-01-27	Merge branch 'as/tree-walk-fix-aggressive-short-cut'	blob \| diff \| raw
2014-01-27	Merge branch 'ta/doc-http-protocol-in-html'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/doc-wo-names'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/revision-o-is-in-libgit-a'	blob \| diff \| raw
2014-01-27	Merge branch 'sb/repack-in-c'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/test-fixes'	blob \| diff \| raw
2014-01-27	Merge branch 'nd/negative-pathspec'	blob \| diff \| raw
2014-01-27	Merge branch 'pw/git-p4'	blob \| diff \| raw
2014-01-27	Merge branch 'ss/safe-create-leading-dir-with-slash'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/safe-create-leading-directories'	blob \| diff \| raw
2014-01-27	Merge branch 'tr/nth-previous-is-a-commit'	blob \| diff \| raw
2014-01-27	Merge branch 'tr/gitk-doc-range-trace'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/mark-edges-uninteresting'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/diff-filespec-cleanup'	blob \| diff \| raw
2014-01-27	Merge branch 'ef/mingw-write'	blob \| diff \| raw
2014-01-27	Merge branch 'rk/send-email-ssl-cert'	blob \| diff \| raw
2014-01-27	Merge branch 'jn/ignore-doc'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/interpret-branch-name-fix'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/allow-fetch-onelevel-refname'	blob \| diff \| raw
2014-01-27	Merge branch 'jc/revision-range-unpeel'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/retire-ref-fetch-rules'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/attr-macro-doc'	blob \| diff \| raw
2014-01-27	Merge branch 'jc/maint-pull-docfix'	blob \| diff \| raw
2014-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-01-21	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2014-01-14	Documentation: "git pull" does not have the "-m" option	blob \| diff \| raw \| diff to current
2014-01-14	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| diff \| raw \| diff to current
2014-01-13	Merge branch 'jk/t5531-prepare-to-default-to-non-matching'	blob \| diff \| raw \| diff to current
2013-12-17	Merge branch 'jk/two-way-merge-corner-case-fix' into...	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-12-05	Merge branch 'jk/two-way-merge-corner-case-fix'	blob \| diff \| raw \| diff to current
next