summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-202-1/+45
* tests: add checking that combine-diff emits only correct pathsks/combine-diffKirill Smelkov2014-02-241-0/+106
* combine-diff: simplify intersect_paths() furtherJunio C Hamano2014-02-241-22/+12
* combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-243-24/+9
* combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov2014-02-241-21/+73
* diff test: add tests for combine-diff with orderfileKirill Smelkov2014-02-241-0/+21
* diffcore-order: export generic ordering interfaceKirill Smelkov2014-02-242-19/+46
* tree-walk: finally switch over tree descriptors to contain a pre-parsed entryks/tree-diff-walkKirill Smelkov2014-02-242-2/+2
* revision: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-11/+1
* line-log: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-24/+2
* tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old...Kirill Smelkov2014-02-051-14/+1
* tree-diff: allow diff_tree_sha1 to accept NULL sha1Kirill Smelkov2014-02-051-8/+4
* Git 1.9-rc2v1.9-rc2Junio C Hamano2014-01-311-1/+1
* Merge git://github.com/git-l10n/git-poJunio C Hamano2014-01-319-11470/+15408
|\
| * l10n: Bulgarian translation of git (222t21f1967u)Alexander Shopov2014-01-291-0/+10404
| * po/TEAMS: Added Bulgarian teamAlexander Shopov2014-01-281-0/+4
| * 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
View Lorry Controller Status