Merge branch 'vl/typofix' into maint
[gitweb.git] / Documentation / git-mergetool.txt
2013-07-19 Merge branch 'vl/typofix' into maint
2013-07-19 Merge branch 'wk/doc-git-has-grown' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-19 Merge branch 'jk/apache-test-for-2.4' into maint
2013-07-19 Merge branch 'tr/test-commit-only-on-orphan' into maint
2013-07-19 Merge branch 'sb/archive-zip-double-assignment-fix...
2013-07-19 Merge branch 'th/bisect-skip-report-range-fix' into...
2013-07-19 Merge branch 'tr/coverage' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-15 Merge branch 'jk/pull-into-dirty-unborn' into maint
2013-07-15 Merge branch 'mt/send-email-cc-match-fix' into maint
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03 Merge branch 'jc/core-checkstat' into maint
2013-07-03 Merge branch 'jc/t5551-posix-sed-bre' into maint
2013-07-03 Merge branch 'vv/help-unknown-ref' into maint
2013-07-03 Merge branch 'rs/empty-archive' into maint
2013-07-03 Merge branch 'rh/merge-options-doc-fix' into maint
2013-07-03 Merge branch 'an/diff-index-doc' into maint
2013-07-03 Merge branch 'cb/log-follow-with-combined' into maint
2013-07-03 Merge branch 'maint-1.8.2' into maint
2013-06-30 Merge branch 'fc/macos-x-clipped-write' into maint
2013-06-30 Merge branch 'da/darwin' into maint
2013-06-28 Merge branch 'nd/clone-connectivity-shortcut' (early...
2013-06-27 Merge branch 'tg/maint-zsh-svn-remote-prompt' into...
2013-06-27 Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into...
2013-06-27 Merge branch 'tr/push-no-verify-doc' into maint
2013-06-27 Merge branch 'rs/commit-m-no-edit' into maint
2013-06-27 Merge branch 'jc/strbuf-branchname-fix' into maint
2013-06-27 Merge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27 Merge branch 'kb/ancestry-path-threedots' into maint
2013-06-27 Merge branch 'jk/subtree-do-not-push-if-split-fails...
2013-06-27 Merge branch 'mh/fetch-into-shallow' into maint
2013-06-27 Merge branch 'jh/checkout-auto-tracking' into maint
2013-06-11 Merge branch 'maint-1.8.2' into maint
2013-06-10 Merge branch 'jn/config-ignore-inaccessible' into maint
2013-06-10 Merge branch 'kb/status-ignored-optim-2' into maint
2013-05-29 Merge branch 'maint-1.8.2' into maint
2013-05-17 Merge branch 'fc/doc-style'
2013-05-17 documentation: trivial style cleanups
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-04 Merge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Merge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Merge branch 'jk/peel-ref' into maint
2013-04-03 Merge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-02 Merge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Merge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Merge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Merge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Merge branch 'jc/remove-export-from-config-mak-in'
2013-03-28 Merge branch 'rr/tests-dedup-test-config'
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'jc/reflog-reverse-walk'
2013-03-26 Merge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26 Merge branch 'jc/perl-cat-blob' into maint
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25 Merge branch 'jk/fully-peeled-packed-ref'
2013-03-25 Merge branch 'jk/peel-ref'
2013-03-25 Merge branch 'lf/setup-prefix-pathspec'
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-25 Merge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25 Merge branch 'tk/doc-filter-branch' into maint-1.8.1
2013-03-25 Merge branch 'dm/ni-maxhost-may-be-missing' into maint...
2013-03-25 Merge branch 'jc/color-diff-doc' into maint-1.8.1
2013-03-21 Merge branch 'jk/utf-8-can-be-spelled-differently'
2013-03-21 Merge branch 'jc/perl-cat-blob'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-03-19 Merge branch 'lf/bundle-verify-list-prereqs'
2013-03-19 Merge branch 'tk/doc-filter-branch'
2013-03-19 Merge branch 'dm/ni-maxhost-may-be-missing'
2013-03-19 Merge branch 'jc/color-diff-doc'
2013-03-13 Merge branch 'jc/reflog-reverse-walk' into nd/branch...
2013-02-27 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-27 Merge branch 'jn/less-reconfigure' into maint
2013-02-25 Merge branch 'jn/less-reconfigure'
2013-02-25 Merge branch 'as/check-ignore'
2013-02-25 Merge branch 'ct/autoconf-htmldir'
2013-02-25 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-25 Merge branch 'jc/mention-tracking-for-pull-default...
2013-02-25 Merge branch 'al/mergetool-printf-fix' into maint
2013-02-25 Merge branch 'mg/bisect-doc' into maint
2013-02-25 Merge branch 'jc/combine-diff-many-parents' into maint
2013-02-25 Merge branch 'jk/apply-similaritly-parsing' into maint
2013-02-25 Merge branch 'nd/clone-no-separate-git-dir-with-bare...
2013-02-20 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-02-19 Merge branch 'jc/mention-tracking-for-pull-default'
next