error_resolve_conflict: drop quotations around operation
[git] / prompt.c
2014-02-13  Junio C HamanoMerge branch 'bm/merge-base-octopus-dedup' into maint
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-02-13  Junio C HamanoMerge branch 'jk/allow-fetch-onelevel-refname' into...
2014-02-13  Junio C HamanoMerge branch 'sb/repack-in-c' into maint
2014-02-13  Junio C HamanoMerge branch 'as/tree-walk-fix-aggressive-short-cut...
2014-02-05  Junio C HamanoMerge branch 'jc/maint-pull-docfix' into maint
2014-02-05  Junio C HamanoMerge branch 'ow/stash-with-ifs' into maint
2014-02-05  Junio C HamanoMerge branch 'js/lift-parent-count-limit' into maint
2014-02-05  Junio C HamanoMerge branch 'nd/add-empty-fix' into maint
2014-02-05  Junio C HamanoMerge branch 'bc/log-decoration' into maint
2014-02-05  Junio C HamanoMerge branch 'jh/rlimit-nofile-fallback' into maint
2014-02-05  Junio C HamanoMerge branch 'jl/commit-v-strip-marker' into maint
2014-02-05  Junio C HamanoMerge branch 'tr/send-email-ssl' into maint
2014-02-05  Junio C HamanoMerge branch 'tb/clone-ssh-with-colon-for-port' into...
2014-02-05  Junio C HamanoMerge branch 'nd/transport-positive-depth-only' into...
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2014-01-13  Junio C HamanoMerge branch 'nd/daemon-informative-errors-typofix...
2014-01-13  Junio C HamanoMerge branch 'km/gc-eperm' into maint
2014-01-13  Junio C HamanoMerge branch 'jk/credential-plug-leak' into maint
2014-01-02  Jeff KingRevert "prompt: clean up strbuf usage"
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive'
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-10-14  Jonathan NiederMerge branch 'nv/doc-config-signingkey'
2013-08-05  Junio C HamanoMerge branch 'dn/test-reject-utf-16'
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-11  Junio C HamanoMerge branch 'jc/t1512-fix'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup'
2013-03-26  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify'
2013-02-20  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-02-07  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak' into maint
2013-02-06  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak'
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar...
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar'
2013-01-10  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2013-01-08  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'
2012-11-15  Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09  Jeff KingMerge branch 'nd/tree-walk-enum-cleanup'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-09-20  Junio C HamanoMerge branch 'dg/run-command-child-cleanup' into maint
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
2012-09-15  Junio C HamanoMerge branch 'dg/run-command-child-cleanup'
2012-09-15  Junio C HamanoMerge branch 'sb/send-email-reconfirm-fix' into maint
2012-09-15  Junio C HamanoMerge branch 'jc/send-email-reconfirm' into maint
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12  Junio C HamanoMerge branch 'sb/send-email-reconfirm-fix'
2012-09-12  Junio C HamanoMerge branch 'jc/apply-binary-p0' into maint-1.7.11
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-09-11  Junio C HamanoMerge branch 'jc/maint-sane-execvp-notdir' into maint...
2012-09-11  Junio C HamanoMerge branch 'jk/docs-docbook-monospace-display' into...
2012-09-11  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11  Junio C HamanoMerge branch 'nd/index-errno' into maint-1.7.11
2012-09-11  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable...
2012-09-07  Junio C HamanoMerge branch 'jc/apply-binary-p0'
2012-09-03  Junio C HamanoMerge branch 'jc/daemon-access-hook'
2012-09-03  Junio C HamanoMerge branch 'jc/send-email-reconfirm'
2012-09-03  Junio C HamanoMerge branch 'jc/maint-sane-execvp-notdir'
2012-08-27  Junio C HamanoMerge branch 'jk/docs-docbook-monospace-display'
2012-08-27  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh'
2012-08-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-24  Junio C HamanoMerge branch 'bw/maint-1.7.9-solaris-getpass' into...
2012-08-22  Junio C HamanoMerge branch 'nd/index-errno'
2012-08-22  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable'
2012-08-08  Junio C HamanoMerge branch 'bw/maint-1.7.9-solaris-getpass'
2012-08-06  Junio C HamanoMerge branch 'jn/block-sha1' into maint
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' into maint
2012-08-06  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' into maint
2012-08-06  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-31  Junio C HamanoMerge branch 'nd/maint-i18n-diffstat'
2012-07-30  Junio C HamanoMerge branch 'jc/maint-filter-branch-epoch-date' into...
2012-07-28  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix'
next