summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reset: --unmergejc/reset-unmergeJunio C Hamano2016-10-242-1/+43
* Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-10-172-2417/+2813
|\
| * Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-10-161-26/+26
| |\
| | * l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-07-121-26/+26
| * | l10n: de.po: translate 260 new messagesRalf Thielow2016-10-121-2387/+2783
| * | l10n: de.po: fix translation of autostashRalf Thielow2016-09-121-4/+4
* | | Start preparing for 2.10.2Junio C Hamano2016-10-112-1/+46
* | | Merge branch 'jk/verify-packfile-gently' into maintJunio C Hamano2016-10-111-5/+2
|\ \ \
| * | | verify_packfile: check pack validity before accessing datajk/verify-packfile-gentlyJeff King2016-09-221-5/+2
* | | | Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
|\ \ \ \
| * | | | worktree: honor configuration variablesjc/worktree-configJunio C Hamano2016-09-271-0/+2
* | | | | Merge branch 'jc/verify-loose-object-header' into maintJunio C Hamano2016-10-112-8/+30
|\ \ \ \ \
| * | | | | unpack_sha1_header(): detect malformed object headerjc/verify-loose-object-headerJunio C Hamano2016-09-261-2/+24
| * | | | | streaming: make sure to notice corrupt objectJunio C Hamano2016-09-261-6/+6
* | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maintJunio C Hamano2016-10-111-6/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntaxJunio C Hamano2016-09-261-6/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | git-gui: stop using deprecated merge syntaxRené Scharfe2016-09-261-6/+1
* | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano2016-10-116-33/+159
|\ \ \ \ \ \ \
| * | | | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-stringKevin Daudt2016-09-286-0/+124
| * | | | | | | t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-281-33/+35
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'pb/rev-list-reverse-with-count' into maintJunio C Hamano2016-10-111-2/+3
|\ \ \ \ \ \ \
| * | | | | | | rev-list-options: clarify the usage of --reversepb/rev-list-reverse-with-countPranit Bauva2016-09-271-2/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/graph-padding-fix' into maintJunio C Hamano2016-10-111-4/+12
|\ \ \ \ \ \ \
| * | | | | | | graph: fix extra spaces in graph_padding_linejk/graph-padding-fixJeff King2016-09-291-4/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sg/ref-filter-parse-optim' into maintJunio C Hamano2016-10-111-11/+11
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optimSZEDER Gábor2016-10-031-11/+11
* | | | | | | | Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-117-9/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-256-9/+32
| * | | | | | | | add COPY_ARRAYRené Scharfe2016-09-251-0/+8
* | | | | | | | | Merge branch 'dt/mailinfo' into maintJunio C Hamano2016-10-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add David Turner's Two Sigma addressdt/mailinfoDavid Turner2016-09-261-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Git 2.10.1v2.10.1Junio C Hamano2016-10-033-2/+14
* | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null' into maintJunio C Hamano2016-10-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ident: handle NULL ai_canonnamejk/ident-ai-canonname-could-be-nullJeff King2016-09-231-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/doc-cvs-update' into maintJunio C Hamano2016-10-032-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/cvs-migration: mention cvsimport caveatsjk/doc-cvs-updateJeff King2016-09-221-0/+4
| * | | | | | | | | docs/cvs-migration: update link to cvsps homepageJeff King2016-09-221-1/+1
| * | | | | | | | | docs/cvsimport: prefer cvs-fast-export to parsecvsJeff King2016-09-221-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-032-30/+95
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | pack-objects: walk tag chains for --include-tagjk/pack-tag-of-tagJeff King2016-09-072-1/+82
| * | | | | | | | t5305: simplify packname handlingJeff King2016-09-071-6/+6
| * | | | | | | | t5305: use "git -C"Jeff King2016-09-071-21/+7
| * | | | | | | | t5305: drop "dry-run" of unpack-objectsJeff King2016-09-071-2/+0
| * | | | | | | | t5305: move cleanup into test blockJeff King2016-09-071-2/+2
* | | | | | | | | Prepare for 2.10.1Junio C Hamano2016-09-291-0/+87
* | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-298-49/+136
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt2016-09-211-4/+2
| * | | | | | | | | t3700-add: create subdirectory gentlyJohannes Sixt2016-09-211-1/+1
View Lorry Controller Status