Andrew's git / gitweb.git / history
?
Merge branch 'ap/status-ignored-in-ignored-directory'
[gitweb.git] / Documentation / howto / revert-a-faulty-merge.txt
2012-12-13 Merge branch 'maint' blob | diff | raw
2012-12-12 Merge branch 'so/prompt-command' blob | diff | raw
2012-12-11 Merge branch 'ef/mingw-rmdir' blob | diff | raw
2012-12-11 Merge branch 'maint' blob | diff | raw
2012-12-10 Sync with 1.8.0.2 blob | diff | raw
2012-12-07 Merge branch 'maint' blob | diff | raw
2012-12-04 Merge branch 'mm/status-push-pull-advise' blob | diff | raw
2012-12-03 Merge branch 'mm/status-push-pull-advise' blob | diff | raw
2012-11-29 Merge branch 'lt/diff-stat-show-0-lines' blob | diff | raw
2012-11-29 Merge branch 'fc/remote-hg' blob | diff | raw
2012-11-29 Merge branch 'mk/complete-tcsh' blob | diff | raw
2012-11-29 Merge branch 'jc/doc-push-satellite' blob | diff | raw
2012-11-29 Merge branch 'jk/send-email-sender-prompt' blob | diff | raw
2012-11-29 Merge branch 'fc/send-email-no-sender-prompt' blob | diff | raw
2012-11-29 Merge branch 'jl/submodule-rm' blob | diff | raw
2012-11-29 Merge branch 'pp/gitweb-config-underscore' blob | diff | raw
2012-11-29 Merge branch 'fc/completion-test-simplification' blob | diff | raw
2012-11-29 Merge branch 'maint' blob | diff | raw
2012-11-28 Merge branch 'maint' blob | diff | raw
2012-11-28 Merge branch 'fc/zsh-completion' blob | diff | raw
2012-11-28 Merge branch 'mm/status-push-pull-advise' blob | diff | raw
2012-11-28 Merge branch 'jk/pickaxe-textconv' blob | diff | raw
2012-11-27 Merge branch 'maint' blob | diff | raw
2012-11-26 Merge branch 'maint' blob | diff | raw
2012-11-26 Merge branch 'rr/submodule-diff-config' blob | diff | raw
2012-11-26 Merge branch 'nd/maint-compat-fnmatch-fix' blob | diff | raw
2012-11-26 Merge branch 'bc/do-not-recurse-in-die' blob | diff | raw
2012-11-26 Merge branch 'mk/complete-tcsh' blob | diff | raw
2012-11-26 Merge branch 'jh/update-ref-d-through-symref' blob | diff | raw
2012-11-26 Merge branch 'lt/diff-stat-show-0-lines' blob | diff | raw
2012-11-26 Merge branch 'sg/complete-help-undup' blob | diff | raw
2012-11-26 Sync with 1.8.0.1 blob | diff | raw
2012-11-21 Merge branch 'esr/maint-doc-fast-import' blob | diff | raw
2012-11-21 Merge branch 'wtk/submodule-doc-fixup' blob | diff | raw
2012-11-21 Merge branch 'so/prompt-command' blob | diff | raw
2012-11-21 Merge branch 'jk/config-ignore-duplicates' blob | diff | raw
2012-11-21 Merge branch 'jk/maint-http-half-auth-fetch' blob | diff | raw
2012-11-20 Merge branch 'ml/cygwin-mingw-headers' blob | diff | raw
2012-11-20 Merge branch 'jk/checkout-out-of-unborn' blob | diff | raw
2012-11-20 Merge branch 'cn/config-missing-path' blob | diff | raw
2012-11-20 Merge branch 'jl/submodule-rm' blob | diff | raw
2012-11-20 Merge branch 'mg/replace-resolve-delete' blob | diff | raw
2012-11-20 Merge branch 'jk/maint-gitweb-xss' blob | diff | raw
2012-11-20 Merge branch 'rh/maint-gitweb-highlight-ext' blob | diff | raw
2012-11-20 Merge branch 'pw/maint-p4-rcs-expansion-newline' blob | diff | raw
2012-11-20 Merge branch 'mh/alt-odb-string-list-cleanup' blob | diff | raw
2012-11-20 Merge branch 'ta/doc-cleanup' blob | diff | raw
2012-10-18 Documentation/howto: convert plain text files to asciidoc blob | diff | raw
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint... blob | diff | raw | diff to current
2012-09-12 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2012-09-12 Merge branch 'da/gitk-reload-tag-contents' blob | diff | raw | diff to current
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11 blob | diff | raw | diff to current
2012-08-06 Merge branch 'jn/block-sha1' into maint blob | diff | raw | diff to current
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint blob | diff | raw | diff to current
2012-07-24 Merge branch 'jn/block-sha1' blob | diff | raw | diff to current
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'... blob | diff | raw | diff to current
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint blob | diff | raw | diff to current
2012-07-22 Merge branch 'ms/daemon-doc-typo' blob | diff | raw | diff to current
2012-07-16 Merge branch 'tg/maint-cache-name-compare' blob | diff | raw | diff to current
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths' blob | diff | raw | diff to current
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg... blob | diff | raw | diff to current
2012-06-25 Merge branch 'lp/no-cmd-http-fetch' blob | diff | raw | diff to current
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into... blob | diff | raw | diff to current
2012-06-12 Merge branch 'js/maint-fast-export-mark-error' blob | diff | raw | diff to current
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin... blob | diff | raw | diff to current
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin... blob | diff | raw | diff to current
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb... blob | diff | raw | diff to current
2012-04-02 Merge branch 'pt/gitk' blob | diff | raw | diff to current
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs... blob | diff | raw | diff to current
2012-03-16 Merge branch 'th/doc-diff-submodule-option' blob | diff | raw | diff to current
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into... blob | diff | raw | diff to current
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix' blob | diff | raw | diff to current
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint blob | diff | raw | diff to current
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init' blob | diff | raw | diff to current
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into... blob | diff | raw | diff to current
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into... blob | diff | raw | diff to current
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename blob | diff | raw | diff to current
2011-12-17 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2011-12-14 Merge branch 'jl/submodule-status-failure-report' blob | diff | raw | diff to current
2011-12-14 Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 blob | diff | raw | diff to current
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6 blob | diff | raw | diff to current
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused blob | diff | raw | diff to current
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk... blob | diff | raw | diff to current
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint blob | diff | raw | diff to current
2011-11-18 Merge branch 'ml/mailmap' into maint blob | diff | raw | diff to current
2011-11-12 Merge branch 'ly/mktree-using-strbuf' blob | diff | raw | diff to current
2011-11-10 Merge 'build-in git-mktree' blob | diff | raw | diff to current
2011-11-09 Merge branch 'jc/remote-setbranches-usage-fix' blob | diff | raw | diff to current
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix' blob | diff | raw | diff to current
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint blob | diff | raw | diff to current
2011-11-01 Merge branch 'md/smtp-tls-hello-again' into maint blob | diff | raw | diff to current
2011-10-26 Merge branch 'sn/doc-update-index-assume-unchanged... blob | diff | raw | diff to current
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref' blob | diff | raw | diff to current
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint blob | diff | raw | diff to current
2011-10-21 Merge branch 'js/maint-merge-one-file-osx-expr' into... blob | diff | raw | diff to current
2011-10-19 Merge branch 'js/log-show-children' blob | diff | raw | diff to current
2011-10-19 Merge branch 'cb/httpd-test-fix-port' blob | diff | raw | diff to current
2011-10-19 Merge branch 'md/smtp-tls-hello-again' blob | diff | raw | diff to current
next