Merge branch 'mz/cherry-pick-cmdline-order' into maint
[gitweb.git] / builtin / apply.c
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'tr/maint-show-walk' into maint
2012-07-22 Merge branch 'jc/refactor-diff-stdin' into maint
2012-07-22 Merge branch 'mz/empty-rebase-test' into maint
2012-07-22 Merge branch 'js/fast-export-paths-with-spaces' into...
2012-07-22 Merge branch 'cw/no-detaching-an-unborn' into maint
2012-07-22 Merge git://bogomips.org/git-svn
2012-07-22 Merge branch 'jk/revision-walk-stop-at-max-count'
2012-07-22 Merge branch 'mm/config-xdg'
2012-07-22 Merge branch 'as/t4012-style-updates'
2012-07-22 Merge branch 'pg/maint-1.7.9-am-where-is-patch'
2012-07-22 Merge branch 'jl/maint-1.7.10-recurse-submodules-with...
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-22 Merge branch 'lk/more-helpful-status-hints'
2012-07-22 Merge branch 'jc/sha1-name-more'
2012-07-22 Merge branch 'jc/maint-filter-branch-epoch-date'
2012-07-17 Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint...
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/index-pack-streaming-fix'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16 Merge branch 'cw/amend-commit-without-message'
2012-07-16 Merge branch 'jn/makefile-cleanup'
2012-07-16 Merge branch 'ar/clone-honor-umask-at-top'
2012-07-16 Merge branch 'jc/apply-3way'
2012-07-14 Merge branch 'jk/push-delete-ref-error-message'
2012-07-13 Merge branch 'jc/refactor-diff-stdin'
2012-07-13 Merge branch 'jn/vcs-svn'
2012-07-13 Merge branch 'tr/maint-show-walk'
2012-07-11 Merge branch 'jc/maint-blame-unique-abbrev' into maint
2012-07-11 Merge branch 'th/diff-no-index-fixes' into maint
2012-07-11 Merge branch 'nd/clone-single-fix' into maint
2012-07-11 Merge branch 'hv/submodule-update-nuke-submodules'...
2012-07-11 Merge branch 'jk/diff-no-index-pager' into maint
2012-07-11 Merge branch 'mm/verify-filename-fix' into maint
2012-07-11 Merge branch 'cn/cherry-pick-range-docs' into maint
2012-07-11 Merge branch 'jc/ustar-checksum-is-unsigned' into maint
2012-07-11 Merge branch 'jc/ls-files-i-dir' into maint
2012-07-11 Merge branch 'jc/request-pull-match-tagname' into maint
2012-07-11 Strip namelen out of ce_flags into a ce_namelen field
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg...
2012-07-09 apply: --build-fake-ancestor expects blobs
2012-07-09 apply: allow rerere() to work on --3way results
2012-07-09 apply: register conflicted stages to the index
2012-07-09 apply: --3way with add/add conflict
2012-07-09 apply: move verify_index_match() higher
2012-07-09 apply: plug the three-way merge logic in
2012-07-09 apply: fall back on three-way merge
2012-07-09 apply: accept -3/--3way command line option
2012-07-09 apply: move "already exists" logic to check_to_create()
2012-07-09 apply: move check_to_create_blob() closer to its sole...
2012-07-09 apply: further split load_preimage()
2012-07-09 apply: refactor "previous patch" logic
2012-07-09 apply: split load_preimage() helper function out
2012-07-09 apply: factor out checkout_target() helper function
2012-07-09 apply: refactor read_file_or_gitlink()
2012-07-09 apply: clear_image() clears things a bit more
2012-07-09 apply: a bit more comments on PATH_TO_BE_DELETED
2012-07-09 apply: fix an incomplete comment in check_patch()
2012-07-09 Merge branch 'mz/empty-rebase-test'
2012-07-09 Merge branch 'js/fast-export-paths-with-spaces'
2012-07-09 Merge branch 'cw/no-detaching-an-unborn'
2012-07-09 Merge branch 'jc/maint-blame-unique-abbrev'
2012-07-05 Merge branch 'nd/clone-single-fix'
2012-07-05 Merge branch 'th/diff-no-index-fixes'
2012-07-05 Merge branch 'hv/remote-end-hung-up'
2012-06-28 Merge branch 'fc/git-prompt-script'
2012-06-28 Merge branch 'js/submodule-relative'
2012-06-28 Merge branch 'hv/submodule-update-nuke-submodules'
2012-06-28 Merge branch 'nd/exclude-workaround-top-heavy'
2012-06-28 Merge branch 'nd/stream-pack-objects'
2012-06-28 Merge branch 'nd/stream-index-pack'
2012-06-28 Merge branch 'mm/verify-filename-fix'
2012-06-28 Merge branch 'jk/diff-no-index-pager'
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-25 Merge branch 'cn/cherry-pick-range-docs'
2012-06-25 Merge branch 'lm/git-blame-el'
2012-06-25 Merge branch 'rs/ipv6-ssh-url'
2012-06-25 Merge branch 'jc/ustar-checksum-is-unsigned'
2012-06-25 Merge branch 'rs/git-blame-mapcar-mapc'
2012-06-25 Merge branch 'rr/doc-commit'
2012-06-25 Merge branch 'nd/i18n-branch-lego'
2012-06-25 Merge branch 'jk/no-more-asciidoc7'
2012-06-22 Merge branch 'vr/help-per-platform'
2012-06-21 Merge branch 'jk/maint-t1304-setfacl'
2012-06-21 Merge branch 'vr/help-per-platform'
2012-06-21 Merge branch 'jc/ls-files-i-dir'
2012-06-21 Merge branch 'jc/request-pull-match-tagname'
2012-06-21 Merge branch 'jk/clone-local'
2012-06-17 Sync with 1.7.10.5
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-15 Merge branch 'as/diff-shortstat-ignore-binary'
2012-06-13 Merge branch 'rj/gitweb-test-sans-date-parser'
2012-06-13 Merge branch 'fc/git-complete-helper-fix'
2012-06-12 Merge branch 'mm/api-credentials-doc'
2012-06-12 Merge branch 'jc/fmt-merge-msg-people'
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-06-08 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'rr/maint-t3510-cascade-fix'
2012-06-07 Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'
next