Merge branch 'maint'
[gitweb.git] / Documentation / git-merge-file.txt
2011-03-23 Merge branch 'js/maint-stash-index-copy'
2011-03-23 Merge branch 'tl/p4'
2011-03-23 Merge branch 'mg/doc-bisect-tweak-worktree'
2011-03-23 Merge branch 'jn/test-sanitize-git-env'
2011-03-23 Merge branch 'sp/maint-upload-pack-stop-early'
2011-03-23 Merge branch 'sp/maint-fetch-pack-stop-early'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-23 Merge branch 'jc/maint-fetch-alt'
2011-03-23 Merge branch 'sg/complete-symmetric-diff'
2011-03-23 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-22 Merge branch 'maint'
2011-03-21 Merge branch 'maint'
2011-03-20 Merge branch 'mm/maint-log-n-with-diff-filtering'
2011-03-20 Merge branch 'mg/rev-list-n-reverse-doc'
2011-03-20 Merge branch 'js/rerere-forget-always-take-pathspec'
2011-03-20 Merge branch 'ab/i18n-basic'
2011-03-20 Merge branch 'uk/ls-remote-in-get-remote-url'
2011-03-20 Merge branch 'ss/mergetool--lib'
2011-03-20 Merge branch 'jn/status-translatable'
2011-03-20 Merge branch 'jk/trace-sifter'
2011-03-20 Merge branch 'jk/format-patch-multiline-header'
2011-03-20 Merge branch 'jk/merge-rename-ux'
2011-03-20 Merge branch 'maint'
2011-03-18 Merge branch 'maint'
2011-03-16 Merge branch 'maint'
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-16 Merge branch 'nd/struct-pathspec'
2011-03-15 Merge branch 'jk/strbuf-vaddf'
2011-03-15 Merge branch 'mm/push-default-advice'
2011-03-15 Merge branch 'jn/maint-instaweb-plack-fix'
2011-03-15 Merge branch 'sp/maint-fd-limit'
2011-03-15 Merge branch 'jc/checkout-orphan-warning'
2011-03-15 Merge branch 'jh/maint-do-not-track-non-branches'
2011-03-15 Merge branch 'fk/maint-cvsimport-early-failure'
2011-03-15 Merge branch 'jc/maint-apply-report-offset'
2011-03-15 Merge branch 'jc/maint-apply-no-double-patch'
2011-03-15 Merge branch 'mr/hpux'
2011-03-15 Merge branch 'jk/doc-credits' of git://github.com/peff/git
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-11 doc: drop author/documentation sections from most pages
2011-03-04 Merge branch 'jk/diffstat-binary'
2011-02-28 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-16 Merge branch 'maint-1.7.0' into maint-1.7.1
2011-02-10 Merge branch 'maint-1.7.0' into maint
2011-01-19 Merge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19 Merge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19 Merge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-13 Merge branch 'jk/diff-driver-binary-doc'
2011-01-13 Merge branch 'tr/submodule-relative-scp-url'
2011-01-10 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.1.4 v1.7.1.4
2010-12-15 Git 1.7.0.9 v1.7.0.9
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'mz/maint-rebase-stat-config'
2010-12-09 Merge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09 Merge branch 'cm/diff-check-at-eol' into maint
2010-12-02 Git 1.7.1.3 v1.7.1.3
2010-12-02 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27 Sync with 1.7.0 series
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-22 Merge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'cb/assume-unchanged-fix' into maint
2010-06-21 Merge branch 'rs/diff-no-minimal' into maint
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-16 Merge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Merge branch 'cb/maint-stash-orphaned-file' into maint
next