git.oblomov.eu Git - git/history - Documentation/howto/using-merge-subtree.txt

[git] / Documentation / howto / using-merge-subtree.txt

2012-04-27	Junio C Hamano	Merge branch 'jc/merge-reduce-parents-early'	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'rl/maint-stash-i18n-save-error'	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'mb/fetch-call-a-non-branch-a-ref'	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jm/maint-strncpy-diff-no-index'	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jk/run-command-eacces' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jc/push-upstream-sanity' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jc/maint-clean-nested-worktree-in-subdir...	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jk/diff-no-rename-empty' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jc/commit-unedited-template' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jk/add-p-skip-conflicts' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jc/commit-hook-authorship' into maint	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'tr/maint-word-diff-regex-sticky' into...	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'jh/notes-merge-in-git-dir-worktree' into...	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Sync with 1.7.9.7	blob \| commitdiff \| raw
2012-04-24	Junio C Hamano	Merge branch 'cc/fix-missing-va-end-in-revert'	blob \| commitdiff \| raw
2012-04-24	Junio C Hamano	Merge branch 'it/fetch-pack-many-refs'	blob \| commitdiff \| raw
2012-04-24	Junio C Hamano	Merge branch 'pw/fast-import-dataref-parsing'	blob \| commitdiff \| raw
2012-04-24	Junio C Hamano	Merge branch 'hv/submodule-recurse-push'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'bw/test-fix-grep-gnuism'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'jl/maint-submodule-recurse-fetch'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'jc/maint-blame-minimal'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'lp/maint-diff-three-dash-with-graph'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'rs/commit-list-sort-in-batch'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'jh/apply-free-patch'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'jn/debian-customizes-default-editor'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'ms/remote-usage-string'	blob \| commitdiff \| raw
2012-04-23	Junio C Hamano	Merge branch 'jk/rebase-i-submodule-conflict-only'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'ct/advise-push-default'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'jk/run-command-eacces'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'jc/push-upstream-sanity'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'jc/am-report-3way'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'jb/am-include'	blob \| commitdiff \| raw
2012-04-20	Junio C Hamano	Merge branch 'jc/fmt-merge-msg-people'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jk/add-p-skip-conflicts'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jc/commit-unedited-template'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'wk/gitweb-snapshot-use-if-modified-since'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jk/http-backend-keep-committer-ident...	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'sl/autoconf'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jk/branch-quiet'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jk/diff-no-rename-empty'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jc/maint-clean-nested-worktree-in-subdir'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'rs/unpack-trees-leakfix'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'nl/rebase-i-cheat-sheet'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'da/difftool-test'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'zj/test-cred-helper-nicer-prove'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jh/notes-merge-in-git-dir-worktree'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'tr/maint-word-diff-regex-sticky'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jn/diffstat-tests'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jc/diff-algo-cleanup'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'jc/commit-hook-authorship'	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'nd/stream-more'	blob \| commitdiff \| raw
2012-04-10	Junio C Hamano	Merge branch 'maint-1.7.9' into maint	blob \| commitdiff \| raw
2012-04-10	David A. Greene	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| commitdiff \| raw
2012-04-02	Junio C Hamano	Merge branch 'pt/gitk'	blob \| commitdiff \| raw
2012-04-02	Junio C Hamano	Sync with 1.7.9.6	blob \| commitdiff \| raw
2012-03-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-03-28	Jim Meyering	correct spelling: an URL -> a URL	blob \| commitdiff \| raw
2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw \| diff to current
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw \| diff to current
2012-03-12	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header' into maint	blob \| commitdiff \| raw \| diff to current
2012-03-06	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header'	blob \| commitdiff \| raw \| diff to current
2012-02-27	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw \| diff to current
2012-02-16	Junio C Hamano	Merge branch 'mm/empty-loose-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-02-13	Junio C Hamano	Merge branch 'mm/empty-loose-error-message'	blob \| commitdiff \| raw \| diff to current
2012-01-29	Junio C Hamano	Merge branch 'rs/diff-postimage-in-context'	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'tr/doc-sh-setup' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'tr/doc-sh-setup'	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'tr/pty-all'	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init'	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| commitdiff \| raw \| diff to current
2011-12-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report'	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer'	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2011-12-05	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude'	blob \| commitdiff \| raw \| diff to current
2011-11-28	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into nd/ignore...	blob \| commitdiff \| raw \| diff to current
2011-11-23	Junio C Hamano	Merge branch 'maint' into tj/imap-send-remove-unused	blob \| commitdiff \| raw \| diff to current
2011-11-21	Junio C Hamano	Merge branch 'jk/maint-1.6.2-upload-archive' into jk...	blob \| commitdiff \| raw \| diff to current
2011-11-18	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint	blob \| commitdiff \| raw \| diff to current
2011-11-18	Junio C Hamano	Merge branch 'ml/mailmap' into maint	blob \| commitdiff \| raw \| diff to current
2011-11-12	Junio C Hamano	Merge branch 'ly/mktree-using-strbuf'	blob \| commitdiff \| raw \| diff to current
2011-11-10	Junio C Hamano	Merge 'build-in git-mktree'	blob \| commitdiff \| raw \| diff to current
2011-11-09	Junio C Hamano	Merge branch 'jc/remote-setbranches-usage-fix'	blob \| commitdiff \| raw \| diff to current
2011-11-09	Junio C Hamano	Merge branch 'fc/remote-seturl-usage-fix'	blob \| commitdiff \| raw \| diff to current
2011-11-09	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref' into maint	blob \| commitdiff \| raw \| diff to current
2011-11-08	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw \| diff to current
2011-11-01	Junio C Hamano	Merge branch 'md/smtp-tls-hello-again' into maint	blob \| commitdiff \| raw \| diff to current
2011-11-01	Junio C Hamano	Merge branch 'jk/pull-rebase-with-work-tree' into maint	blob \| commitdiff \| raw \| diff to current
2011-11-01	Junio C Hamano	Merge branch 'jc/maint-diffstat-numstat-context' into...	blob \| commitdiff \| raw \| diff to current
2011-11-01	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw \| diff to current
2011-11-01	Junio C Hamano	Merge branch 'nd/pretty-commit-log-message'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom