summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-132-4/+1
|\
| * cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-061-1/+1
| * apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
* | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
|\ \
| * | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
* | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-132-39/+50
|\ \ \
| * \ \ Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| |\ \ \
| | * | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| * | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| * | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-051-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | stripspace: fix outdated commentJeff King2011-12-051-2/+0
* | | | | 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