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

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

2010-10-22	Sync with 1.7.3.2	blob \| diff \| raw
2010-10-19	Merge branch 'maint'	blob \| diff \| raw
2010-10-14	Merge branch 'maint'	blob \| diff \| raw
2010-10-06	Merge branch 'maint'	blob \| diff \| raw
2010-10-06	Merge branch 'jk/repack-reuse-object'	blob \| diff \| raw
2010-10-06	Merge branch 'bc/fix-cherry-pick-root'	blob \| diff \| raw
2010-10-06	Merge branch 'uk/fix-author-ident-sed-script'	blob \| diff \| raw
2010-10-06	Merge branch 'cw/gitweb-hilite-config'	blob \| diff \| raw
2010-10-06	Merge branch 'ab/makefile-track-cc'	blob \| diff \| raw
2010-10-06	Merge branch 'mg/reset-doc'	blob \| diff \| raw
2010-10-06	Merge branch 'maint'	blob \| diff \| raw
2010-09-30	Merge branch 'maint'	blob \| diff \| raw
2010-09-29	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| diff \| raw
2010-09-29	Merge branch 'ab/send-email-catfile'	blob \| diff \| raw
2010-09-29	Merge branch 'jc/grep-header-all-match-fix'	blob \| diff \| raw
2010-09-29	Merge branch 'jc/no-branch-name-with-dash-at-front'	blob \| diff \| raw
2010-09-29	Merge branch 'jn/gitweb-test-lib'	blob \| diff \| raw
2010-09-29	Merge branch 'bc/fortran-userdiff'	blob \| diff \| raw
2010-09-29	Merge branch 'jk/read-tree-empty'	blob \| diff \| raw
2010-09-29	Merge branch 'rr/format-patch-count-without-merges'	blob \| diff \| raw
2010-09-29	Merge branch 'jc/pickaxe-grep'	blob \| diff \| raw
2010-09-29	Merge branch 'gb/shell-ext'	blob \| diff \| raw
2010-09-29	Merge branch 'rr/fmt-merge-msg'	blob \| diff \| raw
2010-09-18	Merge branch 'js/ls-files-x-doc'	blob \| diff \| raw \| diff to current
2010-09-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-09-09	merge: Make '--log' an integer option for number of...	blob \| diff \| raw
2010-09-06	Merge branch 'xx/trivial' into maint	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'nd/maint-fix-replace'	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'en/rebase-against-rebase-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-22	Merge branch 'nd/fix-sparse-checkout'	blob \| diff \| raw \| diff to current
2010-08-22	Merge branch 'en/rebase-against-rebase-fix'	blob \| diff \| raw \| diff to current
2010-08-19	Merge branch 'tr/xsize-bits' into maint	blob \| diff \| raw \| diff to current
2010-08-19	Merge branch 'jc/sha1-name-find-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'sp/fix-smart-http-deadlock-on-error'...	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'tr/xsize-bits'	blob \| diff \| raw \| diff to current
2010-08-13	Merge branch 'jc/sha1-name-find-fix'	blob \| diff \| raw \| diff to current
2010-08-13	Merge branch 'sp/fix-smart-http-deadlock-on-error'	blob \| diff \| raw \| diff to current
2010-08-02	Merge git://repo.or.cz/git-gui into pt/git-gui	blob \| diff \| raw \| diff to current
2010-07-27	Sync with 1.7.0 series	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.7.0' into maint-1.7.1	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.6.6' into maint-1.7.0	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.6.5' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.6.4' into maint-1.6.5	blob \| diff \| raw \| diff to current
2010-07-16	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-09	Merge remote branch 'ko/master' into jc/read-tree-cache...	blob \| diff \| raw \| diff to current
2010-07-07	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2010-07-07	Merge branch 'tr/receive-pack-aliased-update-fix' into...	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'tc/commit-abbrev-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'cc/maint-diff-CC-binary' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'pc/remove-warn' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'js/maint-receive-pack-symref-alias'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'eb/core-eol'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'fg/autocrlf'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'tc/commit-abbrev-fix'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'tr/receive-pack-aliased-update-fix'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'js/async-thread'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'cb/assume-unchanged-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'rs/diff-no-minimal' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'bg/apply-blank-trailing-context' into...	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'cc/maint-diff-CC-binary'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'rc/ls-remote-default'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'hg/id-munging'	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cw/maint-exec-defpath' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sc/http-late-auth' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cb/maint-stash-orphaned-file' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/maint-bundle' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rr/doc-submitting' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/t7006-fixup' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/shortlog' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/index-pack-memsave' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-dumb-http-pack-reidx' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jc/am-3-show-corrupted-patch' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/malloc-threading' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'bg/send-email-smtpdomain' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rc/maint-curl-helper' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'hg/maint-attr-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'mh/status-optionally-refresh' into maint	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'js/try-to-free-stackable'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'cb/assume-unchanged-fix'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'rs/diff-no-minimal'	blob \| diff \| raw \| diff to current
2010-06-01	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-28	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'cb/maint-stash-orphaned-file'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/maint-bundle'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'rr/doc-submitting'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/gitweb-our-squelch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/shortlog'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/t7006-fixup'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'js/maint-receive-pack-symref-alias'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'sp/maint-dumb-http-pack-reidx'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/submodule-basic-test'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'np/index-pack-memsave'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/am-3-show-corrupted-patch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/maint-no-reflog-expire-unreach-for...	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'cw/maint-exec-defpath'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'tr/word-diff'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/status-show-ignored'	blob \| diff \| raw \| diff to current
next