Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2011-10-26	Merge branch 'lh/gitweb-site-html-head'	blob \| diff \| raw
2011-10-26	Merge branch 'mm/mediawiki-author-fix'	blob \| diff \| raw
2011-10-26	Merge branch 'jn/libperl-git-config'	blob \| diff \| raw
2011-10-26	Merge branch 'jm/maint-gitweb-filter-forks-fix'	blob \| diff \| raw
2011-10-26	Merge branch 'cn/fetch-prune'	blob \| diff \| raw
2011-10-26	Merge branch 'jn/gitweb-highlite-sanitise' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'jk/argv-array' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'jc/run-receive-hook-cleanup' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'cn/eradicate-working-copy' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'maint-1.7.6' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'ps/gitweb-js-with-lineno' into maint...	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'maint-1.7.6' into maint	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'maint-1.7.5' into maint-1.7.6	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'maint-1.7.4' into maint-1.7.5	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'maint-1.7.3' into maint-1.7.4	blob \| diff \| raw \| diff to current
2011-10-26	Merge branch 'sn/doc-update-index-assume-unchanged...	blob \| diff \| raw \| diff to current
2011-10-24	Merge branch 'maint'	blob \| diff \| raw
2011-10-24	Merge branch 'maint-1.7.3' into maint	blob \| diff \| raw \| diff to current
2011-10-24	Merge branch 'maint'	blob \| diff \| raw
2011-10-21	Merge branch 'po/insn-editor'	blob \| diff \| raw
2011-10-21	Merge branch 'jc/broken-ref-dwim-fix'	blob \| diff \| raw
2011-10-21	Merge branch 'mh/ref-api'	blob \| diff \| raw
2011-10-21	Merge branch 'jc/match-refs-clarify'	blob \| diff \| raw
2011-10-21	Merge branch 'jc/make-tags'	blob \| diff \| raw
2011-10-21	Merge branch 'ss/inet-ntop'	blob \| diff \| raw
2011-10-21	Merge branch 'jc/maint-remove-renamed-ref'	blob \| diff \| raw
2011-10-21	Merge branch 'pw/p4-update'	blob \| diff \| raw
2011-10-21	Merge branch 'cn/doc-config-bare-subsection'	blob \| diff \| raw
2011-10-21	Merge branch 'jk/maint-pack-objects-compete-with-delete'	blob \| diff \| raw
2011-10-21	Merge branch 'jk/daemon-msgs'	blob \| diff \| raw
2011-10-21	Merge branch 'sc/difftool-skip'	blob \| diff \| raw
2011-10-21	Merge branch 'jc/unseekable-bundle'	blob \| diff \| raw
2011-10-21	Merge branch 'ph/transport-with-gitfile'	blob \| diff \| raw
2011-10-21	Sync with maint	blob \| diff \| raw
2011-10-21	Merge branch 'nd/maint-autofix-tag-in-head' into maint	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'jc/apply-blank-at-eof-fix' into maint	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'rs/diff-cleanup-records-fix' into maint	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'il/archive-err-signal' into maint	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'js/maint-merge-one-file-osx-expr' into...	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'jm/maint-apply-detects-corrupt-patch...	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'jc/checkout-from-tree-keep-local-changes...	blob \| diff \| raw \| diff to current
2011-10-21	Merge branch 'mm/maint-config-explicit-bool-display...	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'js/merge-edit-option'	blob \| diff \| raw
2011-10-19	Merge branch 'rs/diff-whole-function'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'rs/pickaxe'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'js/no-cherry-pick-head-after-punted'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'bk/submodule-in-recursive-merge'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'jm/maint-apply-detects-corrupt-patch...	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'jk/config-test-cleanup'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'js/log-show-children'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'cb/httpd-test-fix-port'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'jn/gitweb-manpages'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'md/smtp-tls-hello-again'	blob \| diff \| raw \| diff to current
2011-10-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'jk/http-auth'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'js/check-ref-format-test-mingw'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'jk/pull-rebase-with-work-tree'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'jk/config-test-cleanup'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'bc/attr-ignore-case'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'sg/completion'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'mm/maint-config-explicit-bool-display'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'tc/fetch-leak'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'jk/name-hash-dirent'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'ef/mingw-syslog'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'tm/completion-push-set-upstream'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'tm/completion-commit-fixup-squash'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'ph/push-to-delete-nothing'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'jc/checkout-from-tree-keep-local-changes'	blob \| diff \| raw \| diff to current
2011-10-18	Merge branch 'js/bisect-no-checkout'	blob \| diff \| raw \| diff to current
2011-10-16	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2011-10-16	Sync with maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'ms/patch-id-with-overlong-line' into...	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jc/maint-bundle-too-quiet' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jk/filter-branch-require-clean-work-tree...	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jc/maint-fsck-fwrite-size-check' into...	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'bk/ancestry-path' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jk/maint-fetch-submodule-check-fix' into...	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'tr/mergetool-valgrind' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'nm/grep-object-sha1-lock' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jc/diff-index-unpack' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'mm/rebase-i-exec-edit' into maint	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jc/grep-untracked-exclude'	blob \| diff \| raw \| diff to current
2011-10-16	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'js/maint-merge-one-file-osx-expr'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'jn/ident-from-etc-mailname'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'il/archive-err-signal'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'jc/grep-untracked-exclude'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'rs/diff-cleanup-records-fix'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'rs/pending'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'jn/no-g-plus-s-on-bsd'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'jc/is-url-simplify'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'nd/git-daemon-error-msgs'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'nd/daemon-log-sock-errors'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'cp/git-web-browse-browsers'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'jc/apply-blank-at-eof-fix'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'di/fast-import-empty-tag-note-fix'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'nd/maint-autofix-tag-in-head'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'bw/grep-no-index-no-exclude'	blob \| diff \| raw \| diff to current
2011-10-14	Merge branch 'nd/maint-sparse-errors'	blob \| diff \| raw \| diff to current
next