Merge branch 'so/prompt-command'
[git.git] / Documentation / howto / revert-a-faulty-merge.txt
2012-12-28 Junio C HamanoMerge branch 'so/prompt-command'
2012-12-27 Junio C HamanoMerge branch 'gb/maint-doc-svn-log-window-size' into...
2012-12-27 Junio C HamanoMerge branch 'km/maint-doc-git-reset' into maint
2012-12-27 Junio C HamanoMerge branch 'jk/avoid-mailto-invalid-in-doc' into...
2012-12-27 Junio C HamanoMerge branch 'tj/maint-doc-commit-sign' into maint
2012-12-23 Junio C HamanoMerge branch 'jc/doc-diff-blobs' into maint
2012-12-23 Junio C HamanoMerge branch 'cr/doc-checkout-branch' into maint
2012-12-23 Junio C HamanoMerge branch 'ta/api-index-doc' into maint
2012-12-23 Junio C HamanoMerge branch 'as/doc-for-devs' into maint
2012-12-23 Junio C HamanoMerge branch 'sl/readme-gplv2' into maint
2012-12-23 Junio C HamanoMerge branch 'jc/fetch-tags-doc' into maint
2012-12-23 Junio C HamanoMerge branch 'nd/index-format-doc' into maint
2012-12-23 Junio C HamanoMerge branch 'jk/mailmap-cleanup' into maint
2012-12-23 Junio C HamanoMerge branch 'ta/doc-cleanup' into maint
2012-12-21 Junio C HamanoMerge branch 'jc/doc-diff-blobs'
2012-12-21 Junio C HamanoMerge branch 'cr/doc-checkout-branch'
2012-12-21 Junio C HamanoMerge branch 'ta/api-index-doc'
2012-12-21 Junio C HamanoMerge branch 'jk/avoid-mailto-invalid-in-doc'
2012-12-21 Junio C HamanoMerge branch 'as/doc-for-devs'
2012-12-21 Junio C HamanoMerge branch 'sl/readme-gplv2'
2012-12-21 Junio C HamanoMerge branch 'jc/fetch-tags-doc'
2012-12-21 Junio C HamanoMerge branch 'nd/index-format-doc'
2012-12-21 Junio C HamanoMerge branch 'jk/mailmap-cleanup'
2012-12-18 Junio C HamanoMerge branch 'maint'
2012-12-18 Junio C HamanoSync with 'maint'
2012-12-13 Junio C HamanoMerge branch 'maint'
2012-12-12 Junio C HamanoMerge branch 'so/prompt-command'
2012-12-11 Junio C HamanoMerge branch 'ef/mingw-rmdir'
2012-12-11 Junio C HamanoMerge branch 'maint'
2012-12-10 Junio C HamanoSync with 1.8.0.2
2012-12-07 Junio C HamanoMerge branch 'maint'
2012-12-04 Junio C HamanoMerge branch 'mm/status-push-pull-advise'
2012-12-03 Junio C HamanoMerge branch 'mm/status-push-pull-advise'
2012-11-29 Junio C HamanoMerge branch 'lt/diff-stat-show-0-lines'
2012-11-29 Junio C HamanoMerge branch 'fc/remote-hg'
2012-11-29 Junio C HamanoMerge branch 'mk/complete-tcsh'
2012-11-29 Junio C HamanoMerge branch 'jc/doc-push-satellite'
2012-11-29 Junio C HamanoMerge branch 'jk/send-email-sender-prompt'
2012-11-29 Junio C HamanoMerge branch 'fc/send-email-no-sender-prompt'
2012-11-29 Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-29 Junio C HamanoMerge branch 'pp/gitweb-config-underscore'
2012-11-29 Junio C HamanoMerge branch 'fc/completion-test-simplification'
2012-11-29 Junio C HamanoMerge branch 'maint'
2012-11-28 Junio C HamanoMerge branch 'maint'
2012-11-28 Junio C HamanoMerge branch 'fc/zsh-completion'
2012-11-28 Junio C HamanoMerge branch 'mm/status-push-pull-advise'
2012-11-28 Junio C HamanoMerge branch 'jk/pickaxe-textconv'
2012-11-27 Junio C HamanoMerge branch 'maint'
2012-11-26 Junio C HamanoMerge branch 'maint'
2012-11-26 Junio C HamanoMerge branch 'rr/submodule-diff-config'
2012-11-26 Junio C HamanoMerge branch 'nd/maint-compat-fnmatch-fix'
2012-11-26 Junio C HamanoMerge branch 'bc/do-not-recurse-in-die'
2012-11-26 Junio C HamanoMerge branch 'mk/complete-tcsh'
2012-11-26 Junio C HamanoMerge branch 'jh/update-ref-d-through-symref'
2012-11-26 Junio C HamanoMerge branch 'lt/diff-stat-show-0-lines'
2012-11-26 Junio C HamanoMerge branch 'sg/complete-help-undup'
2012-11-26 Junio C HamanoSync with 1.8.0.1
2012-11-21 Junio C HamanoMerge branch 'esr/maint-doc-fast-import'
2012-11-21 Junio C HamanoMerge branch 'wtk/submodule-doc-fixup'
2012-11-21 Junio C HamanoMerge branch 'so/prompt-command'
2012-11-21 Junio C HamanoMerge branch 'jk/config-ignore-duplicates'
2012-11-21 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20 Junio C HamanoMerge branch 'ml/cygwin-mingw-headers'
2012-11-20 Junio C HamanoMerge branch 'jk/checkout-out-of-unborn'
2012-11-20 Junio C HamanoMerge branch 'cn/config-missing-path'
2012-11-20 Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-20 Junio C HamanoMerge branch 'mg/replace-resolve-delete'
2012-11-20 Junio C HamanoMerge branch 'jk/maint-gitweb-xss'
2012-11-20 Junio C HamanoMerge branch 'rh/maint-gitweb-highlight-ext'
2012-11-20 Junio C HamanoMerge branch 'pw/maint-p4-rcs-expansion-newline'
2012-11-20 Junio C HamanoMerge branch 'mh/alt-odb-string-list-cleanup'
2012-11-20 Junio C HamanoMerge branch 'ta/doc-cleanup'
2012-10-18 Thomas AckermannDocumentation/howto: convert plain text files to asciidoc
2012-10-17 Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15 Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12 Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-08-24 Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
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-07-24 Junio C HamanoMerge branch 'jn/block-sha1'
2012-07-22 Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-07-16 Junio C HamanoMerge branch 'tg/maint-cache-name-compare'
2012-07-16 Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11 Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25 Junio C HamanoMerge branch 'lp/no-cmd-http-fetch'
2012-06-17 Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-04-26 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Junio C HamanoMerge branch 'pt/gitk'
2012-03-24 Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-02-27 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2011-12-28 Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-22 Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init'
next