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

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

2012-03-06	Merge branch 'zj/diff-stat-dyncol'	blob \| diff \| raw
2012-03-06	Merge branch 'maint'	blob \| diff \| raw
2012-03-05	Sync with 1.7.9.3	blob \| diff \| raw
2012-03-05	Merge branch 'jc/am-3-nonstandard-popt'	blob \| diff \| raw
2012-03-05	Merge branch 'maint'	blob \| diff \| raw
2012-03-02	Merge branch 'maint'	blob \| diff \| raw
2012-03-02	Merge branch 'rs/no-no-no-parseopt'	blob \| diff \| raw
2012-03-01	Merge branch 'maint'	blob \| diff \| raw
2012-03-01	Merge branch 'nd/maint-verify-objects'	blob \| diff \| raw
2012-03-01	Merge branch 'jn/maint-gitweb-invalid-regexp'	blob \| diff \| raw
2012-03-01	Merge branch 'cn/maint-rev-list-doc'	blob \| diff \| raw
2012-03-01	Merge branch 'cn/maint-branch-with-bad'	blob \| diff \| raw
2012-02-28	Merge branch 'pj/completion-remote-set-url-branches'	blob \| diff \| raw
2012-02-28	Merge branch 'ph/cherry-pick-advice-refinement'	blob \| diff \| raw
2012-02-27	Merge branch 'maint'	blob \| diff \| raw
2012-02-27	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| diff \| raw \| diff to current
2012-02-27	Merge branch 'tr/maint-bundle-long-subject'	blob \| diff \| raw
2012-02-27	Merge branch 'sp/smart-http-failure-to-push'	blob \| diff \| raw
2012-02-27	Merge branch 'jc/doc-merge-options'	blob \| diff \| raw
2012-02-27	Merge branch 'jk/maint-avoid-streaming-filtered-contents'	blob \| diff \| raw
2012-02-27	Merge branch 'jb/filter-ignore-sigpipe'	blob \| diff \| raw
2012-02-27	Merge branch 'maint'	blob \| diff \| raw
2012-02-23	Merge branch 'jk/config-include'	blob \| diff \| raw
2012-02-23	Merge branch 'jc/add-refresh-unmerged'	blob \| diff \| raw
2012-02-23	Merge branch 'js/configure-libintl'	blob \| diff \| raw
2012-02-23	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| diff \| raw
2012-02-23	Merge branch 'maint'	blob \| diff \| raw
2012-02-23	Sync with 1.7.9.2	blob \| diff \| raw
2012-02-21	Merge branch 'jn/gitweb-unborn-head'	blob \| diff \| raw
2012-02-21	Merge branch 'maint'	blob \| diff \| raw
2012-02-20	Merge branch 'tg/tag-points-at'	blob \| diff \| raw
2012-02-20	Merge branch 'jc/diff-stat-scaler'	blob \| diff \| raw
2012-02-20	Merge branch 'zj/decimal-width'	blob \| diff \| raw
2012-02-20	Merge branch 'zj/term-columns'	blob \| diff \| raw
2012-02-20	Merge branch 'cb/transfer-no-progress'	blob \| diff \| raw
2012-02-20	Merge branch 'cb/receive-pack-keep-errors'	blob \| diff \| raw
2012-02-20	Merge branch 'cb/maint-t5541-make-server-port-portable'	blob \| diff \| raw
2012-02-20	Merge branch 'cb/maint-rev-list-verify-object'	blob \| diff \| raw
2012-02-20	Merge branch 'maint'	blob \| diff \| raw
2012-02-16	Sync with maint	blob \| diff \| raw
2012-02-16	Merge branch 'mm/empty-loose-error-message' into maint	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'jk/git-dir-lookup'	blob \| diff \| raw
2012-02-14	Merge branch 'jk/grep-binary-attribute'	blob \| diff \| raw
2012-02-14	Merge branch 'nd/pack-objects-parseopt'	blob \| diff \| raw
2012-02-14	Merge branch 'dp/i18n-libcharset'	blob \| diff \| raw
2012-02-14	Merge branch 'bl/gitweb-project-filter'	blob \| diff \| raw
2012-02-14	Merge branch 'jn/ancient-meld-support'	blob \| diff \| raw
2012-02-14	Sync with 1.7.9.1	blob \| diff \| raw
2012-02-13	Sync with maint	blob \| diff \| raw
2012-02-13	Merge branch 'jc/checkout-out-of-unborn'	blob \| diff \| raw
2012-02-13	Merge branch 'jc/maint-mailmap-output'	blob \| diff \| raw
2012-02-13	Merge branch 'jk/prompt-fallback-to-tty'	blob \| diff \| raw
2012-02-13	Merge branch 'jn/gitweb-search-utf-8'	blob \| diff \| raw
2012-02-13	Merge branch 'nd/diffstat-gramnum'	blob \| diff \| raw
2012-02-13	Merge branch 'nd/find-pack-entry-recent-cache-invalidation'	blob \| diff \| raw
2012-02-13	Merge branch 'tt/profile-build-fix'	blob \| diff \| raw
2012-02-13	Merge branch 'nd/cache-tree-api-refactor'	blob \| diff \| raw
2012-02-13	Merge branch 'fc/zsh-completion'	blob \| diff \| raw
2012-02-13	Merge branch 'mp/make-cleanse-x-for-exe'	blob \| diff \| raw
2012-02-13	Merge branch 'bw/inet-pton-ntop-compat'	blob \| diff \| raw
2012-02-13	Merge branch 'jc/maint-commit-ignore-i-t-a'	blob \| diff \| raw
2012-02-13	Merge branch 'jk/maint-tag-show-fixes'	blob \| diff \| raw
2012-02-13	Merge branch 'mm/empty-loose-error-message'	blob \| diff \| raw
2012-02-13	Merge branch 'nk/ctype-for-perf'	blob \| diff \| raw
2012-02-13	Merge branch 'jn/merge-no-edit-fix'	blob \| diff \| raw
2012-02-10	Merge branch 'js/add-e-submodule-fix'	blob \| diff \| raw
2012-02-10	Merge branch 'jc/parse-date-raw'	blob \| diff \| raw
2012-02-10	Merge branch 'jc/merge-ff-only-stronger-than-signed...	blob \| diff \| raw
2012-02-10	Merge branch 'jc/branch-desc-typoavoidance'	blob \| diff \| raw
2012-02-10	Merge branch 'jn/rpm-spec'	blob \| diff \| raw
2012-02-10	Merge branch 'jk/tests-write-script'	blob \| diff \| raw
2012-02-10	Sync with maint	blob \| diff \| raw
2012-02-07	Merge branch 'jc/maint-request-pull-for-tag'	blob \| diff \| raw
2012-02-07	Merge branch 'bl/gitweb-project-filter'	blob \| diff \| raw
2012-02-07	Merge branch 'jx/i18n-more-marking'	blob \| diff \| raw
2012-02-07	Merge branch 'jn/svn-fe'	blob \| diff \| raw
2012-02-07	Merge branch 'rt/completion-branch-edit-desc'	blob \| diff \| raw
2012-02-06	Sync with maint	blob \| diff \| raw
2012-02-01	Merge branch 'tr/merge-edit-guidance'	blob \| diff \| raw
2012-02-01	Merge branch 'jc/pull-signed-tag'	blob \| diff \| raw
2012-01-29	Merge branch 'rs/diff-postimage-in-context'	blob \| diff \| raw \| diff to current
2012-01-23	merge: use editor by default in interactive sessions	blob \| diff \| raw
2011-12-28	Merge branch 'tr/doc-sh-setup' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-snprintf-va-copy' into maint	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/doc-sh-setup'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/pty-all'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/maint-strbuf-missing-init'	blob \| diff \| raw \| diff to current
2011-12-21	Merge branch 'jl/submodule-status-failure-report' into...	blob \| diff \| raw \| diff to current
2011-12-21	Merge branch 'tr/userdiff-c-returns-pointer' into maint	blob \| diff \| raw \| diff to current
2011-12-21	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| diff \| raw \| diff to current
2011-12-20	Merge branch 'jk/maint-snprintf-va-copy'	blob \| diff \| raw \| diff to current
2011-12-18	Update jk/maint-strbuf-missing-init to builtin/ rename	blob \| diff \| raw \| diff to current
2011-12-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'jl/submodule-status-failure-report'	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'tr/userdiff-c-returns-pointer'	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| diff \| raw \| diff to current
2011-12-14	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
next