summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-checkout-orphan-check-fix'Junio C Hamano2012-07-271-1/+1
|\
| * checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano2012-07-241-1/+1
|\ \
| * | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
* | | Merge branch 'kk/maint-commit-tree'Junio C Hamano2012-07-231-3/+0
|\ \ \
| * \ \ Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-171-3/+0
| |\ \ \
| | * | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-171-3/+0
* | | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-234-7/+14
|\ \ \ \ \
| * | | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-114-6/+12
* | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-221-4/+12
|\ \ \ \ \ \
| * | | | | | config: fix several access(NULL) callsMatthieu Moy2012-07-161-4/+12
* | | | | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-227-11/+30
|\ \ \ \ \ \ \
| * | | | | | | rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-091-0/+10
| * | | | | | | rev-parse: A and B in "rev-parse A..B" refer to committishJunio C Hamano2012-07-091-2/+2
| * | | | | | | reset: the command takes committishJunio C Hamano2012-07-091-2/+8
| * | | | | | | commit-tree: the command wants a tree and commitsJunio C Hamano2012-07-091-4/+4
| * | | | | | | apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-091-1/+1
| * | | | | | | revision.c: the "log" family, except for "show", takes committishJunio C Hamano2012-07-091-0/+3
| * | | | | | | revision.c: allow handle_revision_arg() to take other flagsJunio C Hamano2012-07-091-1/+1
| * | | | | | | sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-091-1/+1
* | | | | | | | Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano2012-07-151-10/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | index-pack: loop while inflating objects in unpack_dataJeff King2012-07-101-10/+13
* | | | | | | | | Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2012-07-151-1/+4
* | | | | | | | | Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow edit of empty message with commit --amendChris Webb2012-07-091-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-152-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-091-1/+1
| * | | | | | | | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-091-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-151-117/+440
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-091-0/+3
| * | | | | | | | | apply: register conflicted stages to the indexJunio C Hamano2012-07-091-6/+60
| * | | | | | | | | apply: --3way with add/add conflictJunio C Hamano2012-07-091-8/+62
| * | | | | | | | | apply: move verify_index_match() higherJunio C Hamano2012-07-091-10/+10
| * | | | | | | | | apply: plug the three-way merge logic inJunio C Hamano2012-07-091-3/+50
| * | | | | | | | | apply: fall back on three-way mergeJunio C Hamano2012-07-091-1/+45
| * | | | | | | | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-091-2/+23
| * | | | | | | | | apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-091-11/+29
| * | | | | | | | | apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-091-23/+23
| * | | | | | | | | apply: further split load_preimage()Junio C Hamano2012-07-091-19/+40
| * | | | | | | | | apply: refactor "previous patch" logicJunio C Hamano2012-07-091-26/+56
| * | | | | | | | | apply: split load_preimage() helper function outJunio C Hamano2012-07-091-3/+12
| * | | | | | | | | apply: factor out checkout_target() helper functionJunio C Hamano2012-07-091-7/+13
| * | | | | | | | | apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-091-7/+11
| * | | | | | | | | apply: clear_image() clears things a bit moreJunio C Hamano2012-07-091-2/+2
| * | | | | | | | | apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-091-2/+8
| * | | | | | | | | apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-091-9/+15
* | | | | | | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-131-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-081-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-131-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | show: fix "range implies walking"Junio C Hamano2012-06-191-0/+3