RelNotes: the third batch
[gitweb.git] / Documentation / git-difftool.txt
2012-04-20 Merge branch 'ct/advise-push-default'
2012-04-20 Merge branch 'jk/run-command-eacces'
2012-04-20 Merge branch 'jc/push-upstream-sanity'
2012-04-20 Merge branch 'jc/am-report-3way'
2012-04-20 Merge branch 'jb/am-include'
2012-04-20 Merge branch 'jc/fmt-merge-msg-people'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'jc/commit-unedited-template'
2012-04-16 Merge branch 'jk/http-backend-keep-committer-ident...
2012-04-16 Merge branch 'jk/branch-quiet'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'jc/maint-clean-nested-worktree-in-subdir'
2012-04-16 Merge branch 'rs/unpack-trees-leakfix'
2012-04-16 Merge branch 'nl/rebase-i-cheat-sheet'
2012-04-16 Merge branch 'zj/test-cred-helper-nicer-prove'
2012-04-16 Merge branch 'jh/notes-merge-in-git-dir-worktree'
2012-04-16 Merge branch 'tr/maint-word-diff-regex-sticky'
2012-04-16 Merge branch 'jn/diffstat-tests'
2012-04-16 Merge branch 'jc/diff-algo-cleanup'
2012-04-16 Merge branch 'jc/commit-hook-authorship'
2012-04-16 Merge branch 'nd/stream-more'
2012-04-10 Merge branch 'maint-1.7.9' into maint
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-04-02 Sync with 1.7.9.6
2012-03-31 Merge branch 'maint'
2012-03-27 l10n updates for Git 1.7.10-rc1
2012-03-26 Sync with 1.7.9.5
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-23 Merge branch 'am/completion-zsh-fix'
2012-03-23 Merge branch 'dw/gitweb-doc-grammo'
2012-03-20 Merge branch 'maint'
2012-03-16 Merge branch 'ab/perl-i18n'
2012-03-16 Merge branch 'th/mergetools-deltawalker'
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-15 Documentation/difftool: add deltawalker to list of...
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'jl/maint-submodule-relative'
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-02 Merge branch 'rs/no-no-no-parseopt'
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'jn/ancient-meld-support' into maint
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/parse-date-raw' into maint
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-10 Merge branch 'jc/parse-date-raw'
2012-02-10 Merge branch 'jl/submodule-re-add' into maint
2012-02-10 Merge branch 'da/maint-mergetool-twoway' into maint
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
2012-02-01 Merge branch 'jc/pull-signed-tag'
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-02-01 Merge branch 'jl/submodule-re-add'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Merge branch 'jc/request-pull-show-head-4'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'jk/maint-upload-archive'
2012-01-13 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10 Merge the attributes fix in from maint-1.6.6 branch
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Merge branch 'jc/show-sig'
2012-01-06 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Merge branch 'jk/maint-push-v-is-verbose' into maint
next