Merge branch 'ab/i18n-fixup' into maint
[gitweb.git] / t / t7110-reset-merge.sh
2011-05-31 Merge branch 'ab/i18n-fixup' into maint
2011-05-31 Merge branch 'jc/rename-degrade-cc-to-c' into maint
2011-05-31 Merge branch 'rr/doc-content-type' into maint
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
2011-05-26 Merge branch 'maint-1.7.4' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26 Merge branch 'ss/doc-svn' into maint
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-17 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16 Merge branch 'jn/maint-format-patch-doc' into maint
2011-05-16 Merge branch 'ss/cherry-pick-x-doc' into maint
2011-05-16 Merge branch 'vr/merge-base-doc' into maint
2011-05-16 Merge branch 'jc/t1506-shell-param-expansion-gotcha...
2011-05-16 Merge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16 Merge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-16 Merge branch 'jc/maint-add-p-overlapping-hunks' into...
2011-05-15 Merge branch 'jk/format-patch-quote-special-in-from...
2011-05-13 Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
2011-05-13 Merge branch 'gr/cvsimport-alternative-cvspass-location...
2011-05-13 Merge branch 'jk/merge-one-file-working-tree' into...
2011-05-13 Merge branch 'jc/fix-diff-files-unmerged' into maint
2011-05-13 Merge branch 'mz/maint-rename-unmerged' into maint
2011-05-11 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-05 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04 Merge branch 'jh/dirstat' into maint
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint
2011-05-04 Merge branch 'jk/maint-stash-oob' into maint
2011-05-04 Merge branch 'jk/maint-upload-pack-shallow' into maint
2011-05-04 Merge branch 'jc/pack-objects-bigfile' into maint
2011-05-04 Merge branch 'mg/reflog-with-options' into maint
2011-05-04 Merge branch 'ar/clean-rmdir-empty' into maint
2011-05-04 Merge branch 'mg/sha1-path-advise' into maint
2011-04-29 Merge branch 'mg/x-years-12-months' into maint
2011-04-25 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-04-19 Sync with 1.7.4.5
2011-04-15 Merge v1.7.5-rc2 into jn/format-patch-doc
2011-04-14 Merge branch 'maint'
2011-04-13 i18n: use test_i18ncmp and test_i18ngrep in t7102 and...
2011-04-13 Merge branch 'maint'
2011-04-12 Merge branch 'js/checkout-untracked-symlink'
2011-04-12 Merge branch 'nd/init-gitdir'
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-06 Sync with 1.7.4.4
2011-04-06 Merge branch 'jk/maint-remote-mirror-safer'
2011-04-06 Merge branch 'mg/doc-revisions-txt'
2011-04-04 Merge branch 'maint'
2011-04-04 Merge branch 'jl/submodule-fetch-on-demand'
2011-04-04 Merge branch 'jc/rev-list-options-fix'
2011-04-04 Merge branch 'nm/maint-conflicted-submodule-entries'
2011-04-03 Merge branch 'maint'
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-03 Sync with 1.7.4.3
2011-04-02 Merge branch 'nd/init-gitdir'
2011-04-02 Merge branch 'jc/merge-sans-branch'
2011-04-02 Merge branch 'jr/grep-en-config'
2011-04-02 Merge branch 'ab/i18n-st'
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-26 Merge git-gui 0.14.0
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-10 i18n: git-commit "middle of a merge" message
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
next