merge, pull: stop advising 'commit -a' in case of conflict
[git/git.git] / advice.c
2014-08-28 Matthieu Moymerge, pull: stop advising 'commit -a' in case of conflict
2014-08-10 Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04 Junio C HamanoMerge branch 'tf/maint-doc-push'
2014-08-04 Junio C HamanoMerge branch 'ta/doc-config'
2014-07-30 Junio C HamanoSync with 2.0.4
2014-07-30 Junio C HamanoMerge branch 'jk/more-push-completion'
2014-07-30 Junio C HamanoMerge branch 'ep/avoid-test-a-o'
2014-07-28 Junio C HamanoMerge branch 'maint'
2014-07-28 Junio C HamanoMerge branch 'jk/misc-fixes-maint'
2014-07-27 Junio C HamanoMerge branch 'cc/replace-graft'
2014-07-23 Junio C HamanoSync with v2.0.3
2014-07-23 Junio C HamanoMerge branch 'rs/fix-unlink-unix-socket'
2014-07-22 Junio C HamanoSync with maint
2014-07-22 Junio C HamanoMerge branch 'jk/alloc-commit-id'
2014-07-22 Junio C HamanoMerge branch 'kb/perf-trace'
2014-07-22 Junio C HamanoMerge branch 'ah/fix-http-push' into maint
2014-07-22 Junio C HamanoMerge branch 'zk/log-graph-showsig' into maint
2014-07-22 Junio C HamanoMerge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22 Junio C HamanoMerge branch 'lt/request-pull' into maint
2014-07-22 Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22 Junio C HamanoMerge branch 'maint-1.9' into maint
2014-07-21 Junio C HamanoMerge branch 'maint'
2014-07-21 Junio C HamanoMerge branch 'rs/unify-is-branch'
2014-07-21 Junio C HamanoMerge branch 'kb/avoid-fchmod-for-now'
2014-07-21 Junio C HamanoMerge branch 'ek/alt-odb-entry-fix'
2014-07-21 Junio C HamanoMerge branch 'kb/hashmap-updates'
2014-07-21 Junio C HamanoMerge branch 'jk/remote-curl-squelch-extra-errors'
2014-07-21 Junio C HamanoMerge branch 'rs/ref-transaction-0'
2014-07-21 Junio C HamanoMerge branch 'jl/submodule-tests'
2014-07-21 Junio C HamanoMerge branch 'ak/profile-feedback-build'
2014-07-21 Junio C HamanoMerge branch 'cc/for-each-mergetag'
2014-07-16 Junio C HamanoSync with 2.0.2
2014-07-16 Junio C HamanoMerge branch 'ah/fix-http-push'
2014-07-16 Junio C HamanoMerge branch 'po/error-message-style'
2014-07-16 Junio C HamanoMerge branch 'jl/test-lint-scripts'
2014-07-16 Junio C HamanoMerge branch 'zk/log-graph-showsig'
2014-07-16 Junio C HamanoMerge branch 'mg/fix-log-mergetag-color'
2014-07-16 Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-16 Junio C HamanoMerge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-16 Junio C HamanoMerge branch 'mk/merge-incomplete-files'
2014-07-16 Junio C HamanoMerge branch 'jk/strip-suffix'
2014-07-16 Junio C HamanoMerge branch 'ep/submodule-code-cleanup'
2014-07-16 Junio C HamanoMerge branch 'jk/replace-edit-raw'
2014-07-16 Junio C HamanoMerge branch 'cc/replace-edit'
2014-07-16 Junio C HamanoMerge branch 'tb/crlf-tests'
2014-07-16 Junio C HamanoMerge branch 'nd/split-index'
2014-07-16 Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag...
2014-07-16 Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16 Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip' into maint
2014-07-16 Junio C HamanoMerge branch 'maint-1.9' into maint
2014-07-10 Junio C HamanoMerge branch 'maint'
2014-07-10 Junio C HamanoMerge branch 'dt/refs-check-refname-component-sse-fix'
2014-07-10 Junio C HamanoMerge branch 'rs/simplify-archive-tests'
2014-07-10 Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10 Junio C HamanoMerge branch 'rs/status-code-clean-up'
2014-07-10 Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-10 Junio C HamanoMerge branch 'mg/verify-commit'
2014-07-10 Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag'
2014-07-10 Junio C HamanoMerge branch 'jk/repack-pack-keep-objects' into maint
2014-07-10 Junio C HamanoMerge branch 'mc/doc-submodule-sync-recurse' into maint
2014-07-09 Junio C HamanoMerge branch 'sk/mingw-unicode-spawn-args'
2014-07-09 Junio C HamanoMerge branch 'sk/mingw-dirent'
2014-07-09 Junio C HamanoMerge branch 'sk/mingw-uni-console'
2014-07-09 Junio C HamanoMerge branch 'sk/mingw-main'
2014-07-09 Junio C HamanoMerge branch 'jk/pretty-G-format-fixes'
2014-07-09 Junio C HamanoMerge branch 'jk/xstrfmt'
2014-07-09 Junio C HamanoMerge branch 'jk/skip-prefix'
2014-07-02 Junio C HamanoMerge branch 'dt/refs-check-refname-component-sse'
2014-07-02 Junio C HamanoMerge branch 'ye/http-extract-charset'
2014-07-02 Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip'
2014-07-02 Junio C HamanoMerge branch 'jk/commit-buffer-length'
2014-07-02 Junio C HamanoMerge branch 'maint'
2014-07-02 Junio C HamanoMerge branch 'maint-1.8.5' into maint
2014-06-27 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26 Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Junio C HamanoMerge git://repo.or.cz/git-gui
2014-06-25 Junio C HamanoSync with maint
2014-06-25 Junio C HamanoMerge branch 'ep/avoid-test-a-o'
2014-06-25 Junio C HamanoMerge branch 'tb/unicode-7.0-display-width'
2014-06-25 Junio C HamanoMerge branch 'ye/doc-http-proto'
2014-06-25 Junio C HamanoMerge branch 'rs/blame-refactor'
2014-06-25 Junio C HamanoMerge branch 'pb/trim-trailing-spaces'
2014-06-25 Junio C HamanoMerge branch 'mc/doc-submodule-sync-recurse'
2014-06-25 Junio C HamanoMerge branch 'sp/complete-ext-alias'
2014-06-25 Junio C HamanoMerge branch 'mc/git-p4-prepare-p4-only'
2014-06-25 Junio C HamanoMerge branch 'jk/repack-pack-writebitmaps-config'
2014-06-25 Junio C HamanoMerge branch 'nd/init-restore-env'
2014-06-25 Junio C HamanoMerge branch 'jk/repack-pack-keep-objects'
2014-06-25 Junio C HamanoMerge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
2014-06-25 Junio C HamanoMerge branch 'na/no-http-test-in-the-middle' into maint
2014-06-25 Junio C HamanoMerge branch 'jl/status-added-submodule-is-never-ignore...
2014-06-25 Junio C HamanoMerge branch 'ym/fix-opportunistic-index-update-race...
2014-06-25 Junio C HamanoMerge branch 'mk/show-s-no-extra-blank-line-for-merges...
2014-06-25 Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into maint
2014-06-25 Junio C HamanoMerge branch 'jc/shortlog-ref-exclude' into maint
2014-06-25 Junio C HamanoMerge branch 'fc/rerere-conflict-style' into maint
2014-06-25 Junio C HamanoMerge branch 'dt/merge-recursive-case-insensitive'...
2014-06-25 Junio C HamanoMerge branch 'rs/mailinfo-header-cmp' into maint
2014-06-25 Junio C HamanoMerge branch 'jk/index-pack-report-missing' into maint
2014-06-25 Junio C HamanoMerge branch 'nd/index-pack-one-fd-per-thread' into...
next