Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t3404: rebase -i: demonstrate short SHA-1 collision | Eric Sunshine | 2013-08-25 | 1 | -0/+24 |
* | t3404: make tests more self-contained | Eric Sunshine | 2013-08-25 | 1 | -2/+63 |
* | Merge branch 'maint' | Junio C Hamano | 2013-08-09 | 1 | -1/+1 |
|\ | |||||
| * | parse-options: fix clang opterror() -Wunused-value warning | Eric Sunshine | 2013-08-09 | 1 | -1/+1 |
* | | Merge branch 'master' of git://github.com/git-l10n/git-po | Junio C Hamano | 2013-08-09 | 5 | -4414/+5144 |
|\ \ | |||||
| * | | l10n: de.po: translate 5 messages | Ralf Thielow | 2013-08-09 | 1 | -188/+243 |
| * | | l10n: de.po: translate 99 new messages | Ralf Thielow | 2013-08-09 | 1 | -1638/+1954 |
| * | | l10n: de.po: switch from pure German to German+English | Ralf Thielow | 2013-08-08 | 1 | -922/+909 |
| * | | l10n: de.po: Fix a typo | Wieland Hoffmann | 2013-08-08 | 1 | -1/+1 |
| * | | l10n: Update Swedish translation (2135t0f0u) | Peter Krefting | 2013-08-06 | 1 | -1521/+1844 |
| * | | l10n: zh_CN.po: translate 5 messages (2135t0f0u) | Jiang Xin | 2013-08-06 | 1 | -164/+182 |
| * | | l10n: vi.po(2135t): v1.8.4 round 2 | Tran Ngoc Quan | 2013-08-06 | 1 | -169/+187 |
| * | | l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed) | Jiang Xin | 2013-08-06 | 1 | -161/+174 |
* | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-08-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-ok | Phil Hord | 2013-08-09 | 1 | -1/+1 |
* | | | | Merge branch 'sb/mailmap-updates' | Junio C Hamano | 2013-08-09 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | .mailmap: fixup entries | Stefan Beller | 2013-08-09 | 1 | -2/+7 |
* | | | | | Git 1.8.4-rc2v1.8.4-rc2 | Junio C Hamano | 2013-08-08 | 2 | -1/+8 |
| |_|/ / |/| | | | |||||
* | | | | Sync with maint to grab trivial doc fixes | Junio C Hamano | 2013-08-05 | 4 | -4/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | fix typo in documentation of git-svn | Felix Gruber | 2013-08-05 | 1 | -1/+1 |
| * | | | Documentation/rev-list-options: add missing word in --*-parents | Torstein Hegge | 2013-08-05 | 1 | -1/+1 |
| * | | | log doc: the argument to --encoding is not optional | Jonathan Nieder | 2013-08-05 | 2 | -2/+2 |
* | | | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakage | René Scharfe | 2013-08-05 | 1 | -2/+2 |
* | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2013-08-05 | 3 | -4352/+5403 |
|\ \ \ \ \ | |||||
| * | | | | | l10n: zh_CN.po: translate 99 messages (2133t0f0u) | Jiang Xin | 2013-08-03 | 1 | -1449/+1851 |
| * | | | | | l10n: vi.po (2133t) | Tran Ngoc Quan | 2013-07-27 | 1 | -1507/+1876 |
| * | | | | | l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed) | Jiang Xin | 2013-07-26 | 1 | -1396/+1676 |
* | | | | | | Merge branch 'sb/mailmap-updates' | Junio C Hamano | 2013-08-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | .mailmap: Multiple addresses of Michael S. Tsirkin | Stefan Beller | 2013-08-05 | 1 | -0/+3 |
* | | | | | | Merge branch 'dn/test-reject-utf-16' | Junio C Hamano | 2013-08-05 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3900: test rejecting log message with NULs correctlydn/test-reject-utf-16 | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
| * | | | | | | Add missing test file for UTF-16. | Brian M. Carlson | 2013-08-05 | 1 | -0/+0 |
* | | | | | | | Merge branch 'bc/commit-invalid-utf8' | Junio C Hamano | 2013-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: typofix for xxFFF[EF] checkbc/commit-invalid-utf8 | Junio C Hamano | 2013-08-05 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat' | Junio C Hamano | 2013-08-02 | 9 | -200/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstat | Ramsay Jones | 2013-07-18 | 9 | -200/+2 |
* | | | | | | | | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-08-02 | 3 | -34/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "cat-file: split --batch input lines on whitespace" | Junio C Hamano | 2013-08-02 | 3 | -34/+3 |
* | | | | | | | | | | Git 1.8.4-rc1v1.8.4-rc1 | Junio C Hamano | 2013-08-01 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ob/typofixes' | Junio C Hamano | 2013-08-01 | 20 | -23/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 20 | -23/+23 |
* | | | | | | | | | | | Merge branch 'ms/subtree-install-fix' | Junio C Hamano | 2013-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | contrib/subtree: Fix make install targetms/subtree-install-fix | Michal Sojka | 2013-07-30 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'jc/rm-submodule-error-message' | Junio C Hamano | 2013-08-01 | 1 | -21/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | builtin/rm.c: consolidate error reporting for removing submodulesjc/rm-submodule-error-message | Junio C Hamano | 2013-07-25 | 1 | -21/+20 |
* | | | | | | | | | | | | | Merge branch 'lf/echo-n-is-not-portable' | Junio C Hamano | 2013-08-01 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portable | Lukas Fleischer | 2013-07-29 | 3 | -7/+7 |
* | | | | | | | | | | | | | | Merge branch 'ma/hg-to-git' | Junio C Hamano | 2013-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | hg-to-git: --allow-empty-message in git commitma/hg-to-git | Maurício C Antunes | 2013-07-23 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |