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

2014-06-06	Junio C Hamano	Merge branch 'tb/unicode-6.3-zero-width'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jk/index-pack-report-missing'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'bc/blame-crlf-test'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'sk/submodules-absolute-path-on-windows'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'dk/blame-reorg'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'wg/svn-fe-style-fixes'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jn/contrib-remove-vim'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jn/contrib-remove-diffall'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'dt/merge-recursive-case-insensitive'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'rs/reflog-exists'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'tg/tag-state-tag-name-in-editor-hints'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jk/grep-tell-run-command-to-cd-when-runni...	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'fc/status-printf-squelch-format-zero...	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jk/squelch-compiler-warning-from-funny...	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'dk/raise-core-deltabasecachelimit'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'tl/relax-in-poll-emulation'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jk/utf8-switch-between-nfd-and-nfc'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'da/imap-send-use-credential-helper'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'je/pager-do-not-recurse'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'jk/commit-C-pick-empty'	blob \| commitdiff \| raw
2014-06-06	Junio C Hamano	Merge branch 'mm/pager-less-sans-S'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'sk/msvc-dynlink-crt'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'ew/config-protect-mode'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'bg/strbuf-trim'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'jk/commit-date-approxidate'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'ep/shell-command-substitution'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'fc/rerere-conflict-style'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'dt/api-doc-setup-gently'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'fc/mergetool-prompt'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'mm/mediawiki-encoding-fix'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'sk/tag-contains-wo-recursion'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'ef/send-email-absolute-path-to-the-command'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'jx/blame-align-relative-time'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'lr/git-run-setup-gently'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'fc/mergetools-vimdiff3'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'fc/merge-default-to-upstream'	blob \| commitdiff \| raw
2014-06-03	Junio C Hamano	Merge branch 'jk/external-diff-use-argv-array'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'sk/svn-parse-datestamp'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'nd/index-pack-one-fd-per-thread'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'ym/fix-opportunistic-index-update-race'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'mh/ref-transaction'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'ks/tree-diff-nway'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'jc/apply-ignore-whitespace'	blob \| commitdiff \| raw \| diff to current
2014-06-03	Junio C Hamano	Merge branch 'as/grep-fullname-config'	blob \| commitdiff \| raw \| diff to current
2014-05-30	Junio C Hamano	Sync with 1.9.4	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'lt/request-pull'	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'kb/fast-hashmap'	blob \| commitdiff \| raw \| diff to current
2014-05-09	Junio C Hamano	Sync with 1.9.3	blob \| commitdiff \| raw \| diff to current
2014-05-08	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw \| diff to current
2014-05-07	Junio C Hamano	Merge branch 'cl/p4-use-diff-tree'	blob \| commitdiff \| raw \| diff to current
2014-05-02	Junio C Hamano	Merge branch 'mw/symlinks'	blob \| commitdiff \| raw \| diff to current
2014-05-02	Junio C Hamano	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'	blob \| commitdiff \| raw \| diff to current
2014-04-28	Junio C Hamano	Merge branch 'jk/external-diff-use-argv-array' (early...	blob \| commitdiff \| raw \| diff to current
2014-04-24	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw \| diff to current
2014-04-22	Felipe Contreras	merge: enable defaulttoupstream by default	blob \| commitdiff \| raw
2014-04-21	Junio C Hamano	Merge branch 'km/avoid-non-function-return-in-rebase'	blob \| commitdiff \| raw \| diff to current
2014-04-21	Junio C Hamano	Merge branch 'ep/shell-command-substitution'	blob \| commitdiff \| raw \| diff to current
2014-04-18	Junio C Hamano	Merge branch 'jk/config-die-bad-number-noreturn'	blob \| commitdiff \| raw \| diff to current
2014-04-18	Junio C Hamano	Merge branch 'fc/remote-helper-fixes'	blob \| commitdiff \| raw \| diff to current
2014-04-16	Junio C Hamano	Merge branch 'mh/multimail'	blob \| commitdiff \| raw \| diff to current
2014-04-16	Junio C Hamano	Merge branch 'tb/unicode-6.3-zero-width'	blob \| commitdiff \| raw \| diff to current
2014-04-16	Junio C Hamano	Merge branch 'km/avoid-cp-a'	blob \| commitdiff \| raw \| diff to current
2014-04-16	Junio C Hamano	Merge branch 'km/avoid-bs-in-shell-glob'	blob \| commitdiff \| raw \| diff to current
2014-04-09	Junio C Hamano	Sync with 1.9.2	blob \| commitdiff \| raw \| diff to current
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 \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jk/pack-bitmap'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jl/nor-or-nand-and'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'mh/update-ref-batch-create-fix'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'mr/opt-set-ptr'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'ib/rev-parse-parseopt-argh'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'mr/msvc-link-with-invalidcontinue'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jc/rev-parse-argh-dashed-multi-words'	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	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-24	Junio C Hamano	parse-options: multi-word argh should use dash to separ...	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 'jc/check-attr-honor-working-tree' into...	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/sha1-file-delta-stack-leakage-fix'	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 'jc/check-attr-honor-working-tree'	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 '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-02-27	Junio C Hamano	Merge branch 'bs/stdio-undef-before-redef'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'jk/config-path-include-fix'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'kb/fast-hashmap'	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 'sb/repack-in-c' into maint	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-27	Junio C Hamano	Merge branch 'sb/repack-in-c'	blob \| commitdiff \| raw \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom