Andrew's git - gitweb.git/history - Documentation/git-merge-file.txt

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

2013-10-14	Merge branch 'nv/doc-config-signingkey'	blob \| diff \| raw
2013-10-14	Merge branch 'rj/doc-formatting-fix'	blob \| diff \| raw
2013-10-14	Merge branch 'po/remote-set-head-usage'	blob \| diff \| raw
2013-10-14	Merge branch 'nd/clone-local-with-colon'	blob \| diff \| raw
2013-10-14	Merge branch 'jx/clean-interactive'	blob \| diff \| raw
2013-10-14	Merge branch 'jk/diff-algo'	blob \| diff \| raw
2013-10-08	Merge branch 'tz/credential-netrc'	blob \| diff \| raw
2013-09-26	Sync with Git 1.8.4.1	blob \| diff \| raw
2013-09-25	Merge branch 'bc/submodule-status-ignored'	blob \| diff \| raw
2013-09-25	Merge branch 'cc/replace-with-the-same-type'	blob \| diff \| raw
2013-09-25	Merge branch 'nd/unpack-entry-optim-in-pack-objects'	blob \| diff \| raw
2013-09-25	Merge branch 'jk/shortlog-tolerate-broken-commit'	blob \| diff \| raw
2013-09-25	Merge branch 'jc/strcasecmp-pure-inline'	blob \| diff \| raw
2013-09-25	Merge branch 'nd/fetch-pack-error-reporting-fix'	blob \| diff \| raw
2013-09-25	Merge branch 'jc/push-cas'	blob \| diff \| raw
2013-09-25	Merge branch 'maint'	blob \| diff \| raw
2013-09-20	Merge branch 'jk/upload-pack-keepalive'	blob \| diff \| raw
2013-09-20	Merge branch 'fc/at-head'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/commit-template-squelch-advice-messages'	blob \| diff \| raw
2013-09-20	Merge branch 'bk/refs-multi-update'	blob \| diff \| raw
2013-09-20	Merge branch 'nr/git-cd-to-a-directory'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/rebase-continue-freebsd-WB'	blob \| diff \| raw
2013-09-20	Merge branch 'jh/checkout-auto-tracking'	blob \| diff \| raw
2013-09-20	Merge branch 'bc/http-backend-allow-405'	blob \| diff \| raw
2013-09-20	Merge branch 'np/lookup-object-hashing'	blob \| diff \| raw
2013-09-20	Merge branch 'hu/cherry-pick-previous-branch'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/status-without-comment-char'	blob \| diff \| raw
2013-09-20	Merge branch 'rh/peeling-tag-to-tag'	blob \| diff \| raw
2013-09-20	Merge branch 'jx/branch-vv-always-compare-with-upstream'	blob \| diff \| raw
2013-09-20	Merge branch 'nd/fetch-into-shallow'	blob \| diff \| raw
2013-09-19	Merge branch 'jk/config-int-range-check'	blob \| diff \| raw
2013-09-18	Merge branch 'maint'	blob \| diff \| raw
2013-09-18	Merge branch 'jc/url-match'	blob \| diff \| raw
2013-09-18	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'bc/send-email-ssl-die-message-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'uh/git-svn-serf-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/contrib-bzr-hg-fixes'	blob \| diff \| raw
2013-09-18	Merge branch 'js/add-i-mingw'	blob \| diff \| raw
2013-09-18	Merge branch 'ks/p4-view-spec'	blob \| diff \| raw
2013-09-18	Merge branch 'jk/duplicate-objects-in-packs'	blob \| diff \| raw
2013-09-18	Merge branch 'nd/git-dir-pointing-at-gitfile'	blob \| diff \| raw
2013-09-18	Merge branch 'jk/pager-bypass-cat-for-default-pager'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/t3200-fixes'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/rev-parse-test-updates'	blob \| diff \| raw
2013-09-17	Merge branch 'rh/ishes-doc'	blob \| diff \| raw
2013-09-17	Merge branch 'dw/diff-no-index-doc'	blob \| diff \| raw
2013-09-17	Merge branch 'ta/user-manual'	blob \| diff \| raw
2013-09-17	Merge branch 'fc/fast-export'	blob \| diff \| raw
2013-09-17	Merge branch 'ab/gitweb-author-initials'	blob \| diff \| raw
2013-09-17	Merge branch 'jk/has-sha1-file-retry-packed'	blob \| diff \| raw
2013-09-17	Merge branch 'jk/write-broken-index-with-nul-sha1'	blob \| diff \| raw
2013-09-17	Merge branch 'jx/clean-interactive'	blob \| diff \| raw
2013-09-17	Merge branch 'tb/precompose-autodetect-fix'	blob \| diff \| raw
2013-09-17	Merge branch 'kk/tests-with-no-perl'	blob \| diff \| raw
2013-09-17	Merge branch 'ap/commit-author-mailmap'	blob \| diff \| raw
2013-09-17	Merge branch 'jk/free-tree-buffer'	blob \| diff \| raw
2013-09-17	Merge branch 'maint'	blob \| diff \| raw
2013-09-12	Sync with maint for l10n updates	blob \| diff \| raw
2013-09-12	Merge branch 'jc/pager-configuration-doc'	blob \| diff \| raw
2013-09-12	Merge branch 'mm/remote-helpers-doc'	blob \| diff \| raw
2013-09-12	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| diff \| raw
2013-09-12	Merge branch 'mm/fast-import-feature-doc'	blob \| diff \| raw
2013-09-12	Merge branch 'mm/mediawiki-dumb-push-fix'	blob \| diff \| raw
2013-09-12	Merge branch 'jc/commit-is-spelled-with-two-ems'	blob \| diff \| raw
2013-09-12	Merge branch 'jk/config-int-range-check'	blob \| diff \| raw
2013-09-11	Merge branch 'jc/ls-files-killed-optim'	blob \| diff \| raw
2013-09-11	Merge branch 'es/rebase-i-no-abbrev'	blob \| diff \| raw
2013-09-11	Merge branch 'rt/rebase-p-no-merge-summary'	blob \| diff \| raw
2013-09-11	Merge branch 'tf/gitweb-ss-tweak'	blob \| diff \| raw
2013-09-11	Merge branch 'sb/mailmap-freeing-NULL-is-ok'	blob \| diff \| raw
2013-09-11	Merge branch 'js/xread-in-full'	blob \| diff \| raw
2013-09-11	Merge branch 'es/rebase-i-respect-core-commentchar'	blob \| diff \| raw
2013-09-11	Merge branch 'jn/post-receive-utf8'	blob \| diff \| raw
2013-09-11	Merge branch 'sh/pull-rebase-preserve'	blob \| diff \| raw
2013-09-11	Merge branch 'nd/push-no-thin'	blob \| diff \| raw
2013-09-09	Merge branch 'nd/magic-pathspec'	blob \| diff \| raw
2013-09-09	Merge branch 'jk/mailmap-incomplete-line'	blob \| diff \| raw
2013-09-09	Merge branch 'sp/clip-read-write-to-8mb'	blob \| diff \| raw
2013-09-09	Merge branch 'tg/index-struct-sizes'	blob \| diff \| raw
2013-09-09	Merge branch 'jc/transport-do-not-use-connect-twice...	blob \| diff \| raw
2013-09-09	Merge branch 'es/contacts-blame-L-multi'	blob \| diff \| raw
2013-09-09	Merge branch 'jc/url-match'	blob \| diff \| raw
2013-09-09	Merge branch 'jl/submodule-mv'	blob \| diff \| raw
2013-09-09	Merge branch 'es/blame-L-twice'	blob \| diff \| raw
2013-09-09	Merge branch 'tr/log-full-diff-keep-true-parents'	blob \| diff \| raw
2013-09-09	Merge branch 'jk/cat-file-batch-optim'	blob \| diff \| raw
2013-09-09	Merge branch 'es/blame-L-more'	blob \| diff \| raw
2013-09-09	Merge branch 'db/http-savecookies'	blob \| diff \| raw
2013-09-09	Merge branch 'jc/push-cas'	blob \| diff \| raw
2013-09-09	Merge branch 'nd/clone-connectivity-shortcut'	blob \| diff \| raw
2013-09-09	Merge branch 'jc/diff-filter-negation'	blob \| diff \| raw
2013-09-09	Merge branch 'ms/fetch-prune-configuration'	blob \| diff \| raw
2013-09-05	Sync with maint	blob \| diff \| raw
2013-09-04	Merge branch 'sb/parseopt-boolean-removal'	blob \| diff \| raw
2013-09-04	Merge branch 'jc/parseopt-command-modes'	blob \| diff \| raw
2013-09-04	Merge branch 'jl/some-submodule-config-are-not-boolean'	blob \| diff \| raw
2013-09-04	Merge branch 'sg/bash-prompt-lf-in-cwd-test'	blob \| diff \| raw
2013-09-04	Merge branch 'sb/diff-delta-remove-needless-comparison'	blob \| diff \| raw
2013-09-04	Merge branch 'fc/unpack-trees-leakfix'	blob \| diff \| raw
2013-09-04	Merge branch 'aj/p4-symlink-lose-nl'	blob \| diff \| raw
next