summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* bulk-checkin: replace fast-import based implementationjc/stream-to-packJunio C Hamano2011-12-012-5/+6
* finish_tmp_packfile(): a helper functionJunio C Hamano2011-10-281-23/+10
* create_tmp_packfile(): a helper functionJunio C Hamano2011-10-281-9/+3
* write_pack_header(): a helper functionJunio C Hamano2011-10-281-6/+3
* Merge branch 'js/grep-mutex'Junio C Hamano2011-10-271-11/+26
|\
| * builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-261-7/+3
| * builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-261-5/+23
| * git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-261-4/+5
* | Merge branch 'maint'Junio C Hamano2011-10-271-2/+2
|\ \
| * | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-271-2/+2
| * | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-261-19/+8
| |\ \
| * \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
| |\ \ \
| * \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-261-7/+21
| |\ \ \ \
| | * \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-7/+21
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-233-7/+11
| | |\ \ \ \ \
| | * | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
| | * | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-231-29/+90
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-232-2/+19
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-231-3/+3
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-213-59/+66
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
| * | | | | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-151-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-151-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano2011-10-151-0/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune'Junio C Hamano2011-10-262-6/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-151-2/+21
| * | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-152-5/+10
| * | | | | | | | | | | | | | | | | | fetch: free all the additional refspecsCarlos Martín Nieto2011-10-071-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/match-refs-clarify'Junio C Hamano2011-10-212-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rename "match_refs()" to "match_push_refs()"jc/match-refs-clarifyJunio C Hamano2011-09-122-3/+3
| * | | | | | | | | | | | | | | | | | send-pack: typofix error messageJunio C Hamano2011-09-121-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-211-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-deleteJeff King2011-10-141-1/+1
| * | | | | | | | | | | | | | | | | | pack-objects: protect against disappearing packsJeff King2011-10-141-0/+4
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-191-39/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-39/+70
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * | | | | | | | | | | | | | | | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-2/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+3
* | | | | | | | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-172-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-061-0/+2
| * | | | | | | | | | | | | | | | | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-061-1/+5