summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: handle "Translation of file content failed"ls/p4-translation-failureLars Schneider2015-09-222-12/+17
* git-p4: add test case for "Translation of file content failed" errorLars Schneider2015-09-221-0/+50
* Git 2.6-rc2v2.6.0-rc2Junio C Hamano2015-09-142-1/+9
* Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-09-1413-3515/+3749
|\
| * gitk: Accelerators for the main menuGiuseppe Bilotta2015-09-131-23/+23
| * gitk: Adjust the menu line numbers to compensate for the new entryBeat Bolli2015-09-131-3/+3
| * gitk: Add a "Copy commit summary" commandBeat Bolli2015-08-131-0/+15
| * gitk: Update Bulgarian translation (307t)Alexander Shopov2015-08-131-11/+8
| * gitk: Update .po filesPaul Mackerras2015-05-1712-3403/+3583
| * gitk: Update Bulgarian translation (304t)Alexander Shopov2015-05-171-9/+8
| * gitk: Use translated version of "Command line" in getcommitlinesMarc Branchaud2015-05-171-1/+1
| * gitk: Make it easier to go quickly to a specific commitIsmael Luceno2015-05-171-0/+2
| * gitk: Show the current view's name in the window titleMarc Branchaud2015-05-171-1/+16
| * gitk: Add mouse right-click options to copy path and branch nameMichael Rappazzo2015-05-171-0/+2
| * gitk: Remove mc parameter from proc show_errorAlex Henrie2015-05-171-23/+23
| * gitk: Fix error when changing colors after closing "List references" windowPaul Mackerras2015-05-031-5/+13
| * gitk: Replace catch {unset foo} with unset -nocomplain fooPaul Mackerras2015-05-021-56/+56
| * gitk: Rearrange window title to be more conventionalMarc Branchaud2015-04-061-1/+1
| * gitk: sv.po: Update Swedish translation (305t0f0u)Peter Krefting2015-04-061-7/+23
| * gitk: Fix bad English grammar "Matches none Commit Info"Alex Henrie2015-04-061-1/+1
* | Merge branch 'jk/pack-protocol-doc'Junio C Hamano2015-09-142-21/+30
|\ \
| * | pack-protocol: clarify LF-handling in PKT-LINE()jk/pack-protocol-docJeff King2015-09-032-21/+30
* | | Merge branch 'mp/t7060-diff-index-test'Junio C Hamano2015-09-141-1/+1
|\ \ \
| * | | t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-testMatthieu Prat2015-09-021-1/+1
* | | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-141-1/+1
|\ \ \ \
| * | | | apply: comment grammar fixgb/apply-comment-typofixGiuseppe Bilotta2015-09-091-1/+1
* | | | | Merge git://bogomips.org/git-svnJunio C Hamano2015-09-101-1/+1
|\ \ \ \ \
| * | | | | git-svn: parse authors file more lenientlyMichael J Gruber2015-09-101-1/+1
* | | | | | Sync with 2.5.2Junio C Hamano2015-09-099-28/+125
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Git 2.5.2v2.5.2Junio C Hamano2015-09-044-3/+67
| * | | | | Sync with 2.4.9Junio C Hamano2015-09-048-27/+60
| |\ \ \ \ \
| | * | | | | Git 2.4.9v2.4.9Junio C Hamano2015-09-044-3/+13
| | * | | | | Sync with 2.3.9Junio C Hamano2015-09-047-26/+49
| | |\ \ \ \ \
| | | * | | | | Git 2.3.9v2.3.9Junio C Hamano2015-09-044-3/+13
| | | * | | | | Sync with 2.2.3Junio C Hamano2015-09-046-25/+38
| | | |\ \ \ \ \
| | | | * | | | | Git 2.2.3v2.2.3maint-2.2Junio C Hamano2015-09-044-3/+13
| | | | * | | | | Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano2015-09-044-24/+27
| | | | |\ \ \ \ \
| | | | | * | | | | show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| | | | | * | | | | read_info_alternates: handle paths larger than PATH_MAXJeff King2015-09-041-6/+3
| | | | | * | | | | notes: use a strbuf in add_non_noteJeff King2015-09-041-9/+10
| | | | | * | | | | verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-041-7/+10
| | | | |/ / / / /
* | | | | | | | | Release Notes: typofixJunio C Hamano2015-09-091-1/+1
* | | | | | | | | Git 2.6-rc1v2.6.0-rc1Junio C Hamano2015-09-081-1/+1
* | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-082-2/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-062-2/+77
* | | | | | | | | | Sync with maintJunio C Hamano2015-09-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano2015-09-031-12/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2015-09-032-1/+30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2015-09-032-3/+39
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-033-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \