summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-271-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-221-0/+154
| |/ /
| * | Merge branch 'ew/svn-pm'Junio C Hamano2006-12-218-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-1911-26/+36
| | |/ | |/|
| * | Merge branch 'js/branch-config'Junio C Hamano2006-12-182-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-161-0/+10
| * Enable reflogs by default in any repository with a working directory.Shawn O. Pearce2006-12-161-2/+2
| * make commit message a little more consistent and confortingNicolas Pitre2006-12-161-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-061-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-061-0/+7
| | * | git-branch: add options and tests for branch renamingLars Hjemli2006-12-061-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-131-1/+11
| | * | Merge branch 'master' into js/mergeJunio C Hamano2006-12-134-4/+101
| | |\ \
| | * | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-131-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-131-0/+70
| | |/ | |/|
| * | diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-051-4/+2
| * | Merge branch 'maint'Junio C Hamano2006-12-051-0/+13
| |\ \
| | * | git-mv: search more precisely for source directory in indexJohannes Schindelin2006-12-041-0/+13
| * | | Set permissions of each new file before "cvs add"ing it.Jim Meyering2006-12-041-0/+16
| | |/ | |/|
| * | git-svn: update tests for recent changesEric Wong2006-11-284-2/+10
| * | Merge branch 'jc/push-delete-ref'Junio C Hamano2006-11-271-0/+10
| |\ \
| | * | Allow git push to delete remote ref.Junio C Hamano2006-11-241-0/+10
| * | | Merge branch 'jc/merge'Junio C Hamano2006-11-273-27/+6
| |\ \ \ | | |/ / | |/| |
| | * | remove merge-recursive-oldJunio C Hamano2006-11-223-27/+6
* | | | add tests for shallow stuffJohannes Schindelin2006-11-251-0/+45
|/ / /
* | / config option log.showroot to show the diff of root commitsPeter Baumann2006-11-241-0/+1
| |/ |/|
* | trust-executable-bit: fix breakage for symlinksJunio C Hamano2006-11-231-2/+12
|/
* git-fetch: follow lightweit tags as well.Junio C Hamano2006-11-201-0/+16
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-171-0/+33