summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2012-07-16Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano
2012-07-16Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano
2012-07-16Merge branch 'cw/amend-commit-without-message'Junio C Hamano
2012-07-16Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano
2012-07-16Merge branch 'jc/apply-3way'Junio C Hamano
2012-07-13Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano
2012-07-13Merge branch 'tr/maint-show-walk'Junio C Hamano
2012-07-10index-pack: loop while inflating objects in unpack_dataJeff King
2012-07-10add: create ADD_EDIT.patch with mode 0666Jeff King
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano
2012-07-09apply: register conflicted stages to the indexJunio C Hamano
2012-07-09apply: --3way with add/add conflictJunio C Hamano
2012-07-09apply: move verify_index_match() higherJunio C Hamano
2012-07-09apply: plug the three-way merge logic inJunio C Hamano
2012-07-09apply: fall back on three-way mergeJunio C Hamano
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano
2012-07-09apply: further split load_preimage()Junio C Hamano
2012-07-09apply: refactor "previous patch" logicJunio C Hamano
2012-07-09apply: split load_preimage() helper function outJunio C Hamano
2012-07-09apply: factor out checkout_target() helper functionJunio C Hamano
2012-07-09apply: refactor read_file_or_gitlink()Junio C Hamano
2012-07-09apply: clear_image() clears things a bit moreJunio C Hamano
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano
2012-07-09apply: fix an incomplete comment in check_patch()Junio C Hamano
2012-07-09Restore umasks influence on the permissions of work tree created by cloneAlex Riesen
2012-07-09Allow edit of empty message with commit --amendChris Webb
2012-07-09Merge branch 'cw/help-over-network'Junio C Hamano
2012-07-09Merge branch 'js/fast-export-paths-with-spaces'Junio C Hamano
2012-07-09Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano
2012-07-09Merge branch 'mm/credential-plumbing'Junio C Hamano
2012-07-09Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano
2012-07-09Merge branch 'rj/platform-pread-may-be-thread-unsafe'Junio C Hamano
2012-07-09Merge branch 'mm/config-xdg'Junio C Hamano
2012-07-09git on Mac OS and precomposed unicodeTorsten Bögershausen
2012-07-05Merge branch 'nd/clone-single-fix'Junio C Hamano
2012-07-02blame: compute abbreviation width that ensures uniquenessJunio C Hamano
2012-06-28Merge branch 'hv/submodule-update-nuke-submodules'Junio C Hamano
2012-06-28Merge branch 'nd/stream-pack-objects'Junio C Hamano
2012-06-28Merge branch 'nd/stream-index-pack'Junio C Hamano
2012-06-28Merge branch 'mm/verify-filename-fix'Junio C Hamano
2012-06-28Merge branch 'jk/diff-no-index-pager'Junio C Hamano
2012-06-28Allow help.htmlpath to be a URL prefixChris Webb
2012-06-28Add config variable to set HTML path for git-help --webChris Webb
2012-06-28fast-export: quote paths with spacesJay Soffian
2012-06-26index-pack: Disable threading on cygwinJunio C Hamano
2012-06-26git-checkout: disallow --detach on unborn branchChris Webb
2012-06-25git credential fill: output the whole 'struct credential'Matthieu Moy
2012-06-25add 'git credential' plumbing commandJavier Roucher Iglesias