summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2012-07-27Merge branch 'jk/maint-checkout-orphan-check-fix'Libravatar Junio C Hamano1-1/+1
2012-07-25checkout: don't confuse ref and object flagsLibravatar Jeff King1-1/+1
2012-07-24Merge branch 'jk/maint-commit-check-committer-early'Libravatar Junio C Hamano1-1/+1
2012-07-23Merge branch 'kk/maint-commit-tree'Libravatar Junio C Hamano1-3/+0
2012-07-23Merge branch 'tg/ce-namelen-field'Libravatar Junio C Hamano4-7/+14
2012-07-23commit: check committer identity more strictlyLibravatar Jeff King1-1/+1
2012-07-22Merge branch 'mm/config-xdg'Libravatar Junio C Hamano1-4/+12
2012-07-22Merge branch 'jc/sha1-name-more'Libravatar Junio C Hamano7-11/+30
2012-07-17Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeLibravatar Junio C Hamano1-3/+0
2012-07-17commit-tree: resurrect command line parsing updatesLibravatar Junio C Hamano1-3/+0
2012-07-16config: fix several access(NULL) callsLibravatar Matthieu Moy1-4/+12
2012-07-15Merge branch 'jk/index-pack-streaming-fix'Libravatar Junio C Hamano1-10/+13
2012-07-15Merge branch 'jk/maint-commit-amend-only-no-paths'Libravatar Junio C Hamano1-1/+4
2012-07-15Merge branch 'cw/amend-commit-without-message'Libravatar Junio C Hamano1-1/+1
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Libravatar Junio C Hamano2-2/+2
2012-07-15Merge branch 'jc/apply-3way'Libravatar Junio C Hamano1-117/+440
2012-07-13Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Libravatar Junio C Hamano1-0/+1
2012-07-13Merge branch 'tr/maint-show-walk'Libravatar Junio C Hamano1-0/+3
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldLibravatar Thomas Gummerer4-6/+12
2012-07-10index-pack: loop while inflating objects in unpack_dataLibravatar Jeff King1-10/+13
2012-07-09add: create ADD_EDIT.patch with mode 0666Libravatar Jeff King1-1/+1
2012-07-09rev-parse --disambiguate=<prefix>Libravatar Junio C Hamano1-0/+10
2012-07-09rev-parse: A and B in "rev-parse A..B" refer to committishLibravatar Junio C Hamano1-2/+2
2012-07-09reset: the command takes committishLibravatar Junio C Hamano1-2/+8
2012-07-09commit-tree: the command wants a tree and commitsLibravatar Junio C Hamano1-4/+4
2012-07-09apply: --build-fake-ancestor expects blobsLibravatar Junio C Hamano1-1/+1
2012-07-09revision.c: the "log" family, except for "show", takes committishLibravatar Junio C Hamano1-0/+3
2012-07-09revision.c: allow handle_revision_arg() to take other flagsLibravatar Junio C Hamano1-1/+1
2012-07-09sha1_name.c: teach lookup context to get_sha1_with_context()Libravatar Junio C Hamano1-1/+1
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano1-0/+3
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano1-6/+60
2012-07-09apply: --3way with add/add conflictLibravatar Junio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherLibravatar Junio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inLibravatar Junio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeLibravatar Junio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionLibravatar Junio C Hamano1-2/+23
2012-07-09apply: move "already exists" logic to check_to_create()Libravatar Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerLibravatar Junio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Libravatar Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicLibravatar Junio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outLibravatar Junio C Hamano1-3/+12
2012-07-09apply: factor out checkout_target() helper functionLibravatar Junio C Hamano1-7/+13
2012-07-09apply: refactor read_file_or_gitlink()Libravatar Junio C Hamano1-7/+11
2012-07-09apply: clear_image() clears things a bit moreLibravatar Junio C Hamano1-2/+2
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDLibravatar Junio C Hamano1-2/+8
2012-07-09apply: fix an incomplete comment in check_patch()Libravatar Junio C Hamano1-9/+15
2012-07-09Restore umasks influence on the permissions of work tree created by cloneLibravatar Alex Riesen1-1/+1
2012-07-09Allow edit of empty message with commit --amendLibravatar Chris Webb1-1/+1
2012-07-09Merge branch 'cw/help-over-network'Libravatar Junio C Hamano1-4/+15
2012-07-09Merge branch 'js/fast-export-paths-with-spaces'Libravatar Junio C Hamano1-0/+2