Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mh/ref-api' | Junio C Hamano | 2011-10-21 | 2 | -28/+39 |
|\ | |||||
| * | clear_ref_cache(): inline function | Michael Haggerty | 2011-10-16 | 1 | -7/+3 |
| * | write_ref_sha1(): only invalidate the loose ref cache | Michael Haggerty | 2011-10-16 | 1 | -1/+1 |
| * | clear_ref_cache(): extract two new functions | Michael Haggerty | 2011-10-16 | 1 | -4/+15 |
| * | clear_ref_cache(): rename parameter | Michael Haggerty | 2011-10-16 | 1 | -6/+6 |
| * | invalidate_ref_cache(): expose this function in the refs API | Michael Haggerty | 2011-10-16 | 2 | -1/+9 |
| * | invalidate_ref_cache(): take the submodule as parameter | Michael Haggerty | 2011-10-16 | 1 | -8/+4 |
| * | invalidate_ref_cache(): rename function from invalidate_cached_refs() | Michael Haggerty | 2011-10-16 | 1 | -20/+20 |
* | | Merge branch 'jc/match-refs-clarify' | Junio C Hamano | 2011-10-21 | 6 | -15/+18 |
|\ \ | |||||
| * | | rename "match_refs()" to "match_push_refs()"jc/match-refs-clarify | Junio C Hamano | 2011-09-12 | 6 | -14/+17 |
| * | | send-pack: typofix error message | Junio C Hamano | 2011-09-12 | 1 | -1/+1 |
* | | | Merge branch 'jc/make-tags' | Junio C Hamano | 2011-10-21 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | Makefile: ask "ls-files" to list source files if availablejc/make-tags | Junio C Hamano | 2011-10-18 | 1 | -3/+7 |
* | | | | Merge branch 'ss/inet-ntop' | Junio C Hamano | 2011-10-21 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | inet_ntop.c: Work around GCC 4.6's detection of uninitialized variablesss/inet-ntop | Sebastian Schuberth | 2011-10-18 | 1 | -0/+2 |
* | | | | | Merge branch 'jc/maint-remove-renamed-ref' | Junio C Hamano | 2011-10-21 | 1 | -8/+0 |
|\ \ \ \ \ | |||||
| * | | | | | branch -m/-M: remove undocumented RENAMED-REF | Junio C Hamano | 2011-10-12 | 1 | -8/+0 |
* | | | | | | Merge branch 'pw/p4-update' | Junio C Hamano | 2011-10-21 | 6 | -423/+919 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: handle files with shell metacharacters | Luke Diamand | 2011-10-17 | 2 | -77/+187 |
| * | | | | | | git-p4: keyword flattening fixes | Pete Wyckoff | 2011-10-17 | 1 | -2/+6 |
| * | | | | | | git-p4: stop ignoring apple filetype | Pete Wyckoff | 2011-10-17 | 1 | -5/+0 |
| * | | | | | | git-p4: recognize all p4 filetypes | Pete Wyckoff | 2011-10-17 | 1 | -19/+52 |
| * | | | | | | git-p4: handle utf16 filetype properly | Pete Wyckoff | 2011-10-17 | 2 | -0/+119 |
| * | | | | | | git-p4 tests: refactor and cleanup | Pete Wyckoff | 2011-10-17 | 3 | -324/+559 |
* | | | | | | | Merge branch 'cn/doc-config-bare-subsection' | Junio C Hamano | 2011-10-21 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: update [section.subsection] to reflect what git doescn/doc-config-bare-subsection | Carlos MartÃn Nieto | 2011-10-16 | 1 | -3/+4 |
* | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete' | Junio C Hamano | 2011-10-21 | 3 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-delete | Jeff King | 2011-10-14 | 2 | -2/+2 |
| * | | | | | | | | pack-objects: protect against disappearing packs | Jeff King | 2011-10-14 | 3 | -1/+6 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/daemon-msgs' | Junio C Hamano | 2011-10-21 | 2 | -8/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | daemon: give friendlier error messages to clientsjk/daemon-msgs | Jeff King | 2011-10-15 | 2 | -4/+31 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sc/difftool-skip' | Junio C Hamano | 2011-10-21 | 2 | -4/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skip | Junio C Hamano | 2011-10-14 | 1 | -2/+2 |
| * | | | | | | | | git-difftool: allow skipping file by typing 'n' at prompt | Sitaram Chamarty | 2011-10-10 | 2 | -4/+48 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/unseekable-bundle' | Junio C Hamano | 2011-10-21 | 3 | -59/+90 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bundle: add parse_bundle_header() helper functionjc/unseekable-bundle | Junio C Hamano | 2011-10-13 | 3 | -9/+33 |
| * | | | | | | | | bundle: allowing to read from an unseekable fd | Junio C Hamano | 2011-10-13 | 1 | -35/+64 |
* | | | | | | | | | Merge branch 'ph/transport-with-gitfile' | Junio C Hamano | 2011-10-21 | 5 | -20/+58 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfileph/transport-with-gitfile | Johannes Schindelin | 2011-10-11 | 1 | -2/+2 |
| * | | | | | | | | | Add test showing git-fetch groks gitfiles | Phil Hord | 2011-10-04 | 1 | -0/+14 |
| * | | | | | | | | | Teach transport about the gitfile mechanism | Phil Hord | 2011-10-04 | 1 | -1/+23 |
| * | | | | | | | | | Learn to handle gitfiles in enter_repo | Phil Hord | 2011-10-04 | 1 | -1/+7 |
| * | | | | | | | | | enter_repo: do not modify input | Erik Faye-Lund | 2011-10-04 | 3 | -19/+15 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Sync with maint | Junio C Hamano | 2011-10-21 | 2 | -24/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Almost ready for 1.7.7.1 | Junio C Hamano | 2011-10-21 | 1 | -0/+20 |
| * | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maint | Junio C Hamano | 2011-10-21 | 7 | -65/+93 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-blank-at-eof-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/no-g-plus-s-on-bsd' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/diff-cleanup-records-fix' into maint | Junio C Hamano | 2011-10-21 | 3 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'il/archive-err-signal' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |