summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | l10n: remove 2 blank translations on Danish, DutchJiang Xin2014-01-253-7004/+0
| * | | | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 27 messages (2210t0f0u)Jiang Xin2014-01-251-837/+972
| * | | | | | | | | | | | | | | | | | | | l10n: Update Swedish translation (2210t0f0u)Peter Krefting2014-01-211-826/+933
| * | | | | | | | | | | | | | | | | | | | Merge branch 'fr-po' of git://github.com/jnavila/gitJiang Xin2014-01-181-843/+964
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | [fr] update french translation 2210/2210Jean-Noel Avila2014-01-181-843/+964
| * | | | | | | | | | | | | | | | | | | | | l10n: vi.po (2210t): Updated git-core translationTran Ngoc Quan2014-01-181-1149/+1240
| |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | l10n: git.pot: v1.9 round 1 (27 new, 11 removed)Jiang Xin2014-01-181-812/+892
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | pager test: make fake pager consume all its inputjn/pager-lv-default-envJonathan Nieder2014-01-311-1/+1
* | | | | | | | | | | | | | | | | | | | | | Git 1.9-rc1v1.9-rc1Junio C Hamano2014-01-272-1/+47
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut'Junio C Hamano2014-01-272-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-272-1/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/doc-http-protocol-in-html'Junio C Hamano2014-01-272-114/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | http-protocol.txt: don't use uppercase for variable names in "The Negotiation...ta/doc-http-protocol-in-htmlThomas Ackermann2014-01-271-23/+22
| * | | | | | | | | | | | | | | | | | | | | Documentation: make it easier to maintain enumerated documentsJunio C Hamano2014-01-271-3/+6
| * | | | | | | | | | | | | | | | | | | | | create HTML for http-protocol.txtThomas Ackermann2014-01-272-105/+110
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/doc-wo-names'Junio C Hamano2014-01-276-40/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | doc: remote author/documentation sections from more pagesmh/doc-wo-namesMichael Haggerty2014-01-276-40/+0
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/revision-o-is-in-libgit-a'Junio C Hamano2014-01-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Makefile: remove redundant object in git-http{fetch,push}jk/revision-o-is-in-libgit-aJohn Keeping2014-01-271-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2014-01-271-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | repack: propagate pack-objects options as stringssb/repack-in-cJeff King2014-01-231-11/+11
| * | | | | | | | | | | | | | | | | | | | | repack: make parsed string options const-correctJeff King2014-01-231-1/+1
| * | | | | | | | | | | | | | | | | | | | | repack: fix typo in max-pack-size optionJeff King2014-01-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-fixes'Junio C Hamano2014-01-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t7700: do not use "touch" unnecessarilyjk/test-fixesJeff King2014-01-231-1/+1
| * | | | | | | | | | | | | | | | | | | | | | t7501: fix "empty commit" test with NO_PERLJeff King2014-01-231-0/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-272-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()nd/negative-pathspecNguyễn Thái Ngọc Duy2014-01-232-1/+18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4'Junio C Hamano2014-01-2710-44/+342
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git p4 doc: use two-line style for options with multiple spellingspw/git-p4Pete Wyckoff2014-01-221-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: examine behavior with locked (+l) filesPete Wyckoff2014-01-221-0/+145
| * | | | | | | | | | | | | | | | | | | | | | | git p4: fix an error message when "p4 where" failsPete Wyckoff2014-01-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff2014-01-222-2/+25
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: do not pollute /tmpPete Wyckoff2014-01-223-4/+12
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: run as user "author"Pete Wyckoff2014-01-222-25/+28
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: is_cli_file_writeable succeedsPete Wyckoff2014-01-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: explicitly check p4 wildcard deletePete Wyckoff2014-01-221-0/+27
| * | | | | | | | | | | | | | | | | | | | | | | git p4: work around p4 bug that causes empty symlinksPete Wyckoff2014-01-222-1/+74
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: ensure p4 symlink parsing worksPete Wyckoff2014-01-211-0/+17
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: wildcards are supportedPete Wyckoff2014-01-211-8/+8
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/safe-create-leading-dir-with-slash'Junio C Hamano2014-01-271-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | safe_create_leading_directories(): on Windows, \ can separate path componentsss/safe-create-leading-dir-with-slashMichael Haggerty2014-01-221-4/+8
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-276-67/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | rename_tmp_log(): on SCLD_VANISHED, retrymh/safe-create-leading-directoriesMichael Haggerty2014-01-211-1/+8
| * | | | | | | | | | | | | | | | | | | | | | | | rename_tmp_log(): limit the number of remote_empty_directories() attemptsMichael Haggerty2014-01-211-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | rename_tmp_log(): handle a possible mkdir/rmdir raceMichael Haggerty2014-01-211-1/+10
| * | | | | | | | | | | | | | | | | | | | | | | | rename_ref(): extract function rename_tmp_log()Michael Haggerty2014-01-211-22/+30
| * | | | | | | | | | | | | | | | | | | | | | | | remove_dir_recurse(): handle disappearing files and directoriesMichael Haggerty2014-01-211-6/+16
| * | | | | | | | | | | | | | | | | | | | | | | | remove_dir_recurse(): tighten condition for removing unreadable dirMichael Haggerty2014-01-211-2/+5