Merge git://git.bogomips.org/git-svn
[gitweb.git] / Documentation / git-mergetool--lib.txt
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-08 Merge branch 'jh/notes-merge'
2010-12-04 Merge branch 'jj/icase-directory'
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-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
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-11-17 Merge branch 'ks/no-textconv-symlink'
2010-11-17 Merge branch 'cb/diff-fname-optim'
2010-11-17 Merge branch 'jk/no-textconv-symlink'
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-27 Merge branch 'as/daemon-multi-listen'
2010-10-27 Merge branch 'kf/post-receive-sample-hook'
2010-10-27 Merge branch 'jf/merge-ignore-ws'
2010-10-27 Merge branch 'en/tree-walk-optim'
2010-10-06 Merge branch 'mg/reset-doc'
2010-09-29 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-09-29 Merge branch 'jc/grep-header-all-match-fix'
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
2010-09-29 Merge branch 'jc/pickaxe-grep'
2010-09-29 Merge branch 'gb/shell-ext'
2010-09-29 Merge branch 'rr/fmt-merge-msg'
2010-09-29 Merge branch 'po/etc-gitattributes'
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-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-08-24 Work around em-dash handling in newer AsciiDoc
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
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 'rc/maint-reflog-msg-for-forced-branch'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
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-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-19 Merge branch 'maint-1.6.2' into maint-1.6.3
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-10 Merge branch 'maint-1.6.2' into maint
next