projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
notes: implement helpers needed for note copying during rewrite
[git] / builtin-merge.c
2010-02-23  Junio C HamanoMerge branch 'il/rev-glob' blob | commitdiff | raw
2010-01-23  Junio C HamanoMerge branch 'jc/maint-limit-note-output' blob | commitdiff | raw
2010-01-23  Junio C HamanoMerge branch 'nd/ls-files-sparse-fix' blob | commitdiff | raw
2010-01-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'bw/cvsimport' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'jc/checkout-merge-base' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'ag/patch-header-verify' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'jc/conflict-marker-size' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'ag/maint-apply-too-large-p' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'ap/merge-backend-opts' blob | commitdiff | raw
2010-01-21  Junio C HamanoMerge branch 'nd/status-partial-refresh' blob | commitdiff | raw | diff to current
2010-01-21  Junio C HamanoMerge remote branch 'remotes/trast-doc/for-next' blob | commitdiff | raw | diff to current
2010-01-21  Junio C HamanoMerge branch 'jh/notes' (early part) blob | commitdiff | raw | diff to current
2010-01-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'rr/core-tutorial' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/cache-unmerge' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'js/exec-error-report' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/ls-files-ignored-pathspec' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/grep-lookahead' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/maint-strbuf-add-fix-doubling' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'mm/conflict-advice' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'da/difftool' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'mh/rebase-fixup' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'ns/rebase-auto-squash' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'mh/rebase-fixup' (early part) blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'il/push-set-upstream' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jk/warn-author-committer-after-commit' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/ident' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'tr/http-push-ref-status' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'bk/fix-relative-gitdir-file' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'sd/cd-p-show-toplevel' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jc/symbol-static' blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoSync with 1.6.6.1 blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'bg/maint-remote-update-default' into... blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'sb/maint-octopus' into maint blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'bg/maint-add-all-doc' into maint blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'maint-1.6.5' into maint blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard' into maint... blob | commitdiff | raw | diff to current
2010-01-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5 blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.3' into maint-1.6.4 blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3 blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'dp/maint-1.6.5-fast-import-non-commit... blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'jc/rerere' blob | commitdiff | raw | diff to current
2010-01-19  Junio C HamanoMerge branch 'jm/maint-1.6.5-grep-NUL-terminate' into... blob | commitdiff | raw | diff to current
2010-01-18  Junio C HamanoMake "subtree" part more orthogonal to the rest of... blob | commitdiff | raw | diff to current
2010-01-18  Avery Pennarungit merge -X<option> blob | commitdiff | raw | diff to current
2010-01-18  Junio C HamanoMerge branch 'jh/commit-status' blob | commitdiff | raw | diff to current
2010-01-17  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge' blob | commitdiff | raw | diff to current
2010-01-17  Junio C HamanoMerge branch 'sr/gfi-options' blob | commitdiff | raw | diff to current
2010-01-13  Junio C HamanoMerge branch 'jc/checkout-merge-base' blob | commitdiff | raw | diff to current
2010-01-13  Junio C HamanoMerge branch 'il/vcs-helper' blob | commitdiff | raw | diff to current
2010-01-13  Junio C HamanoMerge branch 'nd/sparse' blob | commitdiff | raw | diff to current
2010-01-12  Matthieu MoyBe more user-friendly when refusing to do something... blob | commitdiff | raw | diff to current
2010-01-12  Junio C HamanoMerge branch 'jc/maint-1.6.4-grep-lookahead' into jc... blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'tr/http-updates' blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard' blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'tr/maint-1.6.5-bash-prompt-show-submodule... blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'bg/maint-remote-update-default' blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'mm/diag-path-in-treeish' blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'fc/opt-quiet-gc-reset' blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.2' into maint blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2 blob | commitdiff | raw | diff to current
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2010-01-07  Junio C HamanoMerge branch 'js/filter-branch-prime' blob | commitdiff | raw | diff to current
2010-01-07  Junio C HamanoMerge branch 'sb/maint-octopus' blob | commitdiff | raw | diff to current
2010-01-07  Junio C HamanoMerge branch 'bg/maint-add-all-doc' blob | commitdiff | raw | diff to current
2010-01-07  Junio C HamanoMerge branch 'mv/commit-date' blob | commitdiff | raw | diff to current
2010-01-07  Junio C HamanoMerge branch 'mo/bin-wrappers' blob | commitdiff | raw | diff to current
2009-12-31  Junio C HamanoMerge branch 'maint-1.6.0' into maint blob | commitdiff | raw | diff to current
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-12-28  Junio C HamanoMerge branch 'jk/1.7.0-status' blob | commitdiff | raw | diff to current
2009-12-27  Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into... blob | commitdiff | raw | diff to current
2009-12-26  Junio C HamanoMerge branch 'gb/1.7.0-diff-whitespace-only-output' blob | commitdiff | raw | diff to current
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-diff-whitespace-only-status' blob | commitdiff | raw | diff to current
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-push-safety' blob | commitdiff | raw | diff to current
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-send-email-no-thread-default' blob | commitdiff | raw | diff to current
2009-12-26  Junio C HamanoMerge branch 'sr/vcs-helper' blob | commitdiff | raw | diff to current
2009-12-26  Junio C Hamanoresolve-undo: record resolved conflicts in a new index... blob | commitdiff | raw | diff to current
2009-12-26  Junio C Hamanobuiltin-merge.c: use standard active_cache macros blob | commitdiff | raw | diff to current
2009-12-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-12-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-12-16  Junio C HamanoMerge branch 'maint' to sync with 1.6.5.7 blob | commitdiff | raw | diff to current
2009-12-11  Junio C HamanoSync with 1.6.5.6 blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'... blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge branch 'jn/maint-pull-rebase-error-message' into... blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge branch 'jk/maint-add-p-delete-fix' into maint blob | commitdiff | raw | diff to current
2009-12-09  Junio C HamanoMerge git://git.bogomips.org/git-svn blob | commitdiff | raw | diff to current
2009-12-08  Junio C HamanoRevert recent "git merge <msg> HEAD <commit>..." deprec... blob | commitdiff | raw | diff to current
2009-12-07  Junio C HamanoMerge branch 'master' into il/vcs-helper blob | commitdiff | raw | diff to current
2009-12-05  Junio C HamanoSync with 1.6.5.5 blob | commitdiff | raw | diff to current
2009-12-04  Junio C HamanoTeach --[no-]rerere-autoupdate option to merge, revert... blob | commitdiff | raw | diff to current
2009-12-03  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-12-03  Junio C HamanoMerge branch 'uk/maint-shortlog-encoding' into maint blob | commitdiff | raw | diff to current
2009-12-03  Junio C HamanoMerge branch 'fc/maint-format-patch-pathspec-dashes... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.