summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-129-42/+81
|\
| * enable textconv for diff in verbose status/commitJeff King2008-10-262-0/+9
| * wt-status: load diff ui configJeff King2008-10-262-1/+17
| * only textconv regular filesJeff King2008-10-262-1/+3
| * userdiff: require explicitly allowing textconvJeff King2008-10-267-27/+17
| * refactor userdiff textconv codeJeff King2008-10-262-16/+38
* | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-127-20/+178
|\ \
| * | Avoid using non-portable `echo -n` in tests.Brian Gernhardt2008-10-315-7/+7
| |/
| * add userdiff textconv testsJeff King2008-10-261-0/+118
| * document the diff driver textconv featureJeff King2008-10-261-13/+53
| * diff: add missing static declarationJeff King2008-10-261-1/+1
* | Merge branch 'st/tag'Junio C Hamano2008-11-122-7/+23
|\ \
| * | tag: Add more tests about mixing incompatible modes and optionsSamuel Tardieu2008-11-041-0/+11
| * | tag: Check that options are only allowed in the appropriate modeSamuel Tardieu2008-11-041-7/+12
* | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-124-17/+41
|\ \ \
| * | | git-gui: Request blame metadata in utf-8.Alexander Gavrilov2008-11-111-1/+1
| * | | git-gui: Add the Show SSH Key item to the clone dialog.Alexander Gavrilov2008-11-112-9/+17
| * | | git-gui: Fix focus transition in the blame viewer.Alexander Gavrilov2008-11-112-7/+23
* | | | git.html: Update the links to stale versionsJunio C Hamano2008-11-121-1/+3
* | | | Merge branch 'maint'Junio C Hamano2008-11-128-6/+47
|\ \ \ \
| * | | | Start 1.6.0.5 cycleJunio C Hamano2008-11-122-1/+22
| * | | | Fix pack.packSizeLimit and --max-pack-size handlingNicolas Pitre2008-11-122-2/+16
| * | | | checkout: Fix "initial checkout" detectionJunio C Hamano2008-11-124-3/+9
| * | | | Remove the period after the git-check-attr summaryMatt Kraai2008-11-121-1/+1
* | | | | git-diff: Add --staged as a synonym for --cached.David Symonds2008-11-112-2/+4
* | | | | git-p4: Cache git config for performanceJohn Chapman2008-11-111-1/+4
* | | | | git-p4: Support purged files and optimize memory usageJohn Chapman2008-11-111-7/+7
* | | | | Fix non-literal format in printf-style callsDaniel Lowe2008-11-112-2/+2
* | | | | Merge branch 'maint'Junio C Hamano2008-11-1111-15/+24
|\ \ \ \ \ | |/ / / /
| * | | | Fix non-literal format in printf-style callsDaniel Lowe2008-11-118-12/+12
| * | | | git-submodule: Avoid printing a spurious message.Alexandre Julliard2008-11-111-1/+1
| * | | | git ls-remote: make usage string match manpageStefan Naewe2008-11-111-1/+1
| * | | | Makefile: help people who run 'make check' by mistakeJunio C Hamano2008-11-111-1/+10
* | | | | Merge branch 'maint'Junio C Hamano2008-11-094-11/+29
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: bisect: change a few instances of "git-cmd" to "git cmd"Christian Couder2008-11-091-3/+3
| * | | | Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"Christian Couder2008-11-091-4/+4
| * | | | checkout: Don't crash when switching away from an invalid branch.Alexandre Julliard2008-11-092-4/+22
* | | | | bisect: fix missing "exit"Christian Couder2008-11-091-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2008-11-085-23/+55
|\ \ \ \ \ | |/ / / /
| * | | | GIT 1.6.0.4v1.6.0.4Junio C Hamano2008-11-081-6/+5
| * | | | Update RPM spec for the new location of git-cvsserver.Quy Tonthat2008-11-081-0/+4
| * | | | Merge branch 'cb/maint-update-ref-fix' into maintJunio C Hamano2008-11-084-17/+50
| |\ \ \ \
| | * | | | push: fix local refs update if already up-to-dateClemens Buchacher2008-11-052-14/+39
| | * | | | do not force write of packed refsClemens Buchacher2008-11-052-3/+11
| * | | | | Merge branch 'cj/maint-gitpm-fix-maybe-self' into maintJunio C Hamano2008-11-081-2/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ar/maint-mksnpath' into maintJunio C Hamano2008-11-0813-19/+84
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mv/maint-branch-m-symref' into maintJunio C Hamano2008-11-0811-24/+65
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ds/autoconf'Junio C Hamano2008-11-081-9/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | autoconf: Add link tests to each AC_CHECK_FUNC() testDavid M. Syzdek2008-11-021-9/+19
* | | | | | | | | Merge branch 'rs/blame'Junio C Hamano2008-11-0811-155/+124
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status