summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/gpg-i18n'Junio C Hamano2013-02-071-3/+3
|\
| * gpg: allow translation of more error messagesStephen Boyd2013-01-311-3/+3
* | Merge branch 'jk/python-styles'Junio C Hamano2013-02-071-0/+14
|\ \
| * | CodingGuidelines: add Python coding guidelinesJohn Keeping2013-01-301-0/+14
* | | Merge branch 'ab/gitweb-use-same-scheme'Junio C Hamano2013-02-071-2/+2
|\ \ \
| * | | gitweb: refer to picon/gravatar images over the same schemeAndrej E Baranov2013-01-281-2/+2
* | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-051-0/+24
* | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache'Junio C Hamano2013-02-051-2/+3
|\ \ \ \
| * | | | Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder2013-02-011-2/+3
* | | | | Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-05137-959/+982
|\ \ \ \ \
| * | | | | Documentation: StGit is the right spelling, not StGITThomas Ackermann2013-02-011-2/+2
| * | | | | Documentation: describe the "repository" in repository-layoutJunio C Hamano2013-02-011-6/+18
| * | | | | Documentation: add a description for 'gitfile' to glossaryThomas Ackermann2013-02-011-0/+4
| * | | | | Documentation: do not use undefined terms git-dir and git-fileThomas Ackermann2013-02-011-3/+5
| * | | | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01128-902/+902
| * | | | | Documentation: avoid poor-man's small caps GITThomas Ackermann2013-02-0128-48/+53
| | |_|/ / | |/| | |
* | | | | 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