Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2010-08-06	merge-recursive --renormalize	blob \| diff \| raw
2010-08-06	ll-merge: let caller decide whether to renormalize	blob \| diff \| raw \| diff to current
2010-08-06	ll-merge: make flag easier to populate	blob \| diff \| raw \| diff to current
2010-08-06	merge-trees: let caller decide whether to renormalize	blob \| diff \| raw \| diff to current
2010-08-06	merge-trees: push choice to renormalize away from low...	blob \| diff \| raw \| diff to current
2010-07-02	Try normalizing files to avoid delete/modify conflicts...	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'pb/maint-perl-errmsg-no-dir'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'tr/send-email-8bit'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'js/maint-am-rebase-invalid-author'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jc/maint-simpler-common-prefix'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'bd/maint-unpack-trees-parawalk-fix'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jc/rev-list-ancestry-path'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'ic/maint-rebase-i-abort' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'cc/maint-commit-reflog-msg' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jk/maint-advice-empty-amend' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'tc/commit-abbrev-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jn/document-rebase-i-p-limitation' into...	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jn/checkout-doc' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'cc/maint-diff-CC-binary' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jc/t9129-any-utf8' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'cb/ls-files-cdup' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'tc/merge-m-log' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'ph/clone-message-reword' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jn/maint-amend-missing-name' into maint	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'pc/remove-warn' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'js/maint-receive-pack-symref-alias'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'cc/maint-commit-reflog-msg'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'ic/maint-rebase-i-abort'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'jk/maint-advice-empty-amend'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'eb/core-eol'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'fg/autocrlf'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'jn/document-rebase-i-p-limitation'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'tc/commit-abbrev-fix'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'tr/receive-pack-aliased-update-fix'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'js/async-thread'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'gv/portable'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'jn/gitweb-fastcgi'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'jn/checkout-doc'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'cb/assume-unchanged-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'rs/diff-no-minimal' into maint	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'bg/apply-blank-trailing-context' into...	blob \| diff \| raw \| diff to current
2010-06-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'cc/maint-diff-CC-binary'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'cb/ls-files-cdup'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'jc/t9129-any-utf8'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'ab/maint-perl-use-instlibdir'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'rc/ls-remote-default'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'hg/id-munging'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'tc/merge-m-log'	blob \| diff \| raw \| diff to current
2010-06-18	Merge branch 'ph/clone-message-reword'	blob \| diff \| raw \| diff to current
2010-06-17	Merge 'maint' updates in	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cw/maint-exec-defpath' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sc/http-late-auth' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cb/maint-stash-orphaned-file' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/maint-bundle' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rr/doc-submitting' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/t7006-fixup' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/shortlog' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/index-pack-memsave' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-dumb-http-pack-reidx' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jc/am-3-show-corrupted-patch' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/malloc-threading' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'bg/send-email-smtpdomain' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rc/maint-curl-helper' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'hg/maint-attr-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'mh/status-optionally-refresh' into maint	blob \| diff \| raw \| diff to current
2010-06-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'mc/maint-zoneparse'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/diff-m-doc'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/maint-doc-ignore'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/fsck-ident'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'bs/userdiff-php'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/maint-sha1-file-name-fix'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/maint-pull-dry-run-noop'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/gitweb-syntax-highlight'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'js/maint-windows'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'bw/diff-metainfo-color'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'js/try-to-free-stackable'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/make-header-dependency'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'cb/assume-unchanged-fix'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/notes-doc'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'wp/pretty-enhancement'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'ab/test-cleanup'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/maint-amend-missing-name'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'rs/diff-no-minimal'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-01	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-28	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'by/blame-doc-m-c'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'by/log-follow'	blob \| diff \| raw \| diff to current
next