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

[git] / Documentation / merge-options.txt

2014-07-02	Junio C Hamano	Merge branch 'maint-1.8.5' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'na/no-http-test-in-the-middle' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jl/status-added-submodule-is-never-ignore...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'ym/fix-opportunistic-index-update-race...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'mk/show-s-no-extra-blank-line-for-merges...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'rr/rebase-autostash-fix' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jc/shortlog-ref-exclude' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'fc/rerere-conflict-style' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'rs/mailinfo-header-cmp' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'nd/index-pack-one-fd-per-thread' into...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'sk/spawn-less-case-insensitively-from...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'nd/daemonize-gc' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jk/diff-follow-must-take-one-pathspec...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jk/diff-files-assume-unchanged' into...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jk/commit-C-pick-empty' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'bc/blame-crlf-test' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jc/apply-ignore-whitespace' into maint	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jc/revision-dash-count-parsing' into...	blob \| commitdiff \| raw
2014-06-25	Junio C Hamano	Merge branch 'jk/report-fail-to-read-objects-better...	blob \| commitdiff \| raw
2014-06-12	Junio C Hamano	Merge branch 'jc/rev-parse-argh-dashed-multi-words...	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-19	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'	blob \| commitdiff \| raw
2014-05-19	Junio C Hamano	Merge branch 'lt/request-pull'	blob \| commitdiff \| raw
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw
2014-05-19	Junio C Hamano	Merge branch 'kb/fast-hashmap'	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-05-07	Junio C Hamano	Merge branch 'cl/p4-use-diff-tree'	blob \| commitdiff \| raw
2014-05-02	Junio C Hamano	Merge branch 'mw/symlinks'	blob \| commitdiff \| raw
2014-05-02	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'	blob \| commitdiff \| raw
2014-04-24	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw
2014-04-21	Junio C Hamano	Merge branch 'ep/shell-command-substitution'	blob \| commitdiff \| raw
2014-04-18	Junio C Hamano	Merge branch 'jk/config-die-bad-number-noreturn'	blob \| commitdiff \| raw
2014-04-16	Junio C Hamano	Merge branch 'mh/multimail'	blob \| commitdiff \| raw
2014-04-16	Junio C Hamano	Merge branch 'tb/unicode-6.3-zero-width'	blob \| commitdiff \| raw
2014-04-16	Junio C Hamano	Merge branch 'km/avoid-cp-a'	blob \| commitdiff \| raw
2014-04-16	Junio C Hamano	Merge branch 'km/avoid-bs-in-shell-glob'	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-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2014-04-08	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw
2014-04-08	Junio C Hamano	Merge branch 'jl/nor-or-nand-and'	blob \| commitdiff \| raw
2014-04-08	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	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-04-03	Junio C Hamano	Merge branch 'nd/log-show-linear-break'	blob \| commitdiff \| raw \| diff to current
2014-04-02	Junio C Hamano	Merge branch 'ap/remote-hg-skip-null-bookmarks'	blob \| commitdiff \| raw \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'wt/doc-submodule-name-path-confusion-2'	blob \| commitdiff \| raw \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| commitdiff \| raw \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'	blob \| commitdiff \| raw \| diff to current
2014-03-31	Justin Lebar	Documentation: fix misuses of "nor"	blob \| commitdiff \| raw
2014-03-28	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'dm/configure-iconv-locale-charset'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'jk/warn-on-object-refname-ambiguity'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'mh/remove-subtree-long-pathname-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'nd/indent-fix-connect-c'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'cp/am-patch-format-doc'	blob \| commitdiff \| raw \| diff to current
2014-03-21	Junio C Hamano	Merge branch 'lt/request-pull'	blob \| commitdiff \| raw \| diff to current
2014-03-21	Junio C Hamano	Merge branch 'es/sh-i18n-envsubst'	blob \| commitdiff \| raw \| diff to current
2014-03-21	Junio C Hamano	Merge branch 'jc/stash-pop-not-popped'	blob \| commitdiff \| raw \| diff to current
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-03-18	Junio C Hamano	Merge branch 'mh/simplify-cache-tree-find'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jn/branch-lift-unnecessary-name-length...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/repack-pack-keep-objects'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'fc/transport-helper-fixes'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'nd/sha1-file-delta-stack-leakage-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/diff-filespec-cleanup'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'sh/write-pack-file-warning-message-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jl/doc-submodule-update-checkout'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jh/note-trees-record-blobs'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'tr/diff-submodule-no-reuse-worktree'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'ss/completion-rec-sub-fetch-push'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'cc/starts-n-ends-with-endgame'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'gj/push-more-verbose-advice'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/core-checkstat-2.0'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/add-2.0-ignore-removal'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jn/add-2.0-u-A-sans-pathspec'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/push-2.0-default-to-simple'	blob \| commitdiff \| raw \| diff to current
2014-03-05	Junio C Hamano	Merge branch 'nd/daemonize-gc'	blob \| commitdiff \| raw \| diff to current
2014-03-03	Junio C Hamano	Merge branch 'sh/write-pack-file-warning-message-fix...	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'dk/blame-janitorial'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'mw/symlinks'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'nd/test-rename-reset'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'wk/submodule-on-branch'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'ep/varscope'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom