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

[git] / Documentation / merge-config.txt

2009-01-13	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'ap/maint-apply-modefix' into maint	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-12	Junio C Hamano	Merge branch 'jc/maint-do-not-switch-to-non-commit...	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'jn/gitweb-blame'	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'wp/add-p-goto'	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'maint-1.5.6' into maint-1.6.0	blob \| commitdiff \| raw \| diff to current
2009-01-03	Junio C Hamano	Merge branch 'jc/maint-do-not-switch-to-non-commit'	blob \| commitdiff \| raw
2009-01-03	Junio C Hamano	Merge branch 'ap/maint-apply-modefix'	blob \| commitdiff \| raw
2009-01-01	Junio C Hamano	Merge branch 'cb/mergetool'	blob \| commitdiff \| raw
2008-12-29	Junio C Hamano	Merge branch 'lt/reset-merge'	blob \| commitdiff \| raw
2008-12-27	Junio C Hamano	Merge branch 'sp/maint-describe-all-tag-warning' into...	blob \| commitdiff \| raw
2008-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-12-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2008-12-20	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.6.0.6	blob \| commitdiff \| raw
2008-12-20	Junio C Hamano	GIT 1.6.0.6 v1.6.0.6	blob \| commitdiff \| raw \| diff to current
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-12-17	Junio C Hamano	GIT 1.5.6.6 v1.5.6.6	blob \| commitdiff \| raw \| diff to current
2008-12-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-12-15	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into cb...	blob \| commitdiff \| raw
2008-12-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-12-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-12-10	Ralf Wildenhues	Improve language in git-merge.txt and related docs	blob \| commitdiff \| raw
2008-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-29	Junio C Hamano	Merge branch 'nd/narrow' (early part) into jc/add-i-t-a	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'cc/bisect-skip'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'js/mingw-rename-fix'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'st/levenshtein'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'cr/remote-update-v'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'rs/strbuf-expand'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'mv/clone-strbuf'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'lt/preload-lstat'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'ta/quiet-pull'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'ph/send-email'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-27	Junio C Hamano	Merge branch 'rw/maint-typofix' into rw/typofix	blob \| commitdiff \| raw \| diff to current
2008-11-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-26	Junio C Hamano	Merge branch 'mm/sort-config-doc'	blob \| commitdiff \| raw \| diff to current
2008-11-26	Junio C Hamano	Merge branch 'mm/maint-sort-config-doc' into mm/sort...	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-11-13	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-02	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-10-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-10-18	Junio C Hamano	Merge branch 'pb/commit-where'	blob \| commitdiff \| raw \| diff to current
2008-10-09	Shawn O. Pearce	Merge branch 'lt/time-reject-fractional-seconds'	blob \| commitdiff \| raw \| diff to current
2008-10-09	Shawn O. Pearce	Merge branch 'jc/add-ita'	blob \| commitdiff \| raw \| diff to current
2008-09-29	Shawn O. Pearce	Merge branch 'jc/better-conflict-resolution'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'mv/merge-recursive'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'jc/alternate-push'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'am/status'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'pb/autocorrect-wrapper'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'mv/commit-tree'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'jc/apply-include-exclude'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'jc/safe-c-l-d'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'ho/dirstat-by-file'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/diff-prefix'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'bw/shortref'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'rs/decorate'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'tr/rev-list-reverse'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'cc/bisect'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/setlinebuf-setvbuf'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'dp/maint-rebase-fix' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/maint-checkout-keep-remove' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/maint-diff-quiet' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/maint-name-hash-clear' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/maint-template-permbits' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'mh/maint-honor-no-ssl-verify' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'dp/maint-rebase-fix'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-checkout-keep-remove'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-diff-quiet'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-name-hash-clear'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-template-permbits'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| commitdiff \| raw \| diff to current
2008-09-13	Junio C Hamano	Sync with 1.6.0.2	blob \| commitdiff \| raw \| diff to current
2008-09-12	Junio C Hamano	Merge branch 'ho/maint-dashless' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-12	Ralf Wildenhues	Fix some manual typos.	blob \| commitdiff \| raw \| diff to current
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-08-30	Junio C Hamano	Merge branch 'jc/post-simplify' (early part) into tr...	blob \| commitdiff \| raw \| diff to current
2008-08-28	Junio C Hamano	Merge branch 'mv/merge-custom'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'jc/add-addremove'	blob \| commitdiff \| raw \| diff to current
2008-08-21	Junio C Hamano	Merge branch 'jc/add-stop-at-symlink'	blob \| commitdiff \| raw \| diff to current
2008-08-21	Junio C Hamano	Merge branch 'cc/merge-base-many'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'dp/hash-literally'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'ph/enable-threaded'	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'jk/pager-swap'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom