apply: allow rerere() to work on --3way results
[git] / builtin / prune.c
2012-05-07  Junio C HamanoMerge branch 'jk/maint-tformat-with-z'
2012-05-07  Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-03  Junio C HamanoMerge branch 'jc/merge-reduce-parents-early' into maint
2012-05-03  Junio C HamanoMerge branch 'mb/fetch-call-a-non-branch-a-ref' into...
2012-05-03  Junio C HamanoMerge branch 'rl/maint-stash-i18n-save-error' into...
2012-05-03  Junio C HamanoMerge branch 'jm/maint-strncpy-diff-no-index' into...
2012-05-03  Junio C HamanoMerge branch 'jk/maint-push-progress'
2012-05-03  Junio C HamanoMerge branch 'nd/columns'
2012-05-02  Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02  Junio C HamanoMerge branch 'zj/mksh-columns-breakage'
2012-05-02  Junio C HamanoMerge branch 'pw/fast-import-dataref-parsing' into...
2012-05-02  Junio C HamanoMerge branch 'it/fetch-pack-many-refs' into maint
2012-05-02  Junio C HamanoMerge branch 'jl/maint-submodule-recurse-fetch' into...
2012-05-02  Junio C HamanoMerge branch 'jc/maint-blame-minimal' into maint
2012-05-02  Junio C HamanoMerge branch 'lp/maint-diff-three-dash-with-graph'...
2012-05-02  Junio C HamanoMerge branch 'jk/rebase-i-submodule-conflict-only'...
2012-04-27  Junio C HamanoMerge branch 'jc/merge-reduce-parents-early'
2012-04-27  Junio C HamanoMerge branch 'zj/mksh-columns-breakage' into lp/diffsta...
2012-04-26  Junio C HamanoMerge branch 'rl/maint-stash-i18n-save-error'
2012-04-26  Junio C HamanoMerge branch 'mb/fetch-call-a-non-branch-a-ref'
2012-04-26  Junio C HamanoMerge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26  Junio C HamanoMerge branch 'jk/run-command-eacces' into maint
2012-04-26  Junio C HamanoMerge branch 'jc/push-upstream-sanity' into maint
2012-04-26  Junio C HamanoMerge branch 'jc/maint-clean-nested-worktree-in-subdir...
2012-04-26  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26  Junio C HamanoMerge branch 'jc/commit-unedited-template' into maint
2012-04-26  Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26  Junio C HamanoMerge branch 'jc/commit-hook-authorship' into maint
2012-04-26  Junio C HamanoMerge branch 'tr/maint-word-diff-regex-sticky' into...
2012-04-26  Junio C HamanoMerge branch 'jh/notes-merge-in-git-dir-worktree' into...
2012-04-26  Junio C HamanoSync with 1.7.9.7
2012-04-26  Junio C HamanoSync with 1.7.8.6
2012-04-24  Junio C HamanoMerge branch 'cc/fix-missing-va-end-in-revert'
2012-04-24  Junio C HamanoMerge branch 'it/fetch-pack-many-refs'
2012-04-24  Junio C HamanoMerge branch 'pw/fast-import-dataref-parsing'
2012-04-24  Junio C HamanoMerge branch 'hv/submodule-recurse-push'
2012-04-23  Junio C HamanoMerge branch 'bw/test-fix-grep-gnuism'
2012-04-23  Junio C HamanoMerge branch 'jl/maint-submodule-recurse-fetch'
2012-04-23  Junio C HamanoMerge branch 'jc/maint-blame-minimal'
2012-04-23  Junio C HamanoMerge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-23  Junio C HamanoMerge branch 'rs/commit-list-sort-in-batch'
2012-04-23  Junio C HamanoMerge branch 'jh/apply-free-patch'
2012-04-23  Junio C HamanoMerge branch 'jn/debian-customizes-default-editor'
2012-04-23  Junio C HamanoMerge branch 'ms/remote-usage-string'
2012-04-23  Junio C HamanoMerge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-20  Junio C HamanoMerge branch 'jk/run-command-eacces'
2012-04-20  Junio C HamanoMerge branch 'jc/push-upstream-sanity'
2012-04-20  Junio C HamanoMerge branch 'jb/am-include'
2012-04-20  Junio C HamanoMerge branch 'jc/fmt-merge-msg-people'
2012-04-16  Junio C HamanoMerge branch 'jk/add-p-skip-conflicts'
2012-04-16  Junio C HamanoMerge branch 'jc/commit-unedited-template'
2012-04-16  Junio C HamanoMerge branch 'jk/http-backend-keep-committer-ident...
2012-04-16  Junio C HamanoMerge branch 'jk/branch-quiet'
2012-04-16  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16  Junio C HamanoMerge branch 'jc/maint-clean-nested-worktree-in-subdir'
2012-04-16  Junio C HamanoMerge branch 'rs/unpack-trees-leakfix'
2012-04-16  Junio C HamanoMerge branch 'zj/test-cred-helper-nicer-prove'
2012-04-16  Junio C HamanoMerge branch 'jh/notes-merge-in-git-dir-worktree'
2012-04-16  Junio C HamanoMerge branch 'tr/maint-word-diff-regex-sticky'
2012-04-16  Junio C HamanoMerge branch 'jc/diff-algo-cleanup'
2012-04-16  Junio C HamanoMerge branch 'jc/commit-hook-authorship'
2012-04-16  Junio C HamanoMerge branch 'nd/stream-more'
2012-04-10  Junio C HamanoMerge branch 'maint-1.7.9' into maint
2012-04-10  Junio C HamanoMerge branch 'maint-1.7.8' into maint-1.7.9
2012-04-10  David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02  Junio C HamanoMerge branch 'pt/gitk'
2012-04-02  Junio C HamanoSync with 1.7.9.6
2012-03-31  Junio C HamanoMerge branch 'maint'
2012-03-26  Junio C HamanoSync with 1.7.9.5
2012-03-26  Junio C HamanoMerge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26  Junio C HamanoMerge branch 'ph/rerere-doc' into maint
2012-03-26  Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24  Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-23  Junio C HamanoMerge branch 'am/completion-zsh-fix'
2012-03-23  Junio C HamanoMerge branch 'dw/gitweb-doc-grammo'
2012-03-20  Junio C HamanoMerge branch 'maint'
2012-03-20  Junio C HamanoMerge branch 'maint-1.7.8' into maint
2012-03-16  Junio C HamanoMerge branch 'ab/perl-i18n'
2012-03-16  Junio C HamanoMerge branch 'th/mergetools-deltawalker'
2012-03-16  Junio C HamanoMerge branch 'jc/maint-verify-objects-remove-pessimism'
2012-03-16  Junio C HamanoMerge branch 'sl/customize-sane-tool-path'
2012-03-16  Junio C HamanoMerge "two fixes for fast-import's 'ls' command" from...
2012-03-16  Jiang XinMerge v1.7.10-rc0 for git l10n update
2012-03-16  Junio C HamanoMerge branch 'th/git-diffall'
2012-03-16  Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-13  Junio C HamanoMerge branch 'jc/maint-undefined-i18n-observation-test'
2012-03-13  Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-13  Junio C HamanoMerge branch 'ph/rerere-doc'
2012-03-12  Junio C HamanoMerge branch 'az/verify-tag-use-gpg-config'
2012-03-12  Junio C HamanoSync with 1.7.9.4
2012-03-12  Junio C HamanoMerge branch 'tr/maint-bundle-boundary' into maint
2012-03-12  Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-12  Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-12  Junio C HamanoMerge branch 'jc/am-3-nonstandard-popt' into maint
2012-03-12  Junio C HamanoMerge https://github.com/git-l10n/git-po
2012-03-08  Junio C HamanoMerge branch 'kb/maint-prune-rmdir-closedir'
2012-03-08  Junio C HamanoMerge branch 'jl/maint-submodule-relative'
2012-03-08  Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-07  Junio C HamanoMerge branch 'jc/pickaxe-ignore-case'
2012-03-07  Karsten Bleesfix deletion of .git/objects sub-directories in git...
next