Merge branch 'jc/mergetool-tool-help' into maint
[gitweb.git] / mergetools / deltawalker
2012-04-23 Merge branch 'jn/debian-customizes-default-editor'
2012-04-23 Merge branch 'ms/remote-usage-string'
2012-04-23 Merge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-20 Merge branch 'jk/run-command-eacces'
2012-04-20 Merge branch 'jc/push-upstream-sanity'
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 '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 '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-02 Merge branch 'pt/gitk'
2012-04-02 Sync with 1.7.9.6
2012-03-31 Merge branch 'maint'
2012-03-26 Sync with 1.7.9.5
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 'jc/maint-verify-objects-remove-pessimism'
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/git-diffall'
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-13 Merge branch 'jc/maint-undefined-i18n-observation-test'
2012-03-13 Merge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-13 Merge branch 'ph/rerere-doc'
2012-03-12 Merge branch 'az/verify-tag-use-gpg-config'
2012-03-12 Sync with 1.7.9.4
2012-03-08 Merge branch 'kb/maint-prune-rmdir-closedir'
2012-03-08 Merge branch 'jl/maint-submodule-relative'
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'vr/branch-doc'
2012-03-08 Merge v1.7.10-rc0 for git l10n update
2012-03-07 Merge branch 'jc/pickaxe-ignore-case'
2012-03-06 Merge branch 'jh/threadable-symlink-check'
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-06 Merge branch 'th/mergetools-deltawalker'
2012-03-05 mergetools: add a plug-in to support DeltaWalker