projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / git-pull.sh
2010-09-08  Junio C HamanoMerge branch 'kf/askpass-config' blob | commitdiff | raw
2010-09-08  Junio C HamanoMerge branch 'bc/maint-fetch-url-only' blob | commitdiff | raw
2010-09-08  Junio C HamanoMerge branch 'jk/maint-pass-c-config-in-env' blob | commitdiff | raw
2010-09-08  Junio C HamanoMerge branch 'en/d-f-conflict-fix' blob | commitdiff | raw
2010-09-06  Junio C HamanoMerge branch 'jh/clean-exclude' blob | commitdiff | raw
2010-09-06  Junio C HamanoMerge branch 'xx/trivial' into maint blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'jl/submodule-ignore-diff' blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'ab/test-2' blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'js/detached-stash' blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'js/maint-reflog-beyond-horizon' blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'dg/local-mod-error-messages' blob | commitdiff | raw
2010-09-04  Junio C HamanoMerge branch 'nd/maint-fix-replace' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'ab/compat-regex' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'nd/clone-depth-zero' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/maint-doc-user-manual-html-doctype' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'cb/maint-mergetool-no-tty' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/apply-filename-with-sp' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/merge-custom-no-trivial' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jc/maint-doc-em-dash' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/doc-backslash' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/update-contrib-example-merge' blob | commitdiff | raw
2010-09-03  Junio C HamanoMerge branch 'jn/merge-renormalize' blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'gp/pack-refs-remove-empty-dirs' into... blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'sg/rerere-gc-old-still-used' into maint blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'np/maint-huge-delta-generation' into... blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'dj/fetch-tagopt' into maint blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'da/fix-submodule-sync-superproject-config... blob | commitdiff | raw
2010-09-01  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix' into maint blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'np/maint-huge-delta-generation' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'da/fix-submodule-sync-superproject-config' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'jn/cherry-revert-message-clean-up' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'cb/binary-patch-id' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'ab/maint-reset-mixed-w-pathspec-advice' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'dj/fetch-tagopt' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'en/d-f-conflict-fix' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'jn/svn-fe' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'tr/maint-no-unquote-plus' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'jn/paginate-fix' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'jn/maint-setup-fix' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'en/fast-export-fix' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'hv/autosquash-config' blob | commitdiff | raw
2010-08-31  Junio C HamanoMerge branch 'sg/rerere-gc-old-still-used' blob | commitdiff | raw
2010-08-30  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-08-26  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-08-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-08-23  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'mm/rebase-i-exec' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'gb/split-cmdline-errmsg' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'so/http-user-agent' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'mm/shortopt-detached' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'sr/local-config' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'nd/fix-sparse-checkout' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'hv/submodule-find-ff-merge' blob | commitdiff | raw
2010-08-22  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix' blob | commitdiff | raw
2010-08-19  Junio C HamanoMerge branch 'tr/xsize-bits' into maint blob | commitdiff | raw | diff to current
2010-08-19  Junio C HamanoMerge branch 'jc/sha1-name-find-fix' into maint blob | commitdiff | raw | diff to current
2010-08-18  Junio C HamanoMerge branch 'sp/fix-smart-http-deadlock-on-error'... blob | commitdiff | raw | diff to current
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits' blob | commitdiff | raw | diff to current
2010-08-13  Elijah Newrenpull --rebase: Avoid spurious conflicts and reapplying... blob | commitdiff | raw | diff to current
2010-08-13  Junio C HamanoMerge branch 'jc/sha1-name-find-fix' blob | commitdiff | raw | diff to current
2010-08-13  Junio C HamanoMerge branch 'sp/fix-smart-http-deadlock-on-error' blob | commitdiff | raw | diff to current
2010-08-03  Junio C HamanoMerge branch 'sv/maint-diff-q-clear-fix' into maint blob | commitdiff | raw | diff to current
2010-08-02  Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui blob | commitdiff | raw | diff to current
2010-07-27  Junio C HamanoSync with 1.7.0 series blob | commitdiff | raw | diff to current
2010-07-26  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1 blob | commitdiff | raw | diff to current
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.6' into maint-1.7.0 blob | commitdiff | raw | diff to current
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5 blob | commitdiff | raw | diff to current
2010-07-16  Junio C HamanoMerge branch 'jc/diff-merge-base-multi' blob | commitdiff | raw | diff to current
2010-07-15  Junio C HamanoMerge branch 'jc/diff-merge-base-multi' blob | commitdiff | raw | diff to current
2010-07-15  Junio C HamanoMerge branch 'jn/grep-open' blob | commitdiff | raw | diff to current
2010-07-09  Junio C HamanoMerge remote branch 'ko/master' into jc/read-tree-cache... blob | commitdiff | raw | diff to current
2010-07-07  Junio C HamanoMerge branch 'maint-1.6.4' into maint blob | commitdiff | raw | diff to current
2010-07-07  Junio C HamanoMerge branch 'tr/receive-pack-aliased-update-fix' into... blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'cc/cherry-pick-stdin' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'jl/status-ignore-submodules' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'jk/url-decode' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'jn/grep-open' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'jp/string-list-api-cleanup' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'tr/rev-list-count' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'as/maint-completion-set-u-fix' blob | commitdiff | raw | diff to current
2010-06-30  Junio C HamanoMerge branch 'jl/maint-diff-ignore-submodules' blob | commitdiff | raw | diff to current
2010-06-28  Junio C HamanoMerge branch 'tr/send-email-8bit' into maint blob | commitdiff | raw | diff to current
2010-06-28  Junio C HamanoMerge branch 'pb/maint-perl-errmsg-no-dir' into maint blob | commitdiff | raw | diff to current
2010-06-28  Junio C HamanoMerge branch 'js/maint-am-rebase-invalid-author' into... blob | commitdiff | raw | diff to current
2010-06-28  Junio C HamanoMerge branch 'jc/maint-simpler-common-prefix' into... blob | commitdiff | raw | diff to current
2010-06-28  Junio C HamanoMerge branch 'bd/maint-unpack-trees-parawalk-fix' into... blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'cp/textconv-cat-file' blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'pb/maint-perl-errmsg-no-dir' blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'tr/send-email-8bit' blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'js/maint-am-rebase-invalid-author' blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'ab/blame-textconv' blob | commitdiff | raw | diff to current
2010-06-27  Junio C HamanoMerge branch 'jn/show-num-walks' blob | commitdiff | raw | diff to current
2010-06-23  Junio C HamanoMerge branch 'jk/url-decode' blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'jc/maint-simpler-common-prefix' blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'bd/maint-unpack-trees-parawalk-fix' blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'cc/cherry-pick-series' blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'jc/rev-list-ancestry-path' blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'ic/maint-rebase-i-abort' into maint blob | commitdiff | raw | diff to current
2010-06-22  Junio C HamanoMerge branch 'cc/maint-commit-reflog-msg' into maint blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.