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

[git] / Documentation / git-merge-file.txt

2013-09-17	Junio C Hamano	Merge branch 'ap/commit-author-mailmap'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jk/free-tree-buffer'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Sync with maint for l10n updates	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jc/pager-configuration-doc'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mm/remote-helpers-doc'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mm/fast-import-feature-doc'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mm/mediawiki-dumb-push-fix'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jc/commit-is-spelled-with-two-ems'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jk/config-int-range-check'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'jc/ls-files-killed-optim'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'es/rebase-i-no-abbrev'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'rt/rebase-p-no-merge-summary'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'tf/gitweb-ss-tweak'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'sb/mailmap-freeing-NULL-is-ok'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'js/xread-in-full'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'es/rebase-i-respect-core-commentchar'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'jn/post-receive-utf8'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'sh/pull-rebase-preserve'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'nd/push-no-thin'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'nd/magic-pathspec'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jk/mailmap-incomplete-line'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'sp/clip-read-write-to-8mb'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'tg/index-struct-sizes'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/transport-do-not-use-connect-twice...	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/contacts-blame-L-multi'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jl/submodule-mv'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/blame-L-twice'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'tr/log-full-diff-keep-true-parents'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jk/cat-file-batch-optim'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/blame-L-more'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'db/http-savecookies'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/push-cas'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'nd/clone-connectivity-shortcut'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/diff-filter-negation'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'ms/fetch-prune-configuration'	blob \| commitdiff \| raw
2013-09-05	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'sb/parseopt-boolean-removal'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jc/parseopt-command-modes'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jl/some-submodule-config-are-not-boolean'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'sg/bash-prompt-lf-in-cwd-test'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'sb/diff-delta-remove-needless-comparison'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'fc/unpack-trees-leakfix'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'aj/p4-symlink-lose-nl'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'fc/remote-hg-shared-setup'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'sb/misc-cleanup'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'nd/gc-lock-against-each-other'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'ap/remote-hg-tilde-is-home-directory'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'mm/no-shell-escape-in-die-message'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'tr/fd-gotcha-fixes'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'bc/unuse-packfile'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'da/darwin'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'nd/sq-quote-buf'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'rr/feed-real-path-to-editor'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jk/fast-import-empty-ls'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'km/svn-1.8-serf-only'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jc/check-x-z'	blob \| commitdiff \| raw
2013-09-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'bc/completion-for-bash-3.0'	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'sp/doc-smart-http'	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'mm/war-on-whatchanged'	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'rt/doc-merge-file-diff3'	blob \| commitdiff \| raw
2013-08-09	Ralf Thielow	Documentation/git-merge-file: document option "--diff3"	blob \| commitdiff \| raw
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| commitdiff \| raw \| diff to current
2013-04-01	Junio C Hamano	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jk/checkout-attribute-lookup'	blob \| commitdiff \| raw \| diff to current
2013-03-26	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| commitdiff \| raw \| diff to current
2013-03-25	Junio C Hamano	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| commitdiff \| raw \| diff to current
2013-03-21	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify'	blob \| commitdiff \| raw \| diff to current
2013-02-20	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| commitdiff \| raw \| diff to current
2013-01-12	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-reorder'	blob \| commitdiff \| raw \| diff to current
2013-01-12	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| commitdiff \| raw \| diff to current
2013-01-10	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| commitdiff \| raw \| diff to current
2013-01-10	Junio C Hamano	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| commitdiff \| raw \| diff to current
2013-01-08	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut'	blob \| commitdiff \| raw \| diff to current
2013-01-08	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-dedup-done'	blob \| commitdiff \| raw \| diff to current
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2012-10-08	Junio C Hamano	Merge branch 'os/commit-submodule-ignore' into maint	blob \| commitdiff \| raw \| diff to current
2012-10-01	Junio C Hamano	Merge branch 'os/commit-submodule-ignore'	blob \| commitdiff \| raw \| diff to current
2012-09-18	Junio C Hamano	Merge branch 'er/doc-fast-import-done' into maint	blob \| commitdiff \| raw \| diff to current
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw \| diff to current
2012-09-11	Junio C Hamano	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom