Merge branch 'mg/branch-set-upstream-previous' into maint
[gitweb.git] / Documentation / git-mergetool--lib.txt
2011-09-23 Merge branch 'mg/branch-set-upstream-previous' into...
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-12 Merge branch 'jl/maint-fetch-submodule-check-fix' into...
2011-09-12 Merge branch 'ms/reflog-show-is-default' into maint
2011-09-12 Merge branch 'jk/reset-reflog-message-fix' into maint
2011-09-12 Merge branch 'vi/make-test-vector-less-specific' into...
2011-09-12 Merge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12 Merge branch 'dz/connect-error-report' into maint
2011-09-12 Merge branch 'jc/maint-mergetool-read-fix' into maint
2011-09-12 Merge branch 'jk/maint-config-param' into maint
2011-09-12 Merge branch 'jn/doc-dashdash' into maint
2011-09-12 Merge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-08-24 Merge branch 'jc/maint-smart-http-race-upload-pack...
2011-08-23 Merge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-23 Merge branch 'cb/maint-exec-error-report' into maint
2011-08-23 Merge branch 'cb/maint-quiet-push' into maint
2011-08-23 Merge branch 'jc/maint-smart-http-race-upload-pack...
2011-08-23 Merge branch 'jc/no-gitweb-test-without-cgi-etc' into...
2011-08-16 Merge branch 'jk/tag-list-multiple-patterns' into maint
2011-08-16 Merge branch 'jl/submodule-update-quiet' into maint
2011-08-16 Merge branch 'jl/submodule-add-relurl-wo-upstream'...
2011-08-16 Merge branch 'oa/pull-reflog' into maint
2011-08-16 Merge branch 'js/ls-tree-error' into maint
2011-08-16 Merge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Merge branch 'jc/checkout-reflog-fix' into maint
2011-08-16 Merge branch 'jc/maint-reset-unmerged-path' into maint
2011-08-16 Merge branch 'mz/doc-rebase-abort' into maint
2011-08-16 Merge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'ms/help-unknown' into maint
2011-08-16 Merge branch 'mz/doc-synopsis-verse' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-08-16 Merge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-01 Merge branch 'jc/legacy-loose-object' into maint
2011-08-01 Merge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-07-06 Documentation: use [verse] for SYNOPSIS sections
2011-06-29 Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-29 Documentation: quote double-dash for AsciiDoc
2011-06-24 Merge branch 'maint-1.7.4' into maint
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jk/diff-not-so-quick'
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31 Merge branch 'jk/format-patch-am'
2011-05-31 Merge branch 'jc/log-quiet-fix'
2011-05-31 Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-31 Merge branch 'jk/maint-remote-mirror-safer'
2011-05-31 Merge branch 'rr/doc-content-type' into maint
2011-05-31 Merge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
2011-05-26 Merge branch 'rg/no-gecos-in-pwent'
2011-05-26 Merge branch 'jc/require-work-tree-exists'
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-23 Merge branch 'jm/maint-diff-words-with-sbe'
2011-05-23 Merge branch 'js/mingw-shutdown'
2011-05-20 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20 Merge branch 'rg/copy-gecos-username'
2011-05-20 Merge branch 'jk/git-connection-deadlock-fix'
2011-05-20 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-16 Merge branch 'kk/maint-prefix-in-config-mak'
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 'jc/t1506-shell-param-expansion-gotcha'
2011-05-13 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13 Merge branch 'jc/fix-add-u-unmerged'
2011-05-13 Merge branch 'cn/log-parse-opt'
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-13 Merge branch 'nd/struct-pathspec'
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-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-branch-mergeoptions'
2011-05-11 Merge branch 'jc/maint-add-p-overlapping-hunks'
2011-05-06 Merge branch 'jc/maint-branch-mergeoptions' into mg...
2011-05-06 Merge branch 'im/hashcmp-optim'
next