summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: enable large transactionssb/remove-fd-from-ref-lockStefan Beller2015-04-172-2/+15
* sha1_fiel.c: move get_max_fd_limit(void) to wrapper.cStefan Beller2015-04-173-41/+42
* refs.c: remove lock_fd from struct ref_lockStefan Beller2015-04-171-10/+5
* t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-04-151-2/+2
* update-ref: test handling large transactions properlyStefan Beller2015-04-151-0/+28
* Git 2.4.0-rc2v2.4.0-rc2Junio C Hamano2015-04-142-3/+20
* Merge branch 'jk/colors'Junio C Hamano2015-04-141-2/+7
|\
| * diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-141-0/+4
|\ \
| * | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-021-0/+4
* | | Merge branch 'jk/pack-corruption-post-mortem'Junio C Hamano2015-04-141-0/+237
|\ \ \
| * | | howto: document more tools for recovery corruptionjk/pack-corruption-post-mortemJeff King2015-04-011-0/+237
* | | | Merge branch 'jc/update-instead-into-void'Junio C Hamano2015-04-142-2/+74
|\ \ \ \
| * | | | push-to-deploy: allow pushing into an unborn branch and updating itjc/update-instead-into-voidJunio C Hamano2015-04-012-2/+74
* | | | | Merge branch 'sb/plug-streaming-leak'Junio C Hamano2015-04-141-1/+4
|\ \ \ \ \
| * | | | | streaming.c: fix a memleaksb/plug-streaming-leakJohn Keeping2015-03-311-1/+4
* | | | | | Merge branch 'jn/doc-fast-import-no-16-octopus-limit'Junio C Hamano2015-04-141-4/+0
|\ \ \ \ \ \
| * | | | | | fast-import doc: remove suggested 16-parent limitjn/doc-fast-import-no-16-octopus-limitJonathan Nieder2015-03-311-4/+0
* | | | | | | Merge branch 'sb/plug-wt-shortstatus-tracking-leak'Junio C Hamano2015-04-141-0/+1
|\ \ \ \ \ \ \
| * | | | | | | wt-status.c: fix a memleaksb/plug-wt-shortstatus-tracking-leakStefan Beller2015-03-301-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'pt/enter-repo-comment-fix'Junio C Hamano2015-04-141-8/+3
|\ \ \ \ \ \ \
| * | | | | | | enter_repo(): fix docs to match codept/enter-repo-comment-fixPaul Tan2015-03-311-8/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jz/gitweb-conf-doc-fix'Junio C Hamano2015-04-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gitweb.conf.txt: say "build-time", not "built-time"jz/gitweb-conf-doc-fixJérôme Zago2015-03-311-1/+1
* | | | | | | | Merge branch 'jk/cherry-pick-docfix'Junio C Hamano2015-04-141-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick: fix docs describing handling of empty commitsjk/cherry-pick-docfixJeff King2015-03-301-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'iu/fix-parse-options-h-comment'Junio C Hamano2015-04-141-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvaliu/fix-parse-options-h-commentIvan Ukhov2015-03-291-2/+1
* | | | | | | | | Merge branch 'jg/cguide-we-cannot-count'Junio C Hamano2015-04-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-countJulian Gindi2015-04-141-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2015-04-0810-8098/+18704
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-04-091-236/+236
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-04-071-236/+236
| * | | | | | | | | | l10n: TEAMS: Change repository URL of zh_CNJiang Xin2015-04-091-1/+1
| * | | | | | | | | | l10n: Updated Bulgarian translation of git (2305t,0f,0u)Alexander Shopov2015-04-071-1436/+1456
| |/ / / / / / / / /
| * | | | | | | | | l10n: sv.po: Update Swedish translation (2305t0f0u)Peter Krefting2015-04-071-241/+244
| * | | | | | | | | l10n: de.po: translate one messageRalf Thielow2015-04-051-239/+248
| * | | | | | | | | l10n: fr.po v2.4.0 round 2Jean-Noel Avila2015-04-041-255/+291
| * | | | | | | | | l10n: ru: updated Russian translationDimitriy Ryazantcev2015-04-031-238/+238
| * | | | | | | | | l10n: vi.po(2305t): Updated 1 new stringTran Ngoc Quan2015-04-031-244/+247
| * | | | | | | | | l10n: zh_CN: for git v2.4.0 l10n round 2Jiang Xin2015-04-031-235/+235
| * | | | | | | | | l10n: git.pot: v2.4.0 round 2 (1 update)Jiang Xin2015-04-031-233/+233
| * | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-04-039-6348/+16883
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'Matthias Rüster2015-04-021-9/+9
| * | | | | | | | | l10n: de.po: translate 99 new messagesRalf Thielow2015-04-021-851/+899
| * | | | | | | | | l10n: de.po: fix messages with abbreviated hashsRalf Thielow2015-04-021-2/+2
| * | | | | | | | | l10n: de.po: add space before ellipsisPhillip Sz2015-04-021-11/+11
| * | | | | | | | | l10n: vi.po: Updated Vietnamese translationTran Ngoc Quan2015-03-311-866/+918
| * | | | | | | | | l10n: zh_CN: translations for git v2.4.0-rc0Jiang Xin2015-03-311-1233/+887
| * | | | | | | | | Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/gitJiang Xin2015-03-311-890/+908
| |\ \ \ \ \ \ \ \ \