aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'sb/merge-friendly'Junio C Hamano2006-12-24
|\
| * Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-23
* | Add a test for git-rerereJohannes Schindelin2006-12-21
|/
* Merge branch 'ew/svn-pm'Junio C Hamano2006-12-20
|\
| * git-svn: rename 'commit' command to 'set-tree'Eric Wong2006-12-16
| * git-svn: remove support for the svn command-line clientEric Wong2006-12-16
* | Do not create $GIT_DIR/remotes/ directory anymore.Junio C Hamano2006-12-19
* | Introduce GIT_TEMPLATE_DIRJohannes Schindelin2006-12-19
* | Revert "fix testsuite: make sure they use templates freshly built from the so...Junio C Hamano2006-12-19
* | fix testsuite: make sure they use templates freshly built from the sourceJunio C Hamano2006-12-18
* | Merge branch 'js/branch-config'Junio C Hamano2006-12-17
|\ \
| * | git-branch: rename config vars branch.<branch>.*, tooJohannes Schindelin2006-12-16
| * | add a function to rename sections in the configJohannes Schindelin2006-12-16
| |/
* | Fix check_file_directory_conflict().Junio C Hamano2006-12-17
|/
* Add --add option to git-repo-configBrian Gernhardt2006-12-15
* Enable reflogs by default in any repository with a working directory.Shawn O. Pearce2006-12-15
* make commit message a little more consistent and confortingNicolas Pitre2006-12-15
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-13
|\
| * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-05
* | Merge branch 'lh/branch-rename'Junio C Hamano2006-12-13
|\ \
| * | rename_ref: use lstat(2) when testing for symlinkLars Hjemli2006-12-05
| * | git-branch: add options and tests for branch renamingLars Hjemli2006-12-05
| |/
* | Merge branch 'rr/cvsexportcommit'Junio C Hamano2006-12-13
|\ \
| * | Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg2006-12-11
| |/
* | Merge branch 'js/merge'Junio C Hamano2006-12-13
|\ \
| * | merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-12
| * | Merge branch 'master' into js/mergeJunio C Hamano2006-12-12
| |\ \
| * | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-12
| * | | Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-06
* | | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-13
| |/ / |/| |
* | | add test case for recursive mergeJunio C Hamano2006-12-12
| |/ |/|
* | diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-04
* | Merge branch 'maint'Junio C Hamano2006-12-04
|\ \
| * | git-mv: search more precisely for source directory in indexJohannes Schindelin2006-12-04
* | | Set permissions of each new file before "cvs add"ing it.Jim Meyering2006-12-04
| |/ |/|
* | git-svn: update tests for recent changesEric Wong2006-11-27
* | Merge branch 'jc/push-delete-ref'Junio C Hamano2006-11-26
|\ \
| * | Allow git push to delete remote ref.Junio C Hamano2006-11-24
* | | Merge branch 'jc/merge'Junio C Hamano2006-11-26
|\ \ \ | |/ / |/| |
| * | remove merge-recursive-oldJunio C Hamano2006-11-21
* | | config option log.showroot to show the diff of root commitsPeter Baumann2006-11-24
| |/ |/|
* | trust-executable-bit: fix breakage for symlinksJunio C Hamano2006-11-22
|/
* git-fetch: follow lightweit tags as well.Junio C Hamano2006-11-19
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-16
* Merge branch 'maint'Junio C Hamano2006-11-13
|\
| * Rework cvsexportcommit to handle binary files for all cases.Robin Rosenberg2006-11-13
| * Catch errors when writing an index that contains invalid objects.Johannes Sixt2006-11-13
| * test-lib.sh: A command dying due to a signal is an unexpected failure.Johannes Sixt2006-11-13
* | Merge branch 'maint'Junio C Hamano2006-11-09
|\ \ | |/
| * git-svn: fix dcommit losing changes when out-of-date from svnEric Wong2006-11-09