summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.3.3v1.7.3.3Junio C Hamano2010-12-032-3/+11
* CodingGuidelines: mention whitespace preferences for shell scriptsGiuseppe Bilotta2010-12-031-0/+4
* Documentation: do not misinterpret pull refspec as bold textJonathan Nieder2010-12-031-2/+2
* Prepare for 1.7.3.3Junio C Hamano2010-12-025-1/+77
|\
| * Git 1.7.2.4v1.7.2.4Junio C Hamano2010-12-025-2/+32
| |\
| | * Git 1.7.1.3v1.7.1.3Junio C Hamano2010-12-024-2/+22
| | |\
| | | * Git 1.7.0.8v1.7.0.8Junio C Hamano2010-12-023-2/+12
* | | | Documentation: Fix mark-up of lines with more than one tildeJunio C Hamano2010-12-022-2/+2
* | | | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-022-1/+35
|\ \ \ \
| * | | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-152-1/+35
* | | | | Merge branch 'jk/add-e-doc' into maintJunio C Hamano2010-12-021-3/+77
|\ \ \ \ \
| * | | | | docs: give more hints about how "add -e" worksJeff King2010-11-091-28/+76
| * | | | | docs: give more hints about how "add -e" worksJeff King2010-10-211-3/+29
* | | | | | Merge branch 'bg/maint-gitweb-test-lib' into maintJunio C Hamano2010-12-021-1/+1
|\ \ \ \ \ \
| * | | | | | t/gitweb-lib: Don't pass constant to decode_utf8Brian Gernhardt2010-10-201-1/+1
| |/ / / / /
* | | | | | Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-023-3/+16
|\ \ \ \ \ \
| * | | | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-182-1/+14
| * | | | | | prefix_filename(): safely handle the case where pfx_len=0Thomas Rast2010-10-181-2/+2
* | | | | | | Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-026-25/+114
|\ \ \ \ \ \ \
| * | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-296-21/+30
| * | | | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinksKirill Smelkov2010-09-292-0/+78
| * | | | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro...Kirill Smelkov2010-09-292-12/+14
* | | | | | | | Merge branch 'bc/fortran-userdiff' into maintJunio C Hamano2010-12-023-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | userdiff.c: add builtin fortran regex patternsBrandon Casey2010-09-103-1/+20
* | | | | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-014-5/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-012-2/+7
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-012-2/+7
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | add: introduce add.ignoreerrors synonym for add.ignore-errorsJonathan Nieder2010-12-012-2/+7
| * | | | | | | | bash: Match lightweight tags in promptknittl2010-12-011-1/+1
| * | | | | | | | git-commit.txt: (synopsis): move -i and -o before "--"Jari Aalto2010-12-011-2/+2
* | | | | | | | | Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-241-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: Remove --tags option from manpageJens Lehmann2010-11-031-0/+2
* | | | | | | | | | Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-244-47/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-202-3/+41
| * | | | | | | | | | test-lib: extend test_decode_color to handle more color codesKevin Ballard2010-10-202-44/+77
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-242-16/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4203: do not let "git shortlog" DWIM based on ttyJunio C Hamano2010-10-191-2/+2
| * | | | | | | | | | t4203 (mailmap): stop hardcoding commit ids and datesJonathan Nieder2010-10-181-9/+17
| * | | | | | | | | | mailmap: fix use of freed memoryJim Meyering2010-10-132-7/+44
* | | | | | | | | | | Merge branch 'tr/maint-git-repack-tmpfile' into maintJunio C Hamano2010-11-241-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | repack: place temporary packs under .git/objects/pack/Thomas Rast2010-10-191-2/+3
* | | | | | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-242-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-292-1/+32
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-181-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-242-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directoriesAndreas Köhler2010-10-132-3/+14
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-244-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-134-6/+16
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-243-25/+124
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status