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

2011-05-06	Junio C Hamano	Merge branch 'nd/struct-pathspec'	blob \| commitdiff \| raw
2011-05-06	Junio C Hamano	Merge branch 'aw/maint-rebase-i-p-no-ff'	blob \| commitdiff \| raw
2011-05-05	Junio C Hamano	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'ss/doc-svn'	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'vr/merge-base-doc'	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'ss/cherry-pick-x-doc'	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jn/maint-format-patch-doc'	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jk/format-patch-multiline-header'	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jh/dirstat' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'sp/maint-clear-postfields' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jk/maint-stash-oob' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jk/maint-upload-pack-shallow' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'jc/pack-objects-bigfile' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'mg/reflog-with-options' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'ar/clean-rmdir-empty' into maint	blob \| commitdiff \| raw
2011-05-04	Junio C Hamano	Merge branch 'mg/sha1-path-advise' into maint	blob \| commitdiff \| raw
2011-05-02	Junio C Hamano	Merge branch 'jk/notes-ui-updates'	blob \| commitdiff \| raw
2011-05-02	Junio C Hamano	Merge branch 'nm/submodule-update-force'	blob \| commitdiff \| raw
2011-05-02	Junio C Hamano	Merge branch 'jh/notes-add-ui'	blob \| commitdiff \| raw
2011-05-02	Junio C Hamano	Merge branch 'nd/maint-setup'	blob \| commitdiff \| raw
2011-05-02	Junio C Hamano	Merge branch 'mz/maint-rename-unmerged'	blob \| commitdiff \| raw
2011-04-29	Junio C Hamano	Merge branch 'mg/x-years-12-months' into maint	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'jc/diff-irreversible-delete'	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'jc/rename-degrade-cc-to-c'	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'mz/rebase'	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'en/merge-recursive'	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'jh/dirstat'	blob \| commitdiff \| raw
2011-04-28	Junio C Hamano	Merge branch 'sp/maint-clear-postfields'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'mg/x-years-12-months'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'ef/maint-strbuf-init'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'rr/doc-content-type'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'jk/maint-upload-pack-shallow'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'jk/maint-stash-oob'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'jc/pack-objects-bigfile'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'mh/git-svn-automkdirs'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'mg/reflog-with-options'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'ar/clean-rmdir-empty'	blob \| commitdiff \| raw
2011-04-27	Junio C Hamano	Merge branch 'mg/sha1-path-advise'	blob \| commitdiff \| raw
2011-04-25	Junio C Hamano	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| commitdiff \| raw \| diff to current
2011-04-19	Junio C Hamano	Sync with 1.7.4.5	blob \| commitdiff \| raw
2011-04-15	Junio C Hamano	Merge v1.7.5-rc2 into jn/format-patch-doc	blob \| commitdiff \| raw
2011-04-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-04-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-04-12	Junio C Hamano	Merge branch 'js/checkout-untracked-symlink'	blob \| commitdiff \| raw
2011-04-12	Junio C Hamano	Merge branch 'nd/init-gitdir'	blob \| commitdiff \| raw
2011-04-11	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2011-04-06	Junio C Hamano	Sync with 1.7.4.4	blob \| commitdiff \| raw
2011-04-06	Junio C Hamano	Merge branch 'jk/maint-remote-mirror-safer'	blob \| commitdiff \| raw
2011-04-06	Junio C Hamano	Merge branch 'mg/doc-revisions-txt'	blob \| commitdiff \| raw
2011-04-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-04-04	Junio C Hamano	Merge branch 'jl/submodule-fetch-on-demand'	blob \| commitdiff \| raw
2011-04-04	Junio C Hamano	Merge branch 'jc/rev-list-options-fix'	blob \| commitdiff \| raw
2011-04-04	Junio C Hamano	Merge branch 'nm/maint-conflicted-submodule-entries'	blob \| commitdiff \| raw
2011-04-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2011-04-03	Junio C Hamano	Merge branch 'jc/index-update-if-able' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-03	Junio C Hamano	Merge branch 'jc/maint-rev-list-culled-boundary' into...	blob \| commitdiff \| raw \| diff to current
2011-04-03	Junio C Hamano	Sync with 1.7.4.3	blob \| commitdiff \| raw
2011-04-02	Junio C Hamano	Merge branch 'nd/init-gitdir'	blob \| commitdiff \| raw
2011-04-02	Junio C Hamano	Merge branch 'jc/merge-sans-branch'	blob \| commitdiff \| raw
2011-04-02	Junio C Hamano	Merge branch 'ab/i18n-st'	blob \| commitdiff \| raw \| diff to current
2011-04-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-04-01	Junio C Hamano	Merge branch 'nd/index-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-01	Junio C Hamano	Merge branch 'jc/maint-diff-q-filter' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-01	Junio C Hamano	Merge branch 'mg/doc-bisect-tweak-worktree' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-01	Junio C Hamano	Merge branch 'jh/maint-do-not-track-non-branches' into...	blob \| commitdiff \| raw \| diff to current
2011-04-01	Junio C Hamano	Merge "checkout ambiguous ref bugfix" into maint	blob \| commitdiff \| raw \| diff to current
2011-03-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-03-30	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| commitdiff \| raw \| diff to current
2011-03-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-03-29	Junio C Hamano	Merge branch 'jc/fetch-progressive-stride'	blob \| commitdiff \| raw \| diff to current
2011-03-29	Junio C Hamano	Merge branches 'sp/maint-fetch-pack-stop-early' and...	blob \| commitdiff \| raw \| diff to current
2011-03-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-03-27	Junio C Hamano	Merge branch 'mg/rev-list-n-parents'	blob \| commitdiff \| raw \| diff to current
2011-03-27	Junio C Hamano	Merge branch 'jc/index-update-if-able'	blob \| commitdiff \| raw \| diff to current
2011-03-27	Junio C Hamano	Merge branch 'jc/maint-rerere-in-workdir'	blob \| commitdiff \| raw \| diff to current
2011-03-27	Junio C Hamano	Merge branch 'nd/index-doc'	blob \| commitdiff \| raw \| diff to current
2011-03-27	Junio C Hamano	Merge branch 'jc/fetch-progressive-stride'	blob \| commitdiff \| raw \| diff to current
2011-03-26	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| commitdiff \| raw \| diff to current
2011-03-26	Junio C Hamano	Merge git-gui 0.14.0	blob \| commitdiff \| raw \| diff to current
2011-03-26	Junio C Hamano	Sync with 1.7.4.2	blob \| commitdiff \| raw \| diff to current
2011-03-24	Junio C Hamano	merge: merge with the default upstream branch without...	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'jn/maint-c99-format'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'lt/default-abbrev'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'pk/stash-apply-status-relative'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'jc/maint-diff-q-filter'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'pw/p4'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'mg/rev-list-one-side-only'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'js/maint-stash-index-copy'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'tl/p4'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'mg/doc-bisect-tweak-worktree'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'jn/test-sanitize-git-env'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'sp/maint-upload-pack-stop-early'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'sp/maint-fetch-pack-stop-early'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'jc/maint-rev-list-culled-boundary'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'jc/maint-fetch-alt'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'sg/complete-symmetric-diff'	blob \| commitdiff \| raw \| diff to current
2011-03-23	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| commitdiff \| raw \| diff to current
2011-03-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-03-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom