Andrew's git / gitweb.git / history
?
pull: check if in unresolved merge state
[gitweb.git] / git-cvsimport.perl
2015-06-05 Sync with 2.4.3 blob | diff | raw
2015-06-05 Merge branch 'ld/p4-editor-multi-words' blob | diff | raw
2015-06-05 Merge branch 'jk/at-push-sha1' blob | diff | raw
2015-06-01 Merge branch 'sb/test-bitmap-free-at-end' blob | diff | raw
2015-06-01 Merge branch 'mm/rebase-i-post-rewrite-exec' blob | diff | raw
2015-06-01 Merge branch 'fm/fetch-raw-sha1' blob | diff | raw
2015-06-01 Merge branch 'sg/help-group' blob | diff | raw
2015-06-01 Merge branch 'mm/log-format-raw-doc' blob | diff | raw
2015-06-01 Merge branch 'dt/cat-file-follow-symlinks' blob | diff | raw
2015-06-01 Merge branch 'rs/janitorial' blob | diff | raw
2015-06-01 Merge branch 'jk/stash-options' blob | diff | raw
2015-06-01 Merge branch 'da/mergetool-winmerge' blob | diff | raw
2015-06-01 Merge branch 'mc/commit-doc-grammofix' blob | diff | raw
2015-06-01 Merge branch 'jh/filter-empty-contents' blob | diff | raw
2015-06-01 Merge branch 'ah/usage-strings' blob | diff | raw
2015-06-01 Merge branch 'jk/http-backend-deadlock' blob | diff | raw
2015-06-01 Merge branch 'dt/clean-pathspec-filter-then-lstat' blob | diff | raw
2015-05-27 Merge branch 'nd/untracked-cache' blob | diff | raw
2015-05-26 Sync with 2.4.2 blob | diff | raw
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into... blob | diff | raw | diff to current
2015-05-26 Merge branch 'nd/untracked-cache' blob | diff | raw
2015-05-26 Merge branch 'rs/plug-leak-in-pack-bitmaps' blob | diff | raw
2015-05-26 Merge branch 'pt/pull-ff-vs-merge-ff' blob | diff | raw
2015-05-26 Merge branch 'pt/pull-log-n' blob | diff | raw
2015-05-26 Merge branch 'jk/rerere-forget-check-enabled' blob | diff | raw
2015-05-22 Merge branch 'ps/doc-packfile-vs-pack-file' blob | diff | raw
2015-05-22 Merge branch 'sb/t1020-cleanup' blob | diff | raw
2015-05-22 Merge branch 'lm/squelch-bg-progress' blob | diff | raw
2015-05-22 Merge branch 'jc/ignore-epipe-in-filter' blob | diff | raw
2015-05-22 Merge branch 'mh/clone-verbosity-fix' blob | diff | raw
2015-05-22 Merge branch 'pt/pull-tags-error-diag' blob | diff | raw
2015-05-22 Merge branch 'mh/lockfile-retry' blob | diff | raw
2015-05-22 Merge branch 'jk/add-e-kill-editor' blob | diff | raw
2015-05-22 Merge branch 'sg/completion-config' blob | diff | raw
2015-05-22 Merge branch 'mh/ref-directory-file' blob | diff | raw
2015-05-22 Merge branch 'mh/write-refs-sooner-2.4' blob | diff | raw
2015-05-22 Merge branch 'mg/log-decorate-HEAD' blob | diff | raw
2015-05-22 Merge branch 'jk/asciidoc-markup-fix' blob | diff | raw
2015-05-22 Merge branch 'jk/stripspace-asciidoctor-fix' blob | diff | raw
2015-05-22 Merge branch 'ja/tutorial-asciidoctor-fix' blob | diff | raw
2015-05-22 Merge branch 'sg/help-subcommands' blob | diff | raw
2015-05-22 Merge branch 'ps/bundle-verify-arg' blob | diff | raw
2015-05-22 Merge branch 'ls/http-ssl-cipher-list' blob | diff | raw
2015-05-22 Merge branch 'dl/subtree-avoid-tricky-echo' blob | diff | raw
2015-05-22 Merge branch 'jk/skip-http-tests-under-no-curl' blob | diff | raw
2015-05-22 Merge branch 'dl/subtree-push-no-squash' blob | diff | raw
2015-05-22 Merge branch 'sg/completion-omit-credential-helpers' blob | diff | raw
2015-05-22 Merge branch 'dl/branch-error-message' blob | diff | raw
2015-05-19 Merge branch 'sb/ref-lock-lose-lock-fd' blob | diff | raw
2015-05-19 Merge branch 'kn/cat-file-literally' blob | diff | raw
2015-05-19 Merge branch 'nd/dwim-wildcards-as-pathspecs' blob | diff | raw
2015-05-19 Merge branch 'jc/merge' blob | diff | raw
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into... blob | diff | raw | diff to current
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long' blob | diff | raw | diff to current
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report' blob | diff | raw | diff to current
2015-04-29 merge: deprecate 'git merge <message> HEAD <commit... blob | diff | raw
2015-04-28 Merge branch 'mg/show-notes-doc' blob | diff | raw | diff to current
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint blob | diff | raw | diff to current
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui blob | diff | raw | diff to current
2015-04-14 Merge branch 'sb/plug-streaming-leak' blob | diff | raw | diff to current
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix' blob | diff | raw | diff to current
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | diff | raw | diff to current
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | diff | raw | diff to current
2015-02-25 Merge branch 'tc/missing-http-proxyauth' blob | diff | raw | diff to current
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | diff | raw | diff to current
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into... blob | diff | raw | diff to current
2015-02-17 Merge branch 'jk/status-read-branch-name-fix' blob | diff | raw | diff to current
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | diff | raw | diff to current
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into... blob | diff | raw | diff to current
2015-01-07 Merge branch 'sb/t5400-remove-unused' blob | diff | raw | diff to current
2015-01-07 Merge branch 'pd/completion-filenames-fix' blob | diff | raw | diff to current
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date' blob | diff | raw | diff to current
2014-11-18 Merge branch 'jc/doc-commit-only' blob | diff | raw | diff to current
2014-10-30 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into... blob | diff | raw | diff to current
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix' blob | diff | raw | diff to current
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix' blob | diff | raw | diff to current
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix' blob | diff | raw | diff to current
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2014-06-27 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git blob | diff | raw | diff to current
2014-06-26 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | diff | raw | diff to current
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1' blob | diff | raw | diff to current
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into... blob | diff | raw | diff to current
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint blob | diff | raw | diff to current
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix' blob | diff | raw | diff to current
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree' blob | diff | raw | diff to current
2014-03-07 Merge branch 'jc/core-checkstat-2.0' blob | diff | raw | diff to current
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple' blob | diff | raw | diff to current
2014-02-27 Merge branch 'bs/stdio-undef-before-redef' blob | diff | raw | diff to current
2014-02-27 Merge branch 'jk/config-path-include-fix' blob | diff | raw | diff to current
2014-02-13 Merge branch 'jc/revision-range-unpeel' into maint blob | diff | raw | diff to current
2014-01-27 Merge branch 'jc/revision-range-unpeel' blob | diff | raw | diff to current
2014-01-23 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | diff | raw | diff to current
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into... blob | diff | raw | diff to current
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into... blob | diff | raw | diff to current
2013-12-09 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
next