summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-181-1/+1
* Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-081-19/+55
|\
| * pack-objects: don't traverse objects unnecessarilyDan McGee2011-10-201-6/+12
| * pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee2011-10-181-7/+37
| * pack-objects: use unsigned int for counter and offset valuesDan McGee2011-10-181-6/+6
| * pack-objects: mark add_to_write_order() as inlineDan McGee2011-10-181-1/+1
* | Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-012-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
| * | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-061-1/+1
* | | Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-012-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
| | |/ | |/|
* | | 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
|\ \ \
| * | | checkout: use argv_array APIJeff King2011-09-141-19/+8
* | | | Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
|\ \ \ \
| * | | | refactor run_receive_hook()Junio C Hamano2011-09-121-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
| |\ \ \ \ \
| | * | | | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-111-3/+7
| | * | | | | remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-111-0/+6
| | * | | | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-111-1/+1
| | * | | | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-111-4/+8
| * | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-183-8/+7
| * | | | | | | | | | | merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-181-44/+53
| * | | | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-181-1/+1
| * | | | | | | | | | | merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-261-17/+16
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Support ERR in remote archive like in fetch/pushIlari Liusvaara2011-10-051-0/+2
* | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+3
* | | | | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-1/+5
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-7/+13
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-151-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | patch-id.c: use strbuf instead of a fixed bufferMichael Schubert2011-09-221-4/+6
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano2011-09-191-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-151-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: do not abort upon finding an empty blobJunio C Hamano2011-09-111-6/+3
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
View Lorry Controller Status