summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| * \ \ \ Merge branch 'jk/maint-ls-files-other' into maintJunio C Hamano2008-11-021-0/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-reset-remove-unmerged-new' into maintJunio C Hamano2008-11-021-0/+60
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-co-track' into maintJunio C Hamano2008-11-021-6/+20
| |\ \ \ \ \ \
* | | | | | | | t5400: expect success for denying deletionJeff King2008-11-081-1/+1
* | | | | | | | Merge branch 'mv/maint-branch-m-symref'Junio C Hamano2008-11-052-0/+27
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | update-ref --no-deref -d: handle the case when the pointed ref is packedMiklos Vajna2008-10-311-0/+11
| * | | | | | | git branch -m: forbid renaming of a symrefMiklos Vajna2008-10-301-4/+4
| * | | | | | | Fix git update-ref --no-deref -d.Miklos Vajna2008-10-261-0/+7
| * | | | | | | Fix git branch -m for symrefs.Miklos Vajna2008-10-261-0/+9
* | | | | | | | Merge branch 'np/index-pack'Junio C Hamano2008-11-021-27/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | improve index-pack testsNicolas Pitre2008-10-221-27/+65
* | | | | | | | | Merge branch 'sh/rebase-i-p'Junio C Hamano2008-11-021-0/+135
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman2008-10-161-2/+2
| * | | | | | | | | rebase-i-p: test to exclude commits from todo based on its parentsStephen Haberman2008-10-161-0/+135
* | | | | | | | | | Merge branch 'ag/blame-encoding'Junio C Hamano2008-11-024-0/+98
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-blame: Reencode commit messages according to git-log rules.Alexander Gavrilov2008-10-214-0/+98
* | | | | | | | | | | Introduce receive.denyDeletesJan Krüger2008-11-021-0/+11
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Use test-chmtime -v instead of perl in t5000 to get mtime of a fileAlex Riesen2008-10-311-1/+1
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-10-261-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | git-archive: work in bare reposCharles Bailey2008-10-261-0/+21
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | git-remote: list branches in vertical listsJohannes Sixt2008-10-221-5/+9
* | | | | | | | | rm: loosen safety valve for empty filesJeff King2008-10-221-0/+13
* | | | | | | | | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-10-211-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4012: use test_cmp instead of cmpJeff King2008-10-181-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/maint-fetch-update-head'Junio C Hamano2008-10-215-3/+27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-171-0/+12
| * | | | | | | | Fix fetch/pull when run without --update-head-okJohannes Schindelin2008-10-134-3/+15
* | | | | | | | | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-211-6/+20
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
View Lorry Controller Status