summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cache.h: put single NUL at end of struct cache_entryrs/allocate-cache-entry-individuallyRené Scharfe2011-10-261-1/+1
* read-cache.c: allocate index entries individuallyRené Scharfe2011-10-262-51/+31
* Merge branch 'maint'Junio C Hamano2011-10-232-3/+5
|\
| * Git 1.7.7.1v1.7.7.1Junio C Hamano2011-10-232-2/+3
| * RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile se...Jonathan Nieder2011-10-231-2/+3
* | Update draft release notes to 1.7.8Junio C Hamano2011-10-211-2/+21
* | Merge branch 'po/insn-editor'Junio C Hamano2011-10-212-1/+20
|\ \
| * | "rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer2011-10-172-1/+20
* | | Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano2011-10-213-100/+104
|\ \ \
| * | | resolve_ref(): report breakage to the caller without warningJunio C Hamano2011-10-191-7/+11
| * | | resolve_ref(): expose REF_ISBROKEN flagJunio C Hamano2011-10-192-9/+9
| * | | refs.c: move dwim_ref()/dwim_log() from sha1_name.cJunio C Hamano2011-10-122-85/+85
* | | | Merge branch 'mh/ref-api'Junio C Hamano2011-10-212-28/+39
|\ \ \ \
| * | | | clear_ref_cache(): inline functionMichael Haggerty2011-10-161-7/+3
| * | | | write_ref_sha1(): only invalidate the loose ref cacheMichael Haggerty2011-10-161-1/+1
| * | | | clear_ref_cache(): extract two new functionsMichael Haggerty2011-10-161-4/+15
| * | | | clear_ref_cache(): rename parameterMichael Haggerty2011-10-161-6/+6
| * | | | invalidate_ref_cache(): expose this function in the refs APIMichael Haggerty2011-10-162-1/+9
| * | | | invalidate_ref_cache(): take the submodule as parameterMichael Haggerty2011-10-161-8/+4
| * | | | invalidate_ref_cache(): rename function from invalidate_cached_refs()Michael Haggerty2011-10-161-20/+20
* | | | | Merge branch 'jc/match-refs-clarify'Junio C Hamano2011-10-216-15/+18
|\ \ \ \ \
| * | | | | rename "match_refs()" to "match_push_refs()"jc/match-refs-clarifyJunio C Hamano2011-09-126-14/+17
| * | | | | send-pack: typofix error messageJunio C Hamano2011-09-121-1/+1
* | | | | | Merge branch 'jc/make-tags'Junio C Hamano2011-10-211-3/+7
|\ \ \ \ \ \
| * | | | | | Makefile: ask "ls-files" to list source files if availablejc/make-tagsJunio C Hamano2011-10-181-3/+7
* | | | | | | Merge branch 'ss/inet-ntop'Junio C Hamano2011-10-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | inet_ntop.c: Work around GCC 4.6's detection of uninitialized variablesss/inet-ntopSebastian Schuberth2011-10-181-0/+2
* | | | | | | | Merge branch 'jc/maint-remove-renamed-ref'Junio C Hamano2011-10-211-8/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -m/-M: remove undocumented RENAMED-REFJunio C Hamano2011-10-121-8/+0
* | | | | | | | | Merge branch 'pw/p4-update'Junio C Hamano2011-10-216-423/+919
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-172-77/+187
| * | | | | | | | | git-p4: keyword flattening fixesPete Wyckoff2011-10-171-2/+6
| * | | | | | | | | git-p4: stop ignoring apple filetypePete Wyckoff2011-10-171-5/+0
| * | | | | | | | | git-p4: recognize all p4 filetypesPete Wyckoff2011-10-171-19/+52
| * | | | | | | | | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-172-0/+119
| * | | | | | | | | git-p4 tests: refactor and cleanupPete Wyckoff2011-10-173-324/+559
* | | | | | | | | | Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano2011-10-211-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: update [section.subsection] to reflect what git doescn/doc-config-bare-subsectionCarlos Martín Nieto2011-10-161-3/+4
* | | | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-213-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-deleteJeff King2011-10-142-2/+2
| * | | | | | | | | | | pack-objects: protect against disappearing packsJeff King2011-10-143-1/+6
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/daemon-msgs'Junio C Hamano2011-10-212-8/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | daemon: give friendlier error messages to clientsjk/daemon-msgsJeff King2011-10-152-4/+31
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sc/difftool-skip'Junio C Hamano2011-10-212-4/+48
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skipJunio C Hamano2011-10-141-2/+2
| * | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-102-4/+48
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/unseekable-bundle'Junio C Hamano2011-10-213-59/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bundle: add parse_bundle_header() helper functionjc/unseekable-bundleJunio C Hamano2011-10-133-9/+33
| * | | | | | | | | | | bundle: allowing to read from an unseekable fdJunio C Hamano2011-10-131-35/+64
* | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile'Junio C Hamano2011-10-215-20/+58
|\ \ \ \ \ \ \ \ \ \ \ \