summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation/config: fix formatting for branch.*.rebase and pull.rebaseas/config-doc-markup-fixAndreas Schwab2015-09-121-6/+6
* pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserveStephen Haberman2013-09-044-11/+135
* Merge branch 'maint'Junio C Hamano2013-08-091-1/+1
|\
| * parse-options: fix clang opterror() -Wunused-value warningEric Sunshine2013-08-091-1/+1
* | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2013-08-095-4414/+5144
|\ \
| * | l10n: de.po: translate 5 messagesRalf Thielow2013-08-091-188/+243
| * | l10n: de.po: translate 99 new messagesRalf Thielow2013-08-091-1638/+1954
| * | l10n: de.po: switch from pure German to German+EnglishRalf Thielow2013-08-081-922/+909
| * | l10n: de.po: Fix a typoWieland Hoffmann2013-08-081-1/+1
| * | l10n: Update Swedish translation (2135t0f0u)Peter Krefting2013-08-061-1521/+1844
| * | l10n: zh_CN.po: translate 5 messages (2135t0f0u)Jiang Xin2013-08-061-164/+182
| * | l10n: vi.po(2135t): v1.8.4 round 2Tran Ngoc Quan2013-08-061-169/+187
| * | l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)Jiang Xin2013-08-061-161/+174
* | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-08-091-1/+1
|\ \ \
| * | | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-okPhil Hord2013-08-091-1/+1
* | | | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-091-2/+7
|\ \ \ \
| * | | | .mailmap: fixup entriesStefan Beller2013-08-091-2/+7
* | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |