summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: activate allocaks/tree-diff-nwayKirill Smelkov2014-04-092-0/+1
* combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-072-5/+84
* tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-074-64/+465
* Portable alloca for GitKirill Smelkov2014-03-274-2/+30
* tree-diff: reuse base str(buf) memory on sub-tree recursionKirill Smelkov2014-03-271-19/+19
* tree-diff: no need to call "full" diff_tree_sha1 from show_path()Kirill Smelkov2014-03-271-2/+6
* tree-diff: rework diff_tree interface to be sha1 basedKirill Smelkov2014-03-271-32/+28
* tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-262-4/+2
* tree-diff: remove special-case diff-emitting code for empty-tree casesKirill Smelkov2014-03-261-12/+14
* tree-diff: simplify tree_entry_pathcmpKirill Smelkov2014-03-201-11/+6
* tree-diff: show_path prototype is not needed anymoreKirill Smelkov2014-03-201-3/+0
* tree-diff: rename compare_tree_entry -> tree_entry_pathcmpKirill Smelkov2014-03-201-6/+9
* tree-diff: move all action-taking code out of compare_tree_entry()Kirill Smelkov2014-03-201-16/+12
* tree-diff: don't assume compare_tree_entry() returns -1,0,1Kirill Smelkov2014-03-201-8/+14
* tree-diff: consolidate code for emitting diffs and recursion in one placeKirill Smelkov2014-03-201-30/+82
* tree-diff: show_tree() is not neededKirill Smelkov2014-03-041-32/+3
* tree-diff: no need to pass match to skip_uninteresting()Kirill Smelkov2014-02-241-9/+8
* tree-diff: no need to manually verify that there is no mode change for a pathKirill Smelkov2014-02-241-10/+5
* combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov2014-02-241-27/+53
* combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov2014-02-241-10/+14
* 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