Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2012-02-01	Merge branch 'tr/merge-edit-guidance'	blob \| diff \| raw
2012-02-01	Merge branch 'jc/pull-signed-tag'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ar/i18n-no-gettext'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'nd/clone-detached'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'da/maint-mergetool-twoway'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'va/git-p4-branch'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'jl/submodule-re-add'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'tr/grep-l-with-decoration'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ks/sort-wildcard-in-makefile'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ld/git-p4-branches-and-labels'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'rr/sequencer'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'jc/advise-i18n'	blob \| diff \| raw \| diff to current
2012-01-31	merge: add instructions to the commit message when...	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'nd/index-pack-no-recurse'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'rs/diff-postimage-in-context'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jk/parse-object-cached'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'sp/smart-http-failure-to-push'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jc/maint-log-first-parent-pathspec'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jl/test-pause'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'tr/maint-mailinfo'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'pw/p4-view-updates'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'nd/maint-refname-in-hierarchy-check'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jn/gitweb-unspecified-action'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'nd/clone-single-branch'	blob \| diff \| raw \| diff to current
2012-01-27	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...	blob \| diff \| raw \| diff to current
2012-01-23	merge: use editor by default in interactive sessions	blob \| diff \| raw \| diff to current
2012-01-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-18	Merge branch 'maint-1.7.7' into maint	blob \| diff \| raw \| diff to current
2012-01-18	Merge branch 'jk/credentials'	blob \| diff \| raw \| diff to current
2012-01-18	Merge branch 'mh/maint-show-ref-doc'	blob \| diff \| raw \| diff to current
2012-01-18	Merge branch 'tr/maint-word-diff-incomplete-line'	blob \| diff \| raw \| diff to current
2012-01-17	Merge branch 'jn/maint-gitweb-grep-fix'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'jc/request-pull-show-head-4'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'tr/maint-mailinfo'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'ss/maint-msys-cvsexportcommit'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'jk/maint-upload-archive'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'maint-1.7.7' into maint	blob \| diff \| raw \| diff to current
2012-01-13	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| diff \| raw \| diff to current
2012-01-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-12	Merge branch 'maint-1.7.7' into maint	blob \| diff \| raw \| diff to current
2012-01-12	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| diff \| raw \| diff to current
2012-01-10	Merge branch 'bw/maint-t8006-sed-incomplete-line'	blob \| diff \| raw \| diff to current
2012-01-10	Sync with maint	blob \| diff \| raw \| diff to current
2012-01-10	Merge the attributes fix in from maint-1.6.7 branch	blob \| diff \| raw \| diff to current
2012-01-10	Merge the attributes fix in from maint-1.6.6 branch	blob \| diff \| raw \| diff to current
2012-01-09	Merge branch 'jk/credentials'	blob \| diff \| raw \| diff to current
2012-01-09	Merge branch 'mh/ref-api-less-extra-refs'	blob \| diff \| raw \| diff to current
2012-01-09	Merge branch 'mm/maint-gitweb-project-maxdepth'	blob \| diff \| raw \| diff to current
2012-01-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-06	Merge branch 'jc/show-sig'	blob \| diff \| raw \| diff to current
2012-01-06	Sync with 1.7.8.3	blob \| diff \| raw \| diff to current
2012-01-06	Merge branch 'jn/maint-gitweb-utf8-fix' into maint	blob \| diff \| raw \| diff to current
2012-01-06	Merge branch 'maint-1.7.7' into maint	blob \| diff \| raw \| diff to current
2012-01-06	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| diff \| raw \| diff to current
2012-01-05	Merge branch 'jc/signed-commit' and 'jc/pull-signed...	blob \| diff \| raw \| diff to current
2012-01-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-04	Merge branch 'nd/maint-parse-depth' into maint	blob \| diff \| raw \| diff to current
2012-01-03	Merge branch 'pw/p4-docs-and-tests'	blob \| diff \| raw \| diff to current
2012-01-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-01-03	Merge branch 'maint-1.7.7' into maint	blob \| diff \| raw \| diff to current
2012-01-03	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| diff \| raw \| diff to current
2011-12-28	Sync with 1.7.8.2	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jv/maint-config-set' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/follow-rename-score' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jc/checkout-m-twoway' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'tr/doc-sh-setup' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-push-v-is-verbose' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'ef/setenv-putenv' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jn/maint-sequencer-fixes' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-snprintf-va-copy' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-push-over-dav' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/maint-mv' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/fetch-no-tail-match-refs' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'ew/keepalive' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'ci/stripspace-docs' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jh/fast-import-notes' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'aw/rebase-i-stop-on-failure-to-amend...	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'tj/maint-imap-send-remove-unused' into...	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jn/branch-move-to-self' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'na/strtoimax' into maint	blob \| diff \| raw \| diff to current
2011-12-28	Merge branch 'jk/refresh-porcelain-output' into maint	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/bash-read-unescaped'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'ab/sun-studio-portability'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/doc-sh-setup'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'rr/revert-cherry-pick'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/pty-all'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jn/maint-gitweb-utf8-fix'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/maint-strbuf-missing-init'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jc/maint-lf-to-crlf-keep-crlf'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'rs/diff-tree-combined-clean-up'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/maint-push-v-is-verbose'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'tr/grep-threading'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/pretty-reglog-ent'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/follow-rename-score'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/doc-fsck'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'nd/war-on-nul-in-commit'	blob \| diff \| raw \| diff to current
2011-12-22	Merge branch 'jk/maint-do-not-feed-stdin-to-tests'	blob \| diff \| raw \| diff to current
next