summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/maint-keep-pack'Junio C Hamano2008-11-161-3/+15
|\
| * repack: only unpack-unreachable if we are deleting redundant packsBrandon Casey2008-11-141-3/+15
* | Merge branch 'jk/commit-v-strip'Junio C Hamano2008-11-161-1/+1
|\ \
| * | status: show "-v" diff even for initial commitJeff King2008-11-121-1/+1
| * | Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-stripJunio C Hamano2008-11-121-0/+73
| |\ \
* | \ \ Merge git://git.bogomips.org/git-svnJunio C Hamano2008-11-132-0/+89
|\ \ \ \
| * | | | git-svn: proper detection of bare repositoriesDeskin Miller2008-11-061-0/+9
| * | | | git-svn: respect i18n.commitencoding configEric Wong2008-11-061-0/+80
* | | | | Merge branch 'jk/maint-commit-v-strip'Junio C Hamano2008-11-121-0/+73
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | commit: Fix stripping of patch in verbose mode.Jeff King2008-11-121-0/+73
* | | | | Merge branch 'np/pack-safer'Junio C Hamano2008-11-122-8/+91
|\ \ \ \ \
| * | | | | t5303: fix printf format string for portabilityJunio C Hamano2008-11-091-1/+1
| * | | | | t5303: work around printf breakage in dashJunio C Hamano2008-11-091-1/+1
| * | | | | extend test coverage for latest pack corruption resilience improvementsNicolas Pitre2008-11-021-7/+89
| * | | | | close another possibility for propagating pack corruptionNicolas Pitre2008-11-021-1/+2
* | | | | | Merge branch 'mk/maint-cg-push'Junio C Hamano2008-11-121-0/+50
|\ \ \ \ \ \
| * | | | | | git push: Interpret $GIT_DIR/branches in a Cogito compatible wayMartin Koegler2008-11-111-0/+50
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bc/maint-keep-pack'Junio C Hamano2008-11-121-0/+73
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | t7700: test that 'repack -a' packs alternate packed objectsBrandon Casey2008-11-121-0/+16
| * | | | | pack-objects: extend --local to mean ignore non-local loose objects tooBrandon Casey2008-11-121-1/+1
| * | | | | t7700: demonstrate mishandling of loose objects in an alternate ODBBrandon Casey2008-11-121-0/+19
| * | | | | repack: don't repack local objects in packs with .keep fileBrandon Casey2008-11-121-1/+1
| * | | | | t7700: demonstrate mishandling of objects in packs with a .keep fileBrandon Casey2008-11-121-0/+38
| |/ / / /
* | | | | Merge branch 'mv/remote-rename'Junio C Hamano2008-11-121-0/+48
|\ \ \ \ \
| * | | | | git-remote rename: migrate from remotes/ and branches/Miklos Vajna2008-11-111-0/+33
| * | | | | Implement git remote renameMiklos Vajna2008-11-051-0/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/deny-push-to-current'Junio C Hamano2008-11-121-29/+58
|\ \ \ \ \
| * | | | | receive-pack: detect push to current branch of non-bare repoJeff King2008-11-091-0/+37
| * | | | | t5516: refactor oddball testsJeff King2008-11-091-29/+21
* | | | | | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-122-5/+21
|\ \ \ \ \ \
| * | | | | | enable textconv for diff in verbose status/commitJeff King2008-10-261-0/+8
| * | | | | | wt-status: load diff ui configJeff King2008-10-261-0/+8
| * | | | | | only textconv regular filesJeff King2008-10-261-1/+1
| * | | | | | userdiff: require explicitly allowing textconvJeff King2008-10-261-1/+1
| * | | | | | refactor userdiff textconv codeJeff King2008-10-261-3/+3
* | | | | | | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-125-6/+124
|\ \ \ \ \ \ \
| * | | | | | | Avoid using non-portable `echo -n` in tests.Brian Gernhardt2008-10-315-7/+7
| |/ / / / / /
| * | | | | | add userdiff textconv testsJeff King2008-10-261-0/+118
* | | | | | | Merge branch 'st/tag'Junio C Hamano2008-11-121-0/+11
|\ \ \ \ \ \ \
| * | | | | | | tag: Add more tests about mixing incompatible modes and optionsSamuel Tardieu2008-11-041-0/+11
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-11-121-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix pack.packSizeLimit and --max-pack-size handlingNicolas Pitre2008-11-121-0/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2008-11-091-0/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | checkout: Don't crash when switching away from an invalid branch.Alexandre Julliard2008-11-091-0/+18
* | | | | | Merge branch 'maint'Junio C Hamano2008-11-082-0/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'cb/maint-update-ref-fix' into maintJunio C Hamano2008-11-082-0/+38
| |\ \ \ \ \
| | * | | | | push: fix local refs update if already up-to-dateClemens Buchacher2008-11-051-0/+31
| | * | | | | do not force write of packed refsClemens Buchacher2008-11-051-0/+7
| | |/ / / /
| * | | | | Merge branch 'mv/maint-branch-m-symref' into maintJunio C Hamano2008-11-082-0/+27
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'js/maint-fetch-update-head' into maintJunio C Hamano2008-11-025-3/+27
| |\ \ \ \ \