summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-053-17/+45
|\
| * apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
| * git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-312-3/+29
* | Merge branch 'sb/gpg-plug-fd-leak'Junio C Hamano2013-02-051-1/+3
|\ \
| * | gpg: close stderr once finished with it in verify_signed_buffer()Stephen Boyd2013-01-311-1/+3
* | | Merge branch 'ft/transport-report-segv'Junio C Hamano2013-02-051-1/+1
|\ \ \
| * | | push: fix segfault when HEAD points nowhereFraser Tweedale2013-01-311-1/+1
* | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-041-9/+25
* | | | Merge branch 'maint'Junio C Hamano2013-02-041-0/+28
|\ \ \ \
| * | | | Start preparing for 1.8.1.3Junio C Hamano2013-02-042-1/+29
| * | | | Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano2013-02-043-11/+35
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-041-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maintJunio C Hamano2013-02-041-1/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintJunio C Hamano2013-02-041-0/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dl/am-hg-locale' into maintJunio C Hamano2013-02-041-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/help' into maintJunio C Hamano2013-02-042-18/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-048-51/+118
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-maintainer' into maintJunio C Hamano2013-02-041-91/+256
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maintJunio C Hamano2013-02-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-helpers-in-python-3'Junio C Hamano2013-02-046-29/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"Junio C Hamano2013-01-301-1/+1
| * | | | | | | | | | | | | | git-remote-testpy: fix path hashing on Python 3John Keeping2013-01-281-1/+17
| * | | | | | | | | | | | | | git-remote-testpy: call print as a functionJohn Keeping2013-01-241-14/+14
| * | | | | | | | | | | | | | git-remote-testpy: don't do unbuffered text I/OJohn Keeping2013-01-241-3/+7
| * | | | | | | | | | | | | | git-remote-testpy: hash bytes explicitlyJohn Keeping2013-01-241-4/+4
| * | | | | | | | | | | | | | svn-fe: allow svnrdump_sim.py to run with Python 3John Keeping2013-01-241-2/+2
| * | | | | | | | | | | | | | git_remote_helpers: use 2to3 if building with Python 3John Keeping2013-01-241-0/+10
| * | | | | | | | | | | | | | git_remote_helpers: force rebuild if python version changesJohn Keeping2013-01-242-1/+8
| * | | | | | | | | | | | | | git_remote_helpers: fix input when running under Python 3John Keeping2013-01-201-3/+6
| * | | | | | | | | | | | | | git_remote_helpers: allow building with Python 3John Keeping2013-01-201-1/+1
* | | | | | | | | | | | | | | Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano2013-02-0410-105/+332
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git p4: introduce gitConfigBoolPete Wyckoff2013-01-261-19/+26
| * | | | | | | | | | | | | | | git p4: avoid shell when calling git configPete Wyckoff2013-01-261-6/+9
| * | | | | | | | | | | | | | | git p4: avoid shell when invoking git config --get-allPete Wyckoff2013-01-261-1/+2
| * | | | | | | | | | | | | | | git p4: avoid shell when invoking git rev-listPete Wyckoff2013-01-261-2/+3
| * | | | | | | | | | | | | | | git p4: avoid shell when mapping usersPete Wyckoff2013-01-261-1/+2
| * | | | | | | | | | | | | | | git p4: disable read-only attribute before deletingPete Wyckoff2013-01-261-0/+10
| * | | | | | | | | | | | | | | git p4 test: use test_chmod for cygwinPete Wyckoff2013-01-261-4/+7
| * | | | | | | | | | | | | | | git p4: cygwin p4 client does not mark read-onlyPete Wyckoff2013-01-263-4/+27
| * | | | | | | | | | | | | | | git p4 test: avoid wildcard * in windowsPete Wyckoff2013-01-262-10/+37
| * | | | | | | | | | | | | | | git p4 test: use LineEnd unix in windows tests tooPete Wyckoff2013-01-261-0/+1
| * | | | | | | | | | | | | | | git p4 test: newline handlingPete Wyckoff2013-01-261-0/+117
| * | | | | | | | | | | | | | | git p4: scrub crlf for utf16 files on windowsPete Wyckoff2013-01-261-1/+23
| * | | | | | | | | | | | | | | git p4: remove unreachable windows \r\n conversion codePete Wyckoff2013-01-261-9/+0
| * | | | | | | | | | | | | | | git p4 test: translate windows paths for cygwinPete Wyckoff2013-01-263-3/+26
| * | | | | | | | | | | | | | | git p4 test: start p4d inside its db dirPete Wyckoff2013-01-261-2/+5
| * | | | | | | | | | | | | | | git p4 test: use client_view in t9806Pete Wyckoff2013-01-262-30/+23
| * | | | | | | | | | | | | | | git p4 test: avoid loop in client_viewPete Wyckoff2013-01-262-4/+2
| * | | | | | | | | | | | | | | git p4 test: use client_view to build the initial clientPete Wyckoff2013-01-261-9/+2
View Lorry Controller Status