aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* 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
|\
| * 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
* | | 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
|/ /
* | 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
* | git-pickaxe: retire pickaxeJunio C Hamano2006-11-08
* | Merge branch 'jc/pickaxe'Junio C Hamano2006-11-07
|\ \
| * | git-pickaxe: blame rewritten.Junio C Hamano2006-10-19
* | | Merge branch 'jc/read-tree'Junio C Hamano2006-11-07
|\ \ \
| * | | t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-27
| * | | merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-27
* | | | Merge branch 'lj/refs'Junio C Hamano2006-11-01
|\ \ \ \ | |/ / / |/| | |
| * | | t3200: git-branch testsuite updateJunio C Hamano2006-10-23
| * | | ref-log: fix D/F conflict coming from deleted refs.Junio C Hamano2006-10-19
| * | | git-pack-refs --allJunio C Hamano2006-10-08
| * | | Remove bashism from t3210-pack-refs.shDennis Stosberg2006-10-06
| * | | Merge branch 'master' into lj/refsJunio C Hamano2006-10-02
| |\ \ \
| * | | | Clean up "git-branch.sh" and add remove recursive dir test cases.Christian Couder2006-10-01
| * | | | Uncomment test case: git branch c/d should barf if branch c exists.Christian Couder2006-09-27
| * | | | Add pack-refs and show-ref test cases.Christian Couder2006-09-27
| * | | | Merge branch 'master' into lj/refsJunio C Hamano2006-09-27
| |\ \ \ \
| * | | | | Fix t1400-update-ref test minimallyJunio C Hamano2006-09-17
* | | | | | tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
* | | | | | Merge branch 'maint'Junio C Hamano2006-10-25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Set $HOME for selftestsGerrit Pape2006-10-24
* | | | | Merge branch 'maint'Junio C Hamano2006-10-19
|\ \ \ \ \ | |/ / / /
| * | | | git-apply: prepare for upcoming GNU diff -u format change.Linus Torvalds2006-10-19
* | | | | Merge branch 'js/diff'Junio C Hamano2006-10-18
|\ \ \ \ \
| * | | | | Turn on recursive with --summaryJohannes Schindelin2006-10-05
* | | | | | Merge branch 'rs/zip'Junio C Hamano2006-10-18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | git-archive --format=zip: add symlink supportRene Scharfe2006-10-07