projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Sync with 1.7.5.3
[git] / builtin / merge.c
2011-05-26  Junio C HamanoSync with 1.7.5.3 blob | commitdiff | raw
2011-05-26  Junio C HamanoMerge branch 'maint-1.7.4' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'mg/diff-uiconfig-doc' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'ft/gitweb-tar-with-gzip-n' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'ss/doc-svn' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jn/format-patch-doc' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jc/maint-pathspec-stdin-and-cmdline'... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jk/cherry-pick-root-with-resolve' into... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'fc/completion-zsh' into maint blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | commitdiff | raw | diff to current
2011-05-26  Junio C HamanoMerge branch 'svn-fe-maint' of git://repo.or.cz/git... blob | commitdiff | raw | diff to current
2011-05-25  Junio C HamanoMerge branch 'jc/bigfile' blob | commitdiff | raw
2011-05-25  Junio C HamanoMerge branch 'js/log-abbrev-commit-config' blob | commitdiff | raw
2011-05-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'tr/add-i-no-escape' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'js/mingw-shutdown' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'ms/ls-remote-exit-with-status' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'mg/config-symbolic-constants' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'ab/i18n-scripts-basic' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'jc/magic-pathspec' blob | commitdiff | raw
2011-05-23  Junio C HamanoMerge branch 'jk/blame-line-porcelain' blob | commitdiff | raw
2011-05-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'rg/copy-gecos-username' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jl/submodule-conflicted-gitmodules' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jc/replacing' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'nd/sparse-co-fix' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'ld/p4-preserve-user-names' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'ms/tagname-does-not-begin-with-dash' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jk/cherry-pick-root-with-resolve' blob | commitdiff | raw
2011-05-20  Junio C HamanoMerge branch 'jc/maint-pathspec-stdin-and-cmdline' blob | commitdiff | raw | diff to current
2011-05-20  Junio C HamanoMerge 1.7.5.2 in blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jc/convert' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'ci/commit--interactive-atomic' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'sg/completion-updates' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'mg/merge-ff-config' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jn/maint-format-patch-doc' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'ss/cherry-pick-x-doc' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'vr/merge-base-doc' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsi... blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha... blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jn/gitweb-dependency' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into maint blob | commitdiff | raw | diff to current
2011-05-16  Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks' into... blob | commitdiff | raw | diff to current
2011-05-16  Jeff Kingcherry-pick: handle root commits with external strategies blob | commitdiff | raw | diff to current
2011-05-15  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-05-15  Junio C HamanoMerge branch 'jk/format-patch-quote-special-in-from... blob | commitdiff | raw | diff to current
2011-05-15  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'bf/commit-template-no-cleanup' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'rr/rerere-libify-clear-gc' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jh/dirstat-lines' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jn/setup-revisions-glob-and-friends-passthru' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'cn/log-parse-opt' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'aw/maint-rebase-i-p-no-ff' into maint blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'gr/cvsimport-alternative-cvspass-location... blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree' into... blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged' into maint blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'mz/maint-rename-unmerged' into maint blob | commitdiff | raw | diff to current
2011-05-13  Junio C HamanoMerge branch 'nd/struct-pathspec' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jn/gitweb-dependency' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jn/maint-test-merge-verify-parents' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'vh/config-interactive-singlekey-doc' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsing' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'dm/http-cleanup' blob | commitdiff | raw | diff to current
2011-05-11  Junio C HamanoMerge branch 'jn/ctags' blob | commitdiff | raw | diff to current
2011-05-10  Junio C HamanoMerge branch 'fc/completion-zsh' into sg/completion... blob | commitdiff | raw | diff to current
2011-05-06  Junio C Hamanomerge: introduce merge.ff configuration variable blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into mg... blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'jn/run-command-error-failure' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'js/info-man-path' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'im/hashcmp-optim' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'cj/p4merge' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'gr/cvsimport-alternative-cvspass-location' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'sg/completion-cleanup' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'js/blame-parsename' blob | commitdiff | raw | diff to current
2011-05-06  Junio C HamanoMerge branch 'jk/format-patch-quote-special-in-from' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.