summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* whatchanged: document its historical naturemm/war-on-whatchangedJunio C Hamano2013-08-131-33/+7
* core-tutorial: trim the section on Inspecting ChangesJunio C Hamano2013-08-134-37/+47
* Git 1.8.4-rc2v1.8.4-rc2Junio C Hamano2013-08-082-1/+8
* Sync with maint to grab trivial doc fixesJunio C Hamano2013-08-054-4/+4
|\
| * fix typo in documentation of git-svnFelix Gruber2013-08-051-1/+1
| * Documentation/rev-list-options: add missing word in --*-parentsTorstein Hegge2013-08-051-1/+1
| * log doc: the argument to --encoding is not optionalJonathan Nieder2013-08-052-2/+2
* | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-08-051-2/+2
|\ \
| * | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakageRené Scharfe2013-08-051-2/+2
* | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-08-053-4352/+5403
|\ \ \
| * | | l10n: zh_CN.po: translate 99 messages (2133t0f0u)Jiang Xin2013-08-031-1449/+1851
| * | | l10n: vi.po (2133t)Tran Ngoc Quan2013-07-271-1507/+1876
| * | | l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)Jiang Xin2013-07-261-1396/+1676
* | | | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-051-0/+3
|\ \ \ \
| * | | | .mailmap: Multiple addresses of Michael S. TsirkinStefan Beller2013-08-051-0/+3
* | | | | Merge branch 'dn/test-reject-utf-16'Junio C Hamano2013-08-052-2/+2
|\ \ \ \ \
| * | | | | t3900: test rejecting log message with NULs correctlydn/test-reject-utf-16Junio C Hamano2013-08-051-2/+2
| * | | | | Add missing test file for UTF-16.Brian M. Carlson2013-08-051-0/+0
* | | | | | Merge branch 'bc/commit-invalid-utf8'Junio C Hamano2013-08-051-1/+1
|\ \ \ \ \ \
| * | | | | | commit: typofix for xxFFF[EF] checkbc/commit-invalid-utf8Junio C Hamano2013-08-051-1/+1
* | | | | | | Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'Junio C Hamano2013-08-029-200/+2
|\ \ \ \ \ \ \
| * | | | | | | cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstatRamsay Jones2013-07-189-200/+2
* | | | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-08-023-34/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano2013-08-023-34/+3
* | | | | | | | | Git 1.8.4-rc1v1.8.4-rc1Junio C Hamano2013-08-011-1/+1
* | | | | | | | | Merge branch 'ob/typofixes'Junio C Hamano2013-08-0120-23/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | many small typofixesob/typofixesOndřej Bílka2013-07-2920-23/+23
* | | | | | | | | | Merge branch 'ms/subtree-install-fix'Junio C Hamano2013-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib/subtree: Fix make install targetms/subtree-install-fixMichal Sojka2013-07-301-0/+1
* | | | | | | | | | | Merge branch 'jc/rm-submodule-error-message'Junio C Hamano2013-08-011-21/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/rm.c: consolidate error reporting for removing submodulesjc/rm-submodule-error-messageJunio C Hamano2013-07-251-21/+20
* | | | | | | | | | | | Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano2013-08-013-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portableLukas Fleischer2013-07-293-7/+7
* | | | | | | | | | | | | Merge branch 'ma/hg-to-git'Junio C Hamano2013-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | hg-to-git: --allow-empty-message in git commitma/hg-to-gitMaurício C Antunes2013-07-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-08-013-31/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-clean: implement partial matching for selectionJiang Xin2013-07-242-30/+90
| * | | | | | | | | | | | | Documentation/git-clean: fix description for rangeJiang Xin2013-07-241-1/+1
* | | | | | | | | | | | | | Rename advice.object_name_warning to objectNameWarningThomas Rast2013-07-312-2/+2
* | | | | | | | | | | | | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-rebase: fix typorr/rebase-autostashRalf Thielow2013-07-291-1/+1
* | | | | | | | | | | | | | | Merge branch 'rj/commit-slab-fix'Junio C Hamano2013-07-311-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | commit-slab.h: Fix memory allocation and addressingrj/commit-slab-fixRamsay Jones2013-07-291-7/+6
* | | | | | | | | | | | | | | | Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano2013-07-311-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | commit: tweak empty cherry pick advice for sequencerjk/commit-how-to-abort-cherry-pickJeff King2013-07-291-3/+22
* | | | | | | | | | | | | | | | | Merge branch 'ds/doc-two-kinds-of-tags'Junio C Hamano2013-07-311-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | docs/git-tag: explain lightweight versus annotated tagsds/doc-two-kinds-of-tagsDaniele Segato2013-07-291-0/+11
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'rr/maint-tilde-markup-in-doc'Junio C Hamano2013-07-311-12/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config doc: quote paths, fixing tilde-interpretationrr/maint-tilde-markup-in-docRamkumar Ramachandra2013-07-261-12/+14
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mh/packed-refs-do-one-ref-recursion'Junio C Hamano2013-07-311-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \