Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | read-cache.c: allocate index entries individually | René Scharfe | 2011-10-26 | 2 | -51/+31 | |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-09 | 4 | -15/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-09 | 4 | -15/+5 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | am: don't persist keepcr flag | Martin von Zweigbergk | 2011-12-09 | 1 | -7/+0 | |
| | * | | | | | | | | mingw: give waitpid the correct signature | Erik Faye-Lund | 2011-12-09 | 2 | -2/+2 | |
| | * | | | | | | | | git symbolic-ref: documentation fix | Michael Haggerty | 2011-12-08 | 1 | -6/+3 | |
* | | | | | | | | | | Merge branch 'master' of git://bogomips.org/git-svnrr/parse-subcommand | Junio C Hamano | 2011-12-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-svn.perl: close the edit for propedits even with no mods | Steven Walter | 2011-12-01 | 1 | -1/+1 | |
* | | | | | | | | | | | Kick-off the 1.7.9 cycle | Junio C Hamano | 2011-12-05 | 3 | -2/+29 | |
* | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' | Junio C Hamano | 2011-12-05 | 1 | -10/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-output | Jeff King | 2011-11-18 | 1 | -2/+21 | |
| * | | | | | | | | | | | refresh_index: rename format variables | Jeff King | 2011-11-18 | 1 | -6/+6 | |
| * | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flags | Jeff King | 2011-11-18 | 1 | -3/+6 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'gh/userdiff-matlab' | Junio C Hamano | 2011-12-05 | 7 | -1/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add built-in diff patterns for MATLAB codegh/userdiff-matlab | Gustaf Hendeby | 2011-11-15 | 7 | -1/+39 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' | Junio C Hamano | 2011-12-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'vr/git-merge-default-to-upstream' | Junio C Hamano | 2011-12-05 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstream | Vincent van Ravesteijn | 2011-11-21 | 1 | -3/+6 | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' | Junio C Hamano | 2011-12-05 | 1 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycle | Junio C Hamano | 2011-11-16 | 1 | -12/+43 | |
* | | | | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups' | Junio C Hamano | 2011-12-05 | 4 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dups | Junio C Hamano | 2011-11-16 | 4 | -2/+11 | |
* | | | | | | | | | | | | | | | Merge branch 'vr/msvc' | Junio C Hamano | 2011-12-05 | 14 | -19/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | MSVC: Remove unneeded header stubsvr/msvc | Vincent van Ravesteijn | 2011-10-31 | 12 | -12/+0 | |
| * | | | | | | | | | | | | | | | Compile fix for MSVC: Include <io.h> | Vincent van Ravesteijn | 2011-10-31 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Compile fix for MSVC: Do not include sys/resources.h | Vincent van Ravesteijn | 2011-10-31 | 1 | -7/+6 | |
* | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' | Junio C Hamano | 2011-12-05 | 4 | -13/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimax | Nick Alcock | 2011-11-05 | 1 | -10/+31 | |
| * | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAX | Johannes Sixt | 2011-11-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | Add strtoimax() compatibility function. | Nick Alcock | 2011-11-02 | 2 | -3/+13 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ab/clang-lints' | Junio C Hamano | 2011-12-05 | 3 | -5/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/prune-progress' | Junio C Hamano | 2011-12-05 | 5 | -17/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | reachable: per-object progressnd/prune-progress | Jeff King | 2011-11-07 | 1 | -14/+37 | |
| * | | | | | | | | | | | | | | | | | prune: handle --progress/no-progress | Jeff King | 2011-11-07 | 2 | -3/+12 | |
| * | | | | | | | | | | | | | | | | | prune: show progress while marking reachable objects | Nguyễn Thái Ngọc Duy | 2011-11-07 | 4 | -7/+18 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/fsck-progress' | Junio C Hamano | 2011-12-05 | 4 | -27/+96 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fsck: print progressnd/fsck-progress | Nguyễn Thái Ngọc Duy | 2011-11-06 | 4 | -7/+61 | |
| * | | | | | | | | | | | | | | | | | | fsck: avoid reading every object twice | Nguyễn Thái Ngọc Duy | 2011-11-06 | 3 | -21/+39 | |
| * | | | | | | | | | | | | | | | | | | verify_packfile(): check as many object as possible in a pack | Nguyễn Thái Ngọc Duy | 2011-11-06 | 1 | -7/+2 | |
| * | | | | | | | | | | | | | | | | | | fsck: return error code when verify_pack() goes wrong | Nguyễn Thái Ngọc Duy | 2011-11-06 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mf/curl-select-fdset' | Junio C Hamano | 2011-12-05 | 2 | -27/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | http: drop "local" member from request structmf/curl-select-fdset | Jeff King | 2011-11-04 | 2 | -7/+0 | |
| * | | | | | | | | | | | | | | | | | | | http.c: Rely on select instead of tracking whether data was received | Mika Fischer | 2011-11-04 | 2 | -16/+1 | |
| * | | | | | | | | | | | | | | | | | | | http.c: Use timeout suggested by curl instead of fixed 50ms timeout | Mika Fischer | 2011-11-04 | 1 | -2/+18 | |
| * | | | | | | | | | | | | | | | | | | | http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping | Mika Fischer | 2011-11-04 | 1 | -3/+3 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/misc-cleanups' | Junio C Hamano | 2011-12-05 | 10 | -95/+112 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | unpack_object_header_buffer(): clear the size field upon errornd/misc-cleanups | Junio C Hamano | 2011-10-27 | 1 | -1/+2 |