summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-clean-nested-dir-safety' into maintJunio C Hamano2009-08-261-0/+39
|\
| * clean: require double -f options to nuke nested git repository and work treeJunio C Hamano2009-07-291-0/+39
* | Merge branch 'jk/maint-merge-msg-fix' into maintJunio C Hamano2009-08-263-3/+63
|\ \
| * | merge: indicate remote tracking branches in merge messageJeff King2009-08-092-1/+11
| * | merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-092-3/+3
| * | add tests for merge message headingsJeff King2009-08-091-0/+50
* | | Merge branch 'jc/apply-epoch-patch' into maintJunio C Hamano2009-08-261-0/+95
|\ \ \
| * | | apply: notice creation/removal patches produced by GNU diffJunio C Hamano2009-07-111-0/+95
* | | | Merge branch 'jp/symlink-dirs' into maintJunio C Hamano2009-08-261-0/+93
|\ \ \ \
| * | | | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-091-0/+6
| * | | | git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-291-1/+1
| * | | | lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2009-07-291-1/+1
| * | | | Demonstrate bugs when a directory is replaced with a symlinkPickens, James E2009-07-291-0/+87
| | |_|/ | |/| |
* | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-261-0/+11
|\ \ \ \
| * \ \ \ Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3Junio C Hamano2009-08-261-0/+11
| |\ \ \ \
| | * | | | add -p: do not attempt to coalesce mode changesThomas Rast2009-08-151-1/+1
| | * | | | git add -p: demonstrate failure when staging both mode and hunkKirill Smelkov2009-08-151-0/+11
* | | | | | Merge branch 'bc/maint-am-email' into maintJunio C Hamano2009-08-211-0/+15
|\ \ \ \ \ \
| * | | | | | am: allow individual e-mail files as inputJunio C Hamano2009-08-101-0/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-211-0/+55
|\ \ \ \ \ \
| * | | | | | merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-301-0/+55
* | | | | | | Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2009-08-211-0/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-3/+2
| * | | | | | t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-0/+14
* | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-071-3/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-071-3/+8
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-071-3/+8
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-071-3/+8
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | t5510: harden the way verify-pack is usedJunio C Hamano2009-08-071-3/+8
| | | * | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-031-0/+61
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-031-0/+8
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-032-0/+14
| | | |\ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | config: Keep inner whitespace verbatimBjörn Steinbrink2009-07-311-0/+5
* | | | | | | | | | | t9143: do not fail if Compress::Zlib is missingEric Wong2009-07-261-3/+12
* | | | | | | | | | | Merge branch 'gp/maint-rebase-p-onto'Junio C Hamano2009-07-261-0/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix rebase -p --ontoGreg Price2009-07-221-0/+80
* | | | | | | | | | | | Merge branch 'en/fast-export'Junio C Hamano2009-07-261-1/+95
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add new fast-export testcasesElijah Newren2009-06-271-0/+88
| * | | | | | | | | | | | fast-export: Omit tags that tag treesElijah Newren2009-06-271-1/+7
* | | | | | | | | | | | | t9142: stop httpd after the testEric Wong2009-07-251-0/+2
* | | | | | | | | | | | | git svn: the branch command no longer needs the full pathEric Wong2009-07-251-4/+4
* | | | | | | | | | | | | git svn: revert default behavior for --minimize-urlEric Wong2009-07-251-4/+4
* | | | | | | | | | | | | git svn: add gc commandRobert Allan Zeh2009-07-251-0/+44
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-07-254-17/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t8005: Nobody writes Russian in shift_jisJunio C Hamano2009-07-254-17/+19
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-07-251-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix severe breakage in "git-apply --whitespace=fix"Junio C Hamano2009-07-251-3/+7
* | | | | | | | | | | | | Merge branch 'js/maint-graft-unhide-true-parents'Junio C Hamano2009-07-251-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git repack: keep commits hidden by a graftJohannes Schindelin2009-07-241-1/+1
View Lorry Controller Status