projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'maint'
[git] / merge-recursive.c
2010-04-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-04-07  Junio C HamanoMerge branch 'mg/notes-reflog' blob | commitdiff | raw
2010-04-07  Junio C HamanoMerge branch 'jn/mailinfo-scissors' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'da/maint-python-startup' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'ic/bash-completion-rpm' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'sb/fmt-merge-msg' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'jc/conflict-marker-size' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'ef/maint-empty-commit-log' blob | commitdiff | raw
2010-04-06  Junio C HamanoMerge branch 'sg/bash-completion' blob | commitdiff | raw
2010-04-04  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mb/rebase-i-no-ff' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'sp/maint-http-backend-die-triggers-die... blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'rr/imap-send-unconfuse-from-line' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mg/use-default-abbrev-length-in-rev-list' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mg/maint-send-email-lazy-editor' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'rb/maint-python-path' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'jn/merge-diff3-label' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mg/mailmap-update' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'gh/maint-stash-show-error-message' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'bc/maint-daemon-sans-ss-family' blob | commitdiff | raw | diff to current
2010-03-31  Junio C HamanoSync with 1.7.0.4 blob | commitdiff | raw | diff to current
2010-03-31  Junio C HamanoMerge branch 'jc/maint-refs-dangling' into maint blob | commitdiff | raw | diff to current
2010-03-30  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'sb/notes-parse-opt' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'cp/add-u-pathspec' into maint blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jh/maint-submodule-status-in-void' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'tr/notes-display' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jl/submodule-diff-dirtiness' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'pb/log-first-parent-p-m' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jc/maint-refs-dangling' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jc/color-attrs' into maint blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' into maint blob | commitdiff | raw | diff to current
2010-03-22  Junio C HamanoSync with Git 1.7.0.3 blob | commitdiff | raw | diff to current
2010-03-22  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-21  Jonathan Niedermerge-recursive: add a label for ancestor blob | commitdiff | raw
2010-03-21  Jonathan Niedermerge_trees(): add ancestor label parameter for diff3... blob | commitdiff | raw | diff to current
2010-03-21  Jonathan Niederll_merge(): add ancestor label parameter for diff3... blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'ml/color-grep' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'jc/color-attrs' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'cc/reset-keep' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'fl/askpass' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'bg/apply-fix-blank-at-eof' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'bw/union-merge-refactor' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-15  Junio C HamanoMerge branch 'sd/format-patch-to' blob | commitdiff | raw | diff to current
2010-03-15  Junio C HamanoMerge branch 'tc/http-cleanup' blob | commitdiff | raw | diff to current
2010-03-15  Junio C HamanoMerge branch 'tc/transport-verbosity' blob | commitdiff | raw | diff to current
2010-03-15  Junio C HamanoMerge branch 'ld/push-porcelain' blob | commitdiff | raw | diff to current
2010-03-15  Junio C HamanoMerge branch 'jh/notes' blob | commitdiff | raw | diff to current
2010-03-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-10  Junio C HamanoMerge branch 'sd/init-template' blob | commitdiff | raw | diff to current
2010-03-10  Junio C HamanoMerge branch 'sh/am-keep-cr' blob | commitdiff | raw | diff to current
2010-03-10  Junio C HamanoMerge branch 'cp/add-u-pathspec' blob | commitdiff | raw | diff to current
2010-03-10  Junio C HamanoMerge branch 'lt/deepen-builtin-source' blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint... blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'rs/optim-text-wrap' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint... blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'cc/maint-bisect-paths' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'mw/maint-gcc-warns-unused-write' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'as/maint-expire' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'ml/maint-grep-doc' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'gb/maint-submodule-env' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'ne/pack-local-doc' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'mb/shortlog-nongit-stdin' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jc/fetch-param' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'il/loosen-remote-helper-names' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'nd/root-git' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'js/runtime-prefix-trace-not-warn' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'mm/mkstemps-mode-for-packfiles' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jc/maint-fix-mailinfo-strip' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoSync with 1.7.0.2 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'rs/optim-text-wrap' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'cc/maint-bisect-paths' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-03  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-03  Junio C HamanoMerge branch 'jh/maint-submodule-status-in-void' (early... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.