summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-053-118/+6
|\
| * Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"Nguyễn Thái Ngọc Duy2016-01-083-117/+5
* | Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-052-5/+24
|\ \
| * | reflog-walk: don't segfault on non-commit sha1's in the reflogdk/reflog-walk-with-non-commitDennis Kaarsemaker2016-01-052-5/+24
* | | Merge branch 'dw/signoff-doc' into maintJunio C Hamano2016-02-055-1/+9
|\ \ \
| * | | Expand documentation describing --signoffdw/signoff-docDavid A. Wheeler2016-01-055-1/+9
* | | | Merge branch 'jk/clang-pedantic' into maintJunio C Hamano2016-02-054-5/+6
|\ \ \ \
| * | | | bswap: add NO_UNALIGNED_LOADS definejk/clang-pedanticJeff King2016-01-041-2/+3
| * | | | avoid shifting signed integers 31 bitsJeff King2016-01-043-3/+3
| | |/ / | |/| |
* | | | Merge branch 'ew/send-email-mutt-alias-fix' into maintJunio C Hamano2016-02-052-2/+22
|\ \ \ \
| * | | | git-send-email: do not double-escape quotes from muttew/send-email-mutt-alias-fixEric Wong2016-01-042-2/+22
* | | | | Merge branch 'nd/dir-exclude-cleanup' into maintJunio C Hamano2016-02-051-3/+1
|\ \ \ \ \
| * | | | | dir.c: clean the entire struct in clear_exclude_list()nd/dir-exclude-cleanupNguyễn Thái Ngọc Duy2015-12-281-3/+1
* | | | | | Merge branch 'nd/stop-setenv-work-tree' into maintJunio C Hamano2016-02-052-3/+1
|\ \ \ \ \ \
| * | | | | | Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"nd/stop-setenv-work-treeNguyễn Thái Ngọc Duy2015-12-222-3/+1
* | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-01-122-0/+11863
|\ \ \ \ \ \ \
| * | | | | | | l10n: ko.po: Add Korean translationChangwoo Ryu2016-01-032-0/+11863
* | | | | | | | Git 2.7v2.7.0Junio C Hamano2016-01-042-1/+6
* | | | | | | | Sync with 2.6.5Junio C Hamano2016-01-042-1/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Git 2.6.5v2.6.5Junio C Hamano2016-01-043-2/+22
| * | | | | | | Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-042-2/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-042-1/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/ident-loosen-getpwuid' into maintJunio C Hamano2016-01-043-24/+40
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-email-ssl-errors' into maintJunio C Hamano2016-01-041-0/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/completion-no-column' into maintJunio C Hamano2016-01-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge tag 'l10n-2.7.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2016-01-021-1489/+1723
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | l10n: de.po: translate 68 new messagesRalf Thielow2015-12-291-1486/+1720
| * | | | | | | | | | | l10n: de.po: improve some translationsRalf Thielow2015-12-291-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Git 2.7-rc3v2.7.0-rc3Junio C Hamano2015-12-282-1/+12
* | | | | | | | | | | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-282-26/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-212-24/+22
| * | | | | | | | | | | git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-211-2/+9
| * | | | | | | | | | | git-p4: failing test case for skipping changes with multiple depotsLuke Diamand2015-12-141-1/+27
* | | | | | | | | | | | Merge branch 'jk/pending-keep-tag-name'Junio C Hamano2015-12-282-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-nameJeff King2015-12-172-2/+30
* | | | | | | | | | | | Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-282-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maintJeff King2015-12-211-0/+16
| * | | | | | | | | | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-212-1/+7
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge tag 'l10n-2.7.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2015-12-288-12723/+14731
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-12-281-1492/+1663
| * | | | | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2015-12-281-120/+119
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: Updated Bulgarian translation of git (2477t,0f,0u)Alexander Shopov2015-12-281-120/+119
| * | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-12-271-118/+117
| |/ / / / / / / / / / /
| * | | | | | | | | | | l10n: zh_CN: for git v2.7.0 l10n round 2Jiang Xin2015-12-261-118/+124
| * | | | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2015-12-261-120/+125
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: sv.po: Update Swedish translation (2477t0f0u)Peter Krefting2015-12-261-119/+124
| | * | | | | | | | | | | l10n: sv: Fix bad translationPeter Krefting2015-12-261-1/+1
| * | | | | | | | | | | | l10n: fr.po v2.7.0 round 2 (2477t)Jean-Noel Avila2015-12-241-128/+148
| |/ / / / / / / / / / /
| * | | | | | | | | | | l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)Jiang Xin2015-12-221-117/+116
| * | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-12-227-11022/+12831
| |\ \ \ \ \ \ \ \ \ \ \