summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'ak/describe-exact' into maintJunio C Hamano2011-01-191-25/+60
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-fast-import-object-reuse' into maintJunio C Hamano2011-01-191-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/submodule-b-current' into maintJunio C Hamano2011-01-192-20/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-svn-info-test-fix' into maintJunio C Hamano2011-01-191-72/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-relative' into maintJunio C Hamano2011-01-191-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Documentation/fast-import: put explanation of M 040000 <dataref> "" in contextJonathan Nieder2011-01-181-3/+2
* | | | | | | | | | | | | | | | | svndump.c: Fix a printf format compiler warningRamsay Jones2011-01-181-1/+1
* | | | | | | | | | | | | | | | | remote-ext: do not segfault for blank linesJonathan Nieder2011-01-181-4/+4
* | | | | | | | | | | | | | | | | Documentation/fast-import: capitalize beginning of sentenceJonathan Nieder2011-01-181-1/+1
* | | | | | | | | | | | | | | | | ll-merge: simplify opts == NULL caseJonathan Nieder2011-01-151-6/+3
* | | | | | | | | | | | | | | | | Git 1.7.4-rc2v1.7.4-rc2Junio C Hamano2011-01-132-3/+11
* | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-no-logo'Junio C Hamano2011-01-131-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | gitweb: make logo optionalJonathan Nieder2011-01-041-4/+9
* | | | | | | | | | | | | | | | | Merge branch 'jn/perl-funcname'Junio C Hamano2011-01-133-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | userdiff/perl: catch BEGIN/END/... and POD as headersJunio C Hamano2010-12-271-1/+3
| * | | | | | | | | | | | | | | | | diff: funcname and word patterns for perlJonathan Nieder2010-12-273-1/+18
* | | | | | | | | | | | | | | | | | Merge branch 'sr/gitweb-hilite-more'Junio C Hamano2011-01-131-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gitweb: remove unnecessary test when closing file descriptorSylvain Rabot2011-01-041-2/+1
| * | | | | | | | | | | | | | | | | | gitweb: add extensions to highlight feature mapSylvain Rabot2011-01-041-3/+4
* | | | | | | | | | | | | | | | | | | 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