summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2006-12-27Merge branch 'master' into js/shallowJunio C Hamano
2006-12-27git-svn: quiet down tests and fix some unportable shell constructsEric Wong
2006-12-25t3600: update the test for updated git rmJunio C Hamano
2006-12-25Merge branch 'jc/skip-count'Junio C Hamano
2006-12-24Merge branch 'sb/merge-friendly'Junio C Hamano
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-22Add a test for git-rerereJohannes Schindelin
2006-12-21Merge branch 'ew/svn-pm'Junio C Hamano
2006-12-20revision: --skip=<n>Junio C Hamano
2006-12-19Do not create $GIT_DIR/remotes/ directory anymore.Junio C Hamano
2006-12-19Introduce GIT_TEMPLATE_DIRJohannes Schindelin
2006-12-19Revert "fix testsuite: make sure they use templates freshly built from the so...Junio C Hamano
2006-12-19fix testsuite: make sure they use templates freshly built from the sourceJunio C Hamano
2006-12-18Merge branch 'js/branch-config'Junio C Hamano
2006-12-17Fix check_file_directory_conflict().Junio C Hamano
2006-12-16git-branch: rename config vars branch.<branch>.*, tooJohannes Schindelin
2006-12-16add a function to rename sections in the configJohannes Schindelin
2006-12-16git-svn: rename 'commit' command to 'set-tree'Eric Wong
2006-12-16git-svn: remove support for the svn command-line clientEric Wong
2006-12-16Add --add option to git-repo-configBrian Gernhardt
2006-12-16Enable reflogs by default in any repository with a working directory.Shawn O. Pearce
2006-12-16make commit message a little more consistent and confortingNicolas Pitre
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano
2006-12-13Merge branch 'lh/branch-rename'Junio C Hamano
2006-12-13Merge branch 'rr/cvsexportcommit'Junio C Hamano
2006-12-13Merge branch 'js/merge'Junio C Hamano
2006-12-13Remove uncontested renamed files during merge.Shawn Pearce
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13Merge branch 'master' into js/mergeJunio C Hamano
2006-12-13Get rid of the dependency on RCS' merge programJohannes Schindelin
2006-12-13add test case for recursive mergeJunio C Hamano
2006-12-11Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin
2006-12-06rename_ref: use lstat(2) when testing for symlinkLars Hjemli
2006-12-06git-branch: add options and tests for branch renamingLars Hjemli
2006-12-06read-tree: further loosen "working file will be lost" check.Junio C Hamano
2006-12-05diff -b: ignore whitespace at end of lineJohannes Schindelin
2006-12-05Merge branch 'maint'Junio C Hamano
2006-12-04Set permissions of each new file before "cvs add"ing it.Jim Meyering
2006-12-04git-mv: search more precisely for source directory in indexJohannes Schindelin
2006-11-28git-svn: update tests for recent changesEric Wong
2006-11-27Merge branch 'jc/push-delete-ref'Junio C Hamano
2006-11-27Merge branch 'jc/merge'Junio C Hamano
2006-11-24add tests for shallow stuffJohannes Schindelin
2006-11-24Allow git push to delete remote ref.Junio C Hamano
2006-11-24config option log.showroot to show the diff of root commitsPeter Baumann
2006-11-23trust-executable-bit: fix breakage for symlinksJunio C Hamano
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-11-20git-fetch: follow lightweit tags as well.Junio C Hamano
2006-11-17git-pull: allow pulling into an empty repositoryLinus Torvalds