summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3401: use test_commit in setuprr/test-chainingMartin von Zweigbergk2011-12-111-25/+10
* t3401: modernize styleMartin von Zweigbergk2011-12-111-34/+33
* t3040 (subprojects-basic): fix '&&' chaining, modernize styleRamkumar Ramachandra2011-12-091-72/+72
* t1510 (worktree): fix '&&' chainingRamkumar Ramachandra2011-12-091-3/+3
* t3030 (merge-recursive): use test_expect_codeRamkumar Ramachandra2011-12-091-66/+6
* test: fix '&&' chainingRamkumar Ramachandra2011-12-0810-17/+17
* t3200 (branch): fix '&&' chainingRamkumar Ramachandra2011-12-081-2/+2
* Merge branch 'master' of git://bogomips.org/git-svnrr/parse-subcommandJunio C Hamano2011-12-051-1/+1
|\
| * git-svn.perl: close the edit for propedits even with no modsSteven Walter2011-12-011-1/+1
* | Kick-off the 1.7.9 cycleJunio C Hamano2011-12-053-2/+29
* | Merge branch 'jk/refresh-porcelain-output'Junio C Hamano2011-12-051-10/+32
|\ \
| * | refresh_index: make porcelain output more specificjk/refresh-porcelain-outputJeff King2011-11-181-2/+21
| * | refresh_index: rename format variablesJeff King2011-11-181-6/+6
| * | read-cache: let refresh_cache_ent pass up changed flagsJeff King2011-11-181-3/+6
* | | Merge branch 'gh/userdiff-matlab'Junio C Hamano2011-12-057-1/+39
|\ \ \
| * | | Add built-in diff patterns for MATLAB codegh/userdiff-matlabGustaf Hendeby2011-11-157-1/+39
| |/ /
* | | Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-052-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 'vr/git-merge-default-to-upstream'Junio C Hamano2011-12-051-3/+6
|\ \ \ \
| * | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstreamVincent van Ravesteijn2011-11-211-3/+6
* | | | | Merge branch 'jc/maint-pack-object-cycle'Junio C Hamano2011-12-051-12/+43
|\ \ \ \ \
| * | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycleJunio C Hamano2011-11-161-12/+43
* | | | | | Merge branch 'jc/index-pack-reject-dups'Junio C Hamano2011-12-054-2/+11
|\ \ \ \ \ \
| * | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dupsJunio C Hamano2011-11-164-2/+11
* | | | | | | Merge branch 'vr/msvc'Junio C Hamano2011-12-0514-19/+7
|\ \ \ \ \ \ \
| * | | | | | | MSVC: Remove unneeded header stubsvr/msvcVincent van Ravesteijn2011-10-3112-12/+0
| * | | | | | | Compile fix for MSVC: Include <io.h>Vincent van Ravesteijn2011-10-311-0/+1
| * | | | | | | Compile fix for MSVC: Do not include sys/resources.hVincent van Ravesteijn2011-10-311-7/+6
* | | | | | | | Merge branch 'na/strtoimax'Junio C Hamano2011-12-054-13/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimaxNick Alcock2011-11-051-10/+31
| * | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAXJohannes Sixt2011-11-051-0/+2
| * | | | | | | | Add strtoimax() compatibility function.Nick Alcock2011-11-022-3/+13
* | | | | | | | | Merge branch 'ab/clang-lints'Junio C Hamano2011-12-053-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-062-2/+2
| * | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
* | | | | | | | | | Merge branch 'nd/prune-progress'Junio C Hamano2011-12-055-17/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reachable: per-object progressnd/prune-progressJeff King2011-11-071-14/+37
| * | | | | | | | | | prune: handle --progress/no-progressJeff King2011-11-072-3/+12
| * | | | | | | | | | prune: show progress while marking reachable objectsNguyễn Thái Ngọc Duy2011-11-074-7/+18
* | | | | | | | | | | Merge branch 'nd/fsck-progress'Junio C Hamano2011-12-054-27/+96
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: print progressnd/fsck-progressNguyễn Thái Ngọc Duy2011-11-064-7/+61
| * | | | | | | | | | | fsck: avoid reading every object twiceNguyễn Thái Ngọc Duy2011-11-063-21/+39
| * | | | | | | | | | | verify_packfile(): check as many object as possible in a packNguyễn Thái Ngọc Duy2011-11-061-7/+2
| * | | | | | | | | | | fsck: return error code when verify_pack() goes wrongNguyễn Thái Ngọc Duy2011-11-061-1/+3
* | | | | | | | | | | | Merge branch 'mf/curl-select-fdset'Junio C Hamano2011-12-052-27/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http: drop "local" member from request structmf/curl-select-fdsetJeff King2011-11-042-7/+0
| * | | | | | | | | | | | http.c: Rely on select instead of tracking whether data was receivedMika Fischer2011-11-042-16/+1
| * | | | | | | | | | | | http.c: Use timeout suggested by curl instead of fixed 50ms timeoutMika Fischer2011-11-041-2/+18
| * | | | | | | | | | | | http.c: Use curl_multi_fdset to select on curl fds instead of just sleepingMika Fischer2011-11-041-3/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/misc-cleanups'Junio C Hamano2011-12-0510-95/+112
|\ \ \ \ \ \ \ \ \ \ \ \