summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | rebase: give a better error message for bogus branchJeff King2011-01-261-0/+1
| * | | | | | rebase: use explicit "--" with checkoutJeff King2011-01-262-2/+2
* | | | | | | Git 1.7.4-rc3v1.7.4-rc3Junio C Hamano2011-01-241-7/+1
* | | | | | | Merge branch 'as/userdiff-pascal'Junio C Hamano2011-01-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | userdiff: match Pascal class methodsAlexey Shumkin2011-01-111-1/+1
* | | | | | | | Merge branch 'jn/setup-fixes'Junio C Hamano2011-01-246-4470/+743
|\ \ \ \ \ \ \ \
| * | | | | | | | t1510: fix typo in the comment of a testJonathan Nieder2011-01-241-1/+1
| * | | | | | | | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecaseJunio C Hamano2011-01-242-17/+21
| * | | | | | | | Subject: setup: officially support --work-tree without --git-dirJonathan Nieder2011-01-212-95/+134
| * | | | | | | | tests: compress the setup testsJonathan Nieder2011-01-191-4401/+618
| * | | | | | | | tests: cosmetic improvements to the repo-setup testJonathan Nieder2011-01-191-44/+50
| * | | | | | | | t/README: hint about using $(pwd) rather than $PWD in testsJohannes Sixt2011-01-111-0/+6
| * | | | | | | | Fix expected values of setup tests on WindowsJohannes Sixt2011-01-112-1167/+1168
| |/ / / / / / /
* | | | | | | | Documentation: do not treat reset --keep as a special caseJonathan Nieder2011-01-211-7/+2
* | | | | | | | Correctly report corrupted objectsBjörn Steinbrink2011-01-201-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-191-1/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | exec_cmd: remove unused externErik Faye-Lund2011-01-191-1/+0
| * | | | | | | Merge branch 'jn/gitweb-no-logo' into maintJunio C Hamano2011-01-191-4/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diff-driver-binary-doc' into maintJunio C Hamano2011-01-191-0/+33
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tr/submodule-relative-scp-url' into maintJunio C Hamano2011-01-192-2/+52
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-difftool-cygwin-workaround' into maintJunio C Hamano2011-01-191-4/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-test-fixes' into maintJunio C Hamano2011-01-194-23/+35
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-gitweb-pathinfo-fix' into maintJunio C Hamano2011-01-191-8/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | |