Merge branch 'tr/submodule-relative-scp-url' into maint
[gitweb.git] / Documentation / git-merge-index.txt
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-19 Merge branch 'nd/maint-relative' into maint
2011-01-10 Merge branch 'maint-1.7.2' into maint
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-15 Git 1.7.3.4 v1.7.3.4
2010-12-15 Git 1.7.0.9 v1.7.0.9
2010-12-14 Merge branch 'jk/maint-reflog-bottom' into maint
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
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 Prepare for 1.7.3.3
2010-12-02 Merge branch 'cb/maint-orphan-merge-noclobber' into...
2010-12-02 Merge branch 'ks/no-textconv-symlink' into maint
2010-12-02 Merge branch 'maint-1.7.2' into maint
2010-11-24 Merge branch 'cb/diff-fname-optim' into maint
2010-11-24 Merge branch 'jk/no-textconv-symlink' into maint
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
2010-11-24 Merge branch 'kf/post-receive-sample-hook' into maint
2010-11-24 Merge branch 'mg/reset-doc' into maint
2010-11-24 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
2010-09-15 Merge branch 'os/fix-rebase-diff-no-prefix'
2010-09-15 Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
2010-09-15 Merge branch 'ch/maint-cannot-create-bundle-error'
2010-09-15 Merge branch 'ks/recursive-rename-add-identical'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-12 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-08 Merge branch 'tf/cleanup-builtin-help-headers'
2010-09-08 Merge branch 'jk/test-must-fail-missing'
2010-09-08 Merge branch 'jh/error-removing-missing-note'
2010-09-08 Merge branch 'kf/askpass-config'
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'jk/maint-pass-c-config-in-env'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-07 Merge branch 'maint'
2010-09-06 Merge branch 'jh/clean-exclude'
2010-09-06 Merge branch 'jl/maint-fix-test'
2010-09-06 Merge branch 'maint' v1.7.3-rc0
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'jl/submodule-ignore-diff'
2010-09-04 Merge branch 'ab/test-2'
2010-09-04 Merge branch 'js/detached-stash'
2010-09-04 Merge branch 'js/maint-reflog-beyond-horizon'
2010-09-04 Merge branch 'dg/local-mod-error-messages'
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-03 Merge branch 'ab/compat-regex'
2010-09-03 Merge branch 'nd/clone-depth-zero'
2010-09-03 Merge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03 Merge branch 'cb/maint-mergetool-no-tty'
2010-09-03 Merge branch 'jn/apply-filename-with-sp'
2010-09-03 Merge branch 'jn/merge-custom-no-trivial'
2010-09-03 Merge branch 'jc/maint-doc-em-dash'
2010-09-03 Merge branch 'mg/doc-bundle'
2010-09-03 Merge branch 'jn/doc-backslash'
2010-08-20 Documentation: remove backslashes in manpage synopses
2010-08-19 Merge branch 'tr/xsize-bits' 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 'sp/fix-smart-http-deadlock-on-error'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
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-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-06-16 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'jc/conflict-marker-size' into maint
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-24 Merge branch 'jk/maint-add-ignored-dir' into maint
2010-03-22 Merge branch 'maint-1.6.6' into maint
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Merge branch 'jk/maint-add--interactive-delete' into...
next