summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t3900: test log --encoding=noneJunio C Hamano2006-12-301-1/+8
* Fix 'git add' with .gitignoreJunio C Hamano2006-12-291-0/+33
* Add info about new test families (8 and 9) to t/READMEJakub Narebski2006-12-291-0/+2
* t5400 send-pack test: try a bit more nontrivial transfer.Junio C Hamano2006-12-292-9/+45
* Merge branch 'jc/utf8'Junio C Hamano2006-12-286-0/+133
|\
| * t3900: test conversion to non UTF-8 as wellJunio C Hamano2006-12-281-0/+11
| * Rename t3900 test vector fileJunio C Hamano2006-12-272-5/+5
| * UTF-8: introduce i18n.logoutputencoding.Junio C Hamano2006-12-276-0/+122
* | GIT_SKIP_TESTS: allow users to omit tests that are known to breakJunio C Hamano2006-12-281-18/+70
* | xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-281-0/+22
* | git-svn: remove non-delta fetch code pathsEric Wong2006-12-281-2/+1
* | t9200-git-cvsexportcommit.sh: quiet down commitEric Wong2006-12-281-4/+6
* | test-lib: quiet down init-db output for testsEric Wong2006-12-281-1/+1
* | t6024-recursive-merge: quiet down this testEric Wong2006-12-281-43/+47
* | Merge branch 'master' into js/shallowJunio C Hamano2006-12-2728-245/+1030
|\ \
| * | git-svn: quiet down tests and fix some unportable shell constructsEric Wong2006-12-261-131/+127
| |/
| * t3600: update the test for updated git rmJunio C Hamano2006-12-251-4/+74
| * Merge branch 'jc/skip-count'Junio C Hamano2006-12-251-0/+51
| |\
| | * revision: --skip=<n>Junio C Hamano2006-12-201-0/+51
| * | Merge branch 'sb/merge-friendly'Junio C Hamano2006-12-241-3/+3
| |\ \
| | * | Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-231-3/+3
| * | | Add a test for git-rerereJohannes Schindelin2006-12-211-0/+154
| |/ /
| * | Merge branch 'ew/svn-pm'Junio C Hamano2006-12-208-51/+25
| |\ \
| | * | git-svn: rename 'commit' command to 'set-tree'Eric Wong2006-12-163-13/+13
| | * | git-svn: remove support for the svn command-line clientEric Wong2006-12-166-38/+12
| * | | Do not create $GIT_DIR/remotes/ directory anymore.Junio C Hamano2006-12-191-4/+3
| * | | Introduce GIT_TEMPLATE_DIRJohannes Schindelin2006-12-191-1/+2
| * | | Revert "fix testsuite: make sure they use templates freshly built from the so...Junio C Hamano2006-12-1911-36/+26
| * | | fix testsuite: make sure they use templates freshly built from the sourceJunio C Hamano2006-12-1811-26/+36
| | |/ | |/|
| * | Merge branch 'js/branch-config'Junio C Hamano2006-12-172-0/+54
| |\ \
| | * | git-branch: rename config vars branch.<branch>.*, tooJohannes Schindelin2006-12-161-0/+6
| | * | add a function to rename sections in the configJohannes Schindelin2006-12-161-0/+48
| | |/
| * | Fix check_file_directory_conflict().Junio C Hamano2006-12-171-0/+9
| |/
| * Add --add option to git-repo-configBrian Gernhardt2006-12-151-0/+10
| * Enable reflogs by default in any repository with a working directory.Shawn O. Pearce2006-12-151-2/+2
| * make commit message a little more consistent and confortingNicolas Pitre2006-12-151-2/+0
| * Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-131-8/+74
| |\
| | * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-8/+74
| * | Merge branch 'lh/branch-rename'Junio C Hamano2006-12-131-0/+41
| |\ \
| | * | rename_ref: use lstat(2) when testing for symlinkLars Hjemli2006-12-051-0/+7
| | * | git-branch: add options and tests for branch renamingLars Hjemli2006-12-051-0/+34
| | |/
| * | Merge branch 'rr/cvsexportcommit'Junio C Hamano2006-12-131-28/+80
| |\ \
| | * | Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg2006-12-111-28/+80
| | |/
| * | Merge branch 'js/merge'Junio C Hamano2006-12-133-14/+128
| |\ \
| | * | merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-121-1/+11
| | * | Merge branch 'master' into js/mergeJunio C Hamano2006-12-124-4/+101
| | |\ \
| | * | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-13/+1
| | * | | Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+116
| * | | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-131-0/+97
| | |/ / | |/| |
| * | | add test case for recursive mergeJunio C Hamano2006-12-121-0/+70
| | |/ | |/|