summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-019-4/+46
|\
| * status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-168-0/+36
| * git status: document trade-offs in choosing parameters to the -u optionJunio C Hamano2013-03-151-4/+10
* | Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano2013-04-0125-82/+82
|\ \
| * | contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | contrib/examples/git-remote.perl: use a lowercase "usage:" stringDavid Aguilar2013-02-241-4/+4
| * | tests: use a lowercase "usage:" stringDavid Aguilar2013-02-245-5/+5
| * | git-svn: use a lowercase "usage:" stringDavid Aguilar2013-02-241-2/+2
| * | Documentation/user-manual.txt: use a lowercase "usage:" stringDavid Aguilar2013-02-241-2/+2
| * | templates/hooks--update.sample: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | contrib/hooks/setgitperms.perl: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | contrib/examples: use a lowercase "usage:" stringDavid Aguilar2013-02-242-2/+2
| * | contrib/fast-import/import-zips.py: use spaces instead of tabsDavid Aguilar2013-02-241-49/+49
| * | contrib/fast-import/import-zips.py: fix broken error messageDavid Aguilar2013-02-241-2/+2
| * | contrib/fast-import: use a lowercase "usage:" stringDavid Aguilar2013-02-243-3/+3
| * | contrib/credential: use a lowercase "usage:" stringDavid Aguilar2013-02-243-3/+3
| * | git-cvsimport: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-cvsimport: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-cvsexportcommit: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-archimport: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-merge-one-file: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-relink: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-svn: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | git-sh-setup: use a lowercase "usage:" stringDavid Aguilar2013-02-241-3/+3
* | | cat-file: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-1/+1
* | | fast-import: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-0/+1
* | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-281-1/+1
|\ \ \
| * | | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
* | | | More fixes for 1.8.2.1Junio C Hamano2013-03-271-0/+3
* | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-273-2/+4
|\ \ \ \ | |/ / /
| * | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| * | | git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
| * | | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | | More corrections for 1.8.2.1Junio C Hamano2013-03-261-0/+39
* | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-261-3/+6
|\ \ \ \ | |/ / /
| * | | Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
* | | | Merge branch 'we/submodule-update-prefix-output' into maintJunio C Hamano2013-03-262-14/+20
|\ \ \ \
| * | | | submodule update: when using recursion, show full pathWilliam Entriken2013-03-032-14/+20
* | | | | Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
|\ \ \ \ \
| * | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | Merge branch 'rs/zip-compresssed-size-with-export-subst' into maintJunio C Hamano2013-03-262-1/+7
|\ \ \ \ \ \
| * | | | | | archive-zip: fix compressed size for stored export-subst filesRené Scharfe2013-02-272-1/+7
* | | | | | | Merge branch 'jk/utf-8-can-be-spelled-differently' into maintJunio C Hamano2013-03-261-2/+18
|\ \ \ \ \ \ \
| * | | | | | | utf8: accept alternate spellings of UTF-8Jeff King2013-02-251-2/+18
* | | | | | | | Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-262-0/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-232-0/+48
* | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
* | | | | | | | | | Merge branch 'jc/perl-cat-blob' into maintJunio C Hamano2013-03-261-10/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git.pm: fix cat_blob crashes on large filesJoshua Clayton2013-02-221-10/+7
| | |_|/ / / / / / / | |/| | | | | | | |