summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge branch 'rj/svn-test'Junio C Hamano2011-01-131-17/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | lib-git-svn.sh: Move web-server handling code into separate functionRamsay Jones2011-01-041-17/+21
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'rj/test-fixes'Junio C Hamano2011-01-133-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t4135-*.sh: Skip the "backslash" tests on cygwinRamsay Jones2011-01-081-1/+0
| * | | | | | | | | | | | | | | | | t3032-*.sh: Do not strip CR from line-endings while grepping on MinGWRamsay Jones2011-01-081-0/+1
| * | | | | | | | | | | | | | | | | t3032-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones2011-01-081-1/+3
| * | | | | | | | | | | | | | | | | t6038-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones2011-01-082-1/+9
* | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano2011-01-131-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | docs: explain diff.*.binary optionJeff King2011-01-101-0/+33
* | | | | | | | | | | | | | | | | | Merge branch 'jn/t9010-work-around-broken-svnadmin'Junio C Hamano2011-01-131-20/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t9010: svnadmin can fail even if availableJonathan Nieder2011-01-101-20/+15
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/submodule-relative-scp-url'Junio C Hamano2011-01-132-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | submodule: fix relative url parsing for scp-style originThomas Rast2011-01-102-2/+52
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | RelNotes/1.7.4: minor fixesMichael J Gruber2011-01-131-25/+25
* | | | | | | | | | | | | | | | | | t0000: quote TAP snippets in test codeThomas Rast2011-01-131-18/+18
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | commit: suggest --amend --reset-author to fix commiter identityMatthieu Moy2011-01-121-2/+2
* | | | | | | | | | | | | | | | | | t9157-*.sh: Make the svn version check more preciseRamsay Jones2011-01-111-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-102-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2011-01-102-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2011-01-102-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-01-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Documentation/git-archive: spell --worktree-attributes correctlyThomas Rast2011-01-101-1/+1
| | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Documentation/githooks: post-rewrite-copy-notes never existedThomas Rast2011-01-101-4/+0
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-081-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Mark gitk script executableAnders Kaseorg2011-01-081-0/+0
* | | | | | | | | | | | | | | | | | | t9157-*.sh: Add an svn version checkRamsay Jones2011-01-071-0/+8
* | | | | | | | | | | | | | | | | | | git svn: fix the final example in man pageStephenB2011-01-071-1/+4
* | | | | | | | | | | | | | | | | | | t3032: limit sed branch labels to 8 charactersBrandon Casey2011-01-061-3/+3
* | | | | | | | | | | | | | | | | | | t0001,t1510,t3301: use sane_unset which always returns with status 0Brandon Casey2011-01-063-37/+37
* | | | | | | | | | | | | | | | | | | trace.c: ensure NULL is not passed to printfBrandon Casey2011-01-061-1/+8
* | | | | | | | | | | | | | | | | | | Git 1.7.4-rc1v1.7.4-rc1Junio C Hamano2011-01-053-3/+9
* | | | | | | | | | | | | | | | | | | Merge branch 'maint' to sync with 1.7.3.5Junio C Hamano2011-01-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Git 1.7.3.5v1.7.3.5Junio C Hamano2011-01-052-1/+3
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jn/svn-fe' (early part)Junio C Hamano2011-01-052-25/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | vcs-svn: Error out for v3 dumpsJonathan Nieder2010-11-242-25/+47
* | | | | | | | | | | | | | | | | | Merge branch 'ao/t9001-fix'Junio C Hamano2011-01-051-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t/t9001-send-email.sh: fix '&&' chain in some testsAntonio Ospite2011-01-041-4/+4
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/convert-pathname-substitution'Junio C Hamano2011-01-053-1/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t0021: avoid getting filter killed with SIGPIPEJunio C Hamano2010-12-221-0/+1
| * | | | | | | | | | | | | | | | | | | convert filter: supply path to external driverPete Wyckoff2010-12-223-1/+74
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg/cvsimport'Junio C Hamano2011-01-052-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | cvsimport: handle the parsing of uppercase config optionsMichael J Gruber2011-01-042-4/+24
| * | | | | | | | | | | | | | | | | | | cvsimport: partial whitespace cleanupMichael J Gruber2010-11-291-8/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-042-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | gitweb: skip logo in atom feed when there is noneJonathan Nieder2011-01-041-1/+1
| * | | | | | | | | | | | | | | | | | | t9001: Fix test prerequisitesRobin H. Johnson2010-12-291-2/+2
* | | | | | | | | | | | | | | | | | | | daemon: support <directory> arguments againJonathan Nieder2011-01-041-3/+4
* | | | | | | | | | | | | | | | | | | | Fix typos in the documentationRalf Wildenhues2011-01-0412-27/+26
* | | | | | | | | | | | | | | | | | | | Git 1.7.4-rc0v1.7.4-rc0Junio C Hamano2010-12-282-11/+10