Andrew's git - gitweb.git/history

[gitweb.git] / builtin / apply.c

2012-07-16	Merge branch 'jn/makefile-cleanup'	blob \| diff \| raw
2012-07-16	Merge branch 'ar/clone-honor-umask-at-top'	blob \| diff \| raw
2012-07-16	Merge branch 'jc/apply-3way'	blob \| diff \| raw
2012-07-14	Merge branch 'jk/push-delete-ref-error-message'	blob \| diff \| raw \| diff to current
2012-07-13	Merge branch 'jc/refactor-diff-stdin'	blob \| diff \| raw \| diff to current
2012-07-13	Merge branch 'jn/vcs-svn'	blob \| diff \| raw \| diff to current
2012-07-13	Merge branch 'tr/maint-show-walk'	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'jc/maint-blame-unique-abbrev' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'th/diff-no-index-fixes' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'nd/clone-single-fix' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'hv/submodule-update-nuke-submodules'...	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'jk/diff-no-index-pager' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'mm/verify-filename-fix' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'cn/cherry-pick-range-docs' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'jc/ustar-checksum-is-unsigned' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'jc/ls-files-i-dir' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'jc/request-pull-match-tagname' into maint	blob \| diff \| raw \| diff to current
2012-07-11	Strip namelen out of ce_flags into a ce_namelen field	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| diff \| raw \| diff to current
2012-07-09	apply: --build-fake-ancestor expects blobs	blob \| diff \| raw \| diff to current
2012-07-09	apply: allow rerere() to work on --3way results	blob \| diff \| raw \| diff to current
2012-07-09	apply: register conflicted stages to the index	blob \| diff \| raw \| diff to current
2012-07-09	apply: --3way with add/add conflict	blob \| diff \| raw \| diff to current
2012-07-09	apply: move verify_index_match() higher	blob \| diff \| raw \| diff to current
2012-07-09	apply: plug the three-way merge logic in	blob \| diff \| raw \| diff to current
2012-07-09	apply: fall back on three-way merge	blob \| diff \| raw \| diff to current
2012-07-09	apply: accept -3/--3way command line option	blob \| diff \| raw \| diff to current
2012-07-09	apply: move "already exists" logic to check_to_create()	blob \| diff \| raw \| diff to current
2012-07-09	apply: move check_to_create_blob() closer to its sole...	blob \| diff \| raw \| diff to current
2012-07-09	apply: further split load_preimage()	blob \| diff \| raw \| diff to current
2012-07-09	apply: refactor "previous patch" logic	blob \| diff \| raw \| diff to current
2012-07-09	apply: split load_preimage() helper function out	blob \| diff \| raw \| diff to current
2012-07-09	apply: factor out checkout_target() helper function	blob \| diff \| raw \| diff to current
2012-07-09	apply: refactor read_file_or_gitlink()	blob \| diff \| raw \| diff to current
2012-07-09	apply: clear_image() clears things a bit more	blob \| diff \| raw \| diff to current
2012-07-09	apply: a bit more comments on PATH_TO_BE_DELETED	blob \| diff \| raw \| diff to current
2012-07-09	apply: fix an incomplete comment in check_patch()	blob \| diff \| raw \| diff to current
2012-07-09	Merge branch 'mz/empty-rebase-test'	blob \| diff \| raw \| diff to current
2012-07-09	Merge branch 'js/fast-export-paths-with-spaces'	blob \| diff \| raw \| diff to current
2012-07-09	Merge branch 'cw/no-detaching-an-unborn'	blob \| diff \| raw \| diff to current
2012-07-09	Merge branch 'jc/maint-blame-unique-abbrev'	blob \| diff \| raw \| diff to current
2012-07-05	Merge branch 'nd/clone-single-fix'	blob \| diff \| raw \| diff to current
2012-07-05	Merge branch 'th/diff-no-index-fixes'	blob \| diff \| raw \| diff to current
2012-07-05	Merge branch 'hv/remote-end-hung-up'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'fc/git-prompt-script'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'js/submodule-relative'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'hv/submodule-update-nuke-submodules'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'nd/exclude-workaround-top-heavy'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'nd/stream-pack-objects'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'nd/stream-index-pack'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'mm/verify-filename-fix'	blob \| diff \| raw \| diff to current
2012-06-28	Merge branch 'jk/diff-no-index-pager'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'lp/no-cmd-http-fetch'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'cn/cherry-pick-range-docs'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'lm/git-blame-el'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'rs/ipv6-ssh-url'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'jc/ustar-checksum-is-unsigned'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'rs/git-blame-mapcar-mapc'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'rr/doc-commit'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'nd/i18n-branch-lego'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'jk/no-more-asciidoc7'	blob \| diff \| raw \| diff to current
2012-06-22	Merge branch 'vr/help-per-platform'	blob \| diff \| raw \| diff to current
2012-06-21	Merge branch 'jk/maint-t1304-setfacl'	blob \| diff \| raw \| diff to current
2012-06-21	Merge branch 'vr/help-per-platform'	blob \| diff \| raw \| diff to current
2012-06-21	Merge branch 'jc/ls-files-i-dir'	blob \| diff \| raw \| diff to current
2012-06-21	Merge branch 'jc/request-pull-match-tagname'	blob \| diff \| raw \| diff to current
2012-06-21	Merge branch 'jk/clone-local'	blob \| diff \| raw \| diff to current
2012-06-17	Sync with 1.7.10.5	blob \| diff \| raw \| diff to current
2012-06-17	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| diff \| raw \| diff to current
2012-06-15	Merge branch 'as/diff-shortstat-ignore-binary'	blob \| diff \| raw \| diff to current
2012-06-13	Merge branch 'rj/gitweb-test-sans-date-parser'	blob \| diff \| raw \| diff to current
2012-06-13	Merge branch 'fc/git-complete-helper-fix'	blob \| diff \| raw \| diff to current
2012-06-12	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw \| diff to current
2012-06-12	Merge branch 'jc/fmt-merge-msg-people'	blob \| diff \| raw \| diff to current
2012-06-12	Merge branch 'js/maint-fast-export-mark-error'	blob \| diff \| raw \| diff to current
2012-06-08	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw \| diff to current
2012-06-07	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw \| diff to current
2012-06-07	Merge branch 'rr/maint-t3510-cascade-fix'	blob \| diff \| raw \| diff to current
2012-06-07	Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'	blob \| diff \| raw \| diff to current
2012-06-07	Merge branch 'cr/persistent-https'	blob \| diff \| raw \| diff to current
2012-06-03	Sync with 1.7.10.4	blob \| diff \| raw \| diff to current
2012-06-03	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'ef/maint-rebase-error-message'	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'nh/empty-rebase'	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'vr/rebase-autosquash-does-not-imply-i'	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'mm/levenstein-penalize-deletion-less'	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'jl/submodule-report-new-path-once'	blob \| diff \| raw \| diff to current
2012-06-01	Sync with maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'ef/http-o-depends-on-gvf' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'rs/maint-grep-F' into maint	blob \| diff \| raw \| diff to current
2012-06-01	i18n: apply: split to fix a partial i18n message	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'va/git-p4-test'	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'jk/ident-gecos-strbuf'	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'mh/fetch-pack-constness'	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'mh/ref-api-lazy-loose'	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'sp/sh-windows-pwd'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'mh/test-keep-prove-cache'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'rs/dir-strbuf-read-recursive-fix'	blob \| diff \| raw \| diff to current
next