summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* worktree: add 'list' commandmr/worktree-listMichael Rappazzo2015-10-083-1/+225
* worktree: add details to the worktree structMichael Rappazzo2015-10-082-11/+48
* worktree: add a function to get worktree detailsMichael Rappazzo2015-10-082-46/+130
* worktree: refactor find_linked_symref functionMichael Rappazzo2015-10-081-27/+69
* worktree: add top-level worktree.cMichael Rappazzo2015-10-026-87/+97
* Git 2.6-rc3v2.6.0-rc3Junio C Hamano2015-09-211-1/+1
* Merge branch 'rj/mailmap-ramsay'Junio C Hamano2015-09-211-1/+1
|\
| * mailmap: update my entry with new email addressrj/mailmap-ramsayRamsay Jones2015-09-161-1/+1
* | Merge branch 'bn/send-email-smtp-auth-error-message-fix'Junio C Hamano2015-09-211-1/+1
|\ \
| * | send-email: fix uninitialized var warning for $smtp_authbn/send-email-smtp-auth-error-message-fixBrian Norris2015-09-211-1/+1
* | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2015-09-218-11681/+14967
|\ \ \
| * | | l10n: de.po: better language for one stringPhillip Sz2015-09-201-1/+1
| * | | l10n: de.po: translate 2 messagesRalf Thielow2015-09-201-101/+108
| * | | l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan2015-09-211-91/+90
| * | | l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila2015-09-211-112/+148
| * | | l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin2015-09-211-78/+77
| * | | l10n: ca.po: update translationAlex Henrie2015-09-211-1760/+2159
| * | | l10n: git.pot: v2.6.0 round 2 (3 improvements)Jiang Xin2015-09-211-76/+72
| * | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-09-217-9913/+12763
| |\ \ \ | | |_|/ | |/| |
| | * | l10n: de.po: translate 123 new messagesRalf Thielow2015-09-211-1640/+2125
| | * | l10n: fr.po v2.6.0 round 1 (2441t)Jean-Noel Avila2015-09-211-1638/+2086
| | * | Merge branch 'master' of github.com:jiangxin/gitJiang Xin2015-09-102-1814/+2390
| | |\ \
| | | * | l10n: zh_CN: for git v2.6.0 l10n round 1Jiang Xin2015-09-081-1607/+2067
| | | * | Merge branch 'master' of github.com:jiangxin/git into masterJiang Xin2015-09-052-214/+330
| | | |\ \
| | | | * | l10n: zh_CN: Update Git Glossary: "commit message"Ray Chen2015-08-251-0/+1
| | | | * | l10n: zh_CN: Update Git Glossary: pickaxeRay Chen2015-08-231-1/+1
| | | | * | l10n: zh_CN: Update Git Glossary: forkRay Chen2015-08-231-2/+2
| | | | * | l10n: zh_CN: Update Git Glossary: tagRay Chen2015-08-231-1/+1
| | | | * | l10n: zh_CN: Update Git Glossary: "dumb", "smart"Ray Chen2015-08-231-2/+2
| | | | * | l10n: zh_CN: Update Git Glossary: SHA-1Ray Chen2015-08-231-1/+1
| | | | * | l10n: zh_CN: Add Surrounding SpacesRay Chen2015-08-101-23/+23
| | | | * | l10n: zh_CN: Add translations for Git glossaryJiang Xin2015-08-071-117/+233
| | | | * | l10n: TEAMS: stash inactive zh_CN team membersJiang Xin2015-08-042-9/+8
| | | | * | l10n: zh_CN: Update Translation of "tag"Ray Chen2015-07-301-67/+67
| | | | * | l10n: zh_CN: Unify Translation of "packfile"Ray Chen2015-07-281-3/+3
| | | | * | l10n: zh_CN: Update Translation: "tag object"Ray Chen2015-07-271-3/+3
| | * | | | l10n: sv.po: Update Swedish translation (2441t0f0u)Peter Krefting2015-09-091-1621/+2102
| | * | | | l10n: Updated Vietnamese translation (2441t)Tran Ngoc Quan2015-09-071-1634/+2107
| | |/ / /
| | * | | l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)Jiang Xin2015-09-051-1566/+1953
* | | | | Update RelNotes to 2.6Junio C Hamano2015-09-171-0/+5
* | | | | Sync with 2.5.3Junio C Hamano2015-09-172-1/+19
|\ \ \ \ \
| * | | | | Git 2.5.3v2.5.3Junio C Hamano2015-09-174-3/+21
| * | | | | Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-172-32/+282
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano2015-09-171-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-171-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'po/doc-branch-desc'Junio C Hamano2015-09-174-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: show usage of branch descriptionpo/doc-branch-descPhilip Oakley2015-09-144-4/+7
* | | | | | | | | | | Merge branch 'et/win32-poll-timeout'Junio C Hamano2015-09-171-2/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | poll: honor the timeout on Win32et/win32-poll-timeoutEdward Thomson2015-09-141-2/+14