Merge branch 'pc/remove-warn' into maint
[git/git.git] / merge-recursive.c
2010-06-22 Junio C HamanoMerge branch 'pc/remove-warn' into maint
2010-06-21 Junio C HamanoMerge branch 'cb/assume-unchanged-fix' into maint
2010-06-21 Junio C HamanoMerge branch 'rs/diff-no-minimal' into maint
2010-06-21 Junio C HamanoMerge branch 'bg/apply-blank-trailing-context' into...
2010-06-16 Junio C HamanoMerge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Junio C HamanoMerge branch 'sc/http-late-auth' into maint
2010-06-16 Junio C HamanoMerge branch 'cb/maint-stash-orphaned-file' into maint
2010-06-16 Junio C HamanoMerge branch 'jn/maint-bundle' into maint
2010-06-16 Junio C HamanoMerge branch 'rr/doc-submitting' into maint
2010-06-16 Junio C HamanoMerge branch 'jn/t7006-fixup' into maint
2010-06-16 Junio C HamanoMerge branch 'jn/shortlog' into maint
2010-06-16 Junio C HamanoMerge branch 'np/index-pack-memsave' into maint
2010-06-16 Junio C HamanoMerge branch 'sp/maint-dumb-http-pack-reidx' into maint
2010-06-16 Junio C HamanoMerge branch 'jc/am-3-show-corrupted-patch' into maint
2010-06-16 Junio C HamanoMerge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Junio C HamanoMerge branch 'np/malloc-threading' into maint
2010-06-16 Junio C HamanoMerge branch 'bg/send-email-smtpdomain' into maint
2010-06-16 Junio C HamanoMerge branch 'rc/maint-curl-helper' into maint
2010-06-16 Junio C HamanoMerge branch 'hg/maint-attr-fix' into maint
2010-06-16 Junio C HamanoMerge branch 'mh/status-optionally-refresh' into maint
2010-06-01 Junio C HamanoMerge branch 'maint-1.7.0' into maint
2010-05-28 Junio C HamanoMerge branch 'maint-1.7.0' into maint
2010-05-04 Junio C HamanoMerge branch 'maint-1.7.0' into maint
2010-05-02 Junio C HamanoMerge branch 'maint'
2010-04-24 Junio C HamanoMerge branch 'maint'
2010-04-23 Junio C HamanoSync with 1.7.0.6
2010-04-23 Junio C HamanoMerge branch 'jk/maint-diffstat-overflow' into maint
2010-04-22 Junio C HamanoMerge branch 'maint'
2010-04-20 Junio C HamanoMerge branch 'maint'
2010-04-19 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-04-19 Junio C HamanoMerge branch 'wp/doc-filter-direction'
2010-04-19 Junio C HamanoMerge branch 'jk/maint-diffstat-overflow'
2010-04-19 Junio C HamanoMerge branch 'maint'
2010-04-19 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17 Junio C HamanoMerge branch 'maint'
2010-04-14 Junio C HamanoMerge branch 'maint'
2010-04-11 Junio C HamanoMerge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Junio C HamanoSync with 1.7.0.5
2010-04-11 Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Junio C HamanoMerge branch 'mr/gitweb-jsmin'
2010-04-10 Junio C HamanoMerge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Junio C HamanoMerge branch 'maint'
2010-04-10 Junio C HamanoMerge branch 'jc/conflict-marker-size' into maint
2010-04-10 Junio C HamanoMerge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-09 Junio C HamanoMerge early parts of jk/cached-textconv
2010-04-09 Junio C HamanoMerge branch 'maint'
2010-04-07 Junio C HamanoMerge branch 'mg/notes-reflog'
2010-04-07 Junio C HamanoMerge branch 'jn/mailinfo-scissors'
2010-04-06 Junio C HamanoMerge branch 'da/maint-python-startup'
2010-04-06 Junio C HamanoMerge branch 'ic/bash-completion-rpm'
2010-04-06 Junio C HamanoMerge branch 'sb/fmt-merge-msg'
2010-04-06 Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-04-06 Junio C HamanoMerge branch 'ef/maint-empty-commit-log'
2010-04-06 Junio C HamanoMerge branch 'sg/bash-completion'
2010-04-04 Junio C HamanoMerge branch 'maint'
2010-04-03 Junio C HamanoMerge branch 'mb/rebase-i-no-ff'
2010-04-03 Junio C HamanoMerge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-03 Junio C HamanoMerge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 Junio C HamanoMerge branch 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03 Junio C HamanoMerge branch 'mg/maint-send-email-lazy-editor'
2010-04-03 Junio C HamanoMerge branch 'rb/maint-python-path'
2010-04-03 Junio C HamanoMerge branch 'jn/merge-diff3-label'
2010-04-03 Junio C HamanoMerge branch 'mg/mailmap-update'
2010-04-03 Junio C HamanoMerge branch 'gh/maint-stash-show-error-message'
2010-04-03 Junio C HamanoMerge branch 'bc/maint-daemon-sans-ss-family'
2010-03-31 Junio C HamanoSync with 1.7.0.4
2010-03-31 Junio C HamanoMerge branch 'jc/maint-refs-dangling' into maint
2010-03-30 Junio C HamanoMerge branch 'maint'
2010-03-29 Junio C HamanoMerge branch 'sb/notes-parse-opt'
2010-03-29 Junio C HamanoMerge branch 'maint'
2010-03-29 Junio C HamanoMerge branch 'cp/add-u-pathspec' into maint
2010-03-29 Junio C HamanoMerge branch 'maint'
2010-03-28 Peter CollingbourneRemove a redundant errno test in a usage of remove_path
2010-03-24 Junio C HamanoMerge branch 'jh/maint-submodule-status-in-void'
2010-03-24 Junio C HamanoMerge branch 'tr/notes-display'
2010-03-24 Junio C HamanoMerge branch 'jl/submodule-diff-dirtiness'
2010-03-24 Junio C HamanoMerge branch 'pb/log-first-parent-p-m'
2010-03-24 Junio C HamanoMerge branch 'jc/maint-refs-dangling'
2010-03-24 Junio C HamanoMerge branch 'maint'
2010-03-24 Junio C HamanoMerge branch 'jc/color-attrs' into maint
2010-03-24 Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' into maint
2010-03-22 Junio C HamanoSync with Git 1.7.0.3
2010-03-22 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-03-21 Jonathan Niedermerge-recursive: add a label for ancestor
2010-03-21 Jonathan Niedermerge_trees(): add ancestor label parameter for diff3...
2010-03-21 Jonathan Niederll_merge(): add ancestor label parameter for diff3...
2010-03-20 Junio C HamanoMerge branch 'jk/maint-add-ignored-dir'
2010-03-20 Junio C HamanoMerge branch 'ml/color-grep'
2010-03-20 Junio C HamanoMerge branch 'jc/color-attrs'
2010-03-20 Junio C HamanoMerge branch 'cc/reset-keep'
2010-03-20 Junio C HamanoMerge branch 'fl/askpass'
2010-03-20 Junio C HamanoMerge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Junio C HamanoMerge branch 'bw/union-merge-refactor'
2010-03-20 Junio C HamanoMerge branch 'maint'
2010-03-17 Junio C HamanoMerge branch 'maint'
2010-03-17 Junio C HamanoMerge branch 'maint'
2010-03-15 Junio C HamanoMerge branch 'sd/format-patch-to'
2010-03-15 Junio C HamanoMerge branch 'tc/http-cleanup'
2010-03-15 Junio C HamanoMerge branch 'tc/transport-verbosity'
next