summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: convert prep_temp_blob() to struct object_idbc/coccibrian m. carlson2016-06-281-4/+4
* merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-283-20/+20
* merge-recursive: convert leaf functions to use struct object_idbrian m. carlson2016-06-281-118/+118
* merge-recursive: convert struct merge_file_info to object_idbrian m. carlson2016-06-281-19/+20
* merge-recursive: convert struct stage_data to use object_idbrian m. carlson2016-06-281-20/+18
* diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-286-25/+25
* diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-2813-128/+147
* coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-283-10/+9
* coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-285-6/+6
* contrib/coccinelle: add basic Coccinelle transformsbrian m. carlson2016-06-282-0/+97
* hex: add oid_to_hex_r()brian m. carlson2016-06-282-0/+6
* Git 2.9v2.9.0Junio C Hamano2016-06-132-1/+6
* Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-poJunio C Hamano2016-06-1210-15125/+19378
|\
| * l10n: ko.po: Update Korean translationChangwoo Ryu2016-06-121-1393/+1799
| * Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-06-111-1404/+1767
| |\
| | * l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-06-111-1404/+1767
| * | l10n: de.po: translate 104 new messagesRalf Thielow2016-06-101-1428/+1882
| |/
| * l10n: zh_CN: review for git v2.9.0 l10n round 1Ray Chen2016-06-091-15/+15
| * l10n: zh_CN: for git v2.9.0 l10n round 1Jiang Xin2016-06-061-1575/+1800
| * l10n: pt_PT: update Portuguese translationVasco Almeida2016-05-311-276/+322
| * l10n: pt_PT: update according to git-gui glossaryVasco Almeida2016-05-311-190/+191
| * l10n: pt_PT: merge git.pot fileVasco Almeida2016-05-311-1389/+1821
| * l10n: Updated Bulgarian translation of git (2597t,0f,0u)Alexander Shopov2016-05-291-2034/+2655
| * Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/gitJiang Xin2016-05-291-1410/+1840
| |\
| | * l10n: fr.po v2.9.0rnd1Jean-Noel Avila2016-05-261-1410/+1840
| * | l10n: sv.po: Update Swedish translation (2597t0f0u)Peter Krefting2016-05-271-1412/+1857
| |/
| * Merge branch 'fix_fr' of git://github.com/jnavila/gitJiang Xin2016-05-261-1/+1
| |\
| | * l10n: fr.po Fixed grammar mistakeAntonin2016-04-281-1/+1
| * | l10n: Updated Vietnamese translation (2597t)Tran Ngoc Quan2016-05-251-1405/+1869
| * | l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)Jiang Xin2016-05-241-1356/+1722
* | | Hopefully the final last-minute update before 2.9 finalJunio C Hamano2016-06-101-3/+7
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-103-1/+13
|\ \ \
| * | | diff: disable compaction heuristic for nowjk/diff-compact-heuristicJunio C Hamano2016-06-103-1/+13
* | | | Merge branch 'jk/shell-portability'Junio C Hamano2016-06-104-4/+25
|\ \ \ \
| * | | | t5500 & t7403: lose bash-ism "local"jk/shell-portabilityJunio C Hamano2016-06-012-3/+2
| * | | | test-lib: add in-shell "env" replacementJeff King2016-06-012-1/+23
* | | | | Merge branch 'jc/t2300-setup'Junio C Hamano2016-06-101-1/+2
|\ \ \ \ \
| * | | | | t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-011-1/+2
| |/ / / /
* | | | | Git 2.9-rc2v2.9.0-rc2Junio C Hamano2016-06-062-26/+7
* | | | | Sync with 2.8.4Junio C Hamano2016-06-062-1/+16
|\ \ \ \ \
| * | | | | Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18
| * | | | | Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-062-5/+56
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'da/difftool' into maintJunio C Hamano2016-06-062-2/+30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-064-189/+141
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-065-0/+47
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/submodule-helper-relative-path'Junio C Hamano2016-06-062-43/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: remove bashism from shell scriptsb/submodule-helper-relative-pathStefan Beller2016-06-012-43/+20
* | | | | | | | | | Merge branch 'sb/submodule-helper-list-signal-unmatch-via-exit-status'Junio C Hamano2016-06-062-7/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | submodule--helper: offer a consistent APIsb/submodule-helper-list-signal-unmatch-via-exit-statusStefan Beller2016-06-012-7/+17
* | | | | | | | | | Almost ready for 2.9-rc2Junio C Hamano2016-06-031-0/+19