summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* do not die when error in config parsing of buf occursHeiko Voigt2013-07-121-2/+8
* teach config --blob option to parse config from databaseHeiko Voigt2013-07-125-7/+193
* config: make parsing stack struct independent from actual data sourceHeiko Voigt2013-07-121-21/+43
* config: drop cf validity check in get_next_char()Heiko Voigt2013-07-121-16/+13
* config: factor out config file stack managementHeiko Voigt2013-07-121-14/+28
* Sync with v1.8.2.3Junio C Hamano2013-05-095-8/+26
|\
| * Git 1.8.2.3v1.8.2.3Junio C Hamano2013-05-094-3/+23
| * Merge branch 'tr/copy-revisions-from-stdin' into maintJunio C Hamano2013-05-091-1/+2
| |\
| * | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
| * | t5004: ignore pax global header fileRené Scharfe2013-05-091-1/+1
| * | mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-091-1/+1
| * | transport-helper: trivial style cleanupFelipe Contreras2013-05-091-2/+1
* | | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-05-091-3/+3
|\ \ \
| * | | cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano2013-05-091-3/+3
* | | | Update draft release notes for 1.8.3Junio C Hamano2013-05-071-2/+3
* | | | remote-helpers: trivial cleanupFelipe Contreras2013-05-071-1/+0
* | | | remote-bzr: fix for disappeared revisionsFelipe Contreras2013-05-072-4/+49
* | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-05-075-2669/+3650
|\ \ \ \
| * | | | l10n: zh_CN.po: translate 44 messages (2080t0f0u)Jiang Xin2013-05-081-530/+728
| * | | | l10n: de.po: translate 44 new messagesRalf Thielow2013-05-071-554/+774
| * | | | Merge remote-tracking branch 'vi-vnwildman/master'Jiang Xin2013-05-011-543/+747
| |\ \ \ \
| | * | | | l10n: Update Vietnamese translation (2080t0f0u)Tran Ngoc Quan2013-05-011-543/+747
| * | | | | l10n: Update Swedish translation (2080t0f0u)Peter Krefting2013-04-301-537/+731
| |/ / / /
| * | | | l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)Jiang Xin2013-04-301-505/+670
* | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-062-1/+56
|\ \ \ \ \
| * | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-062-1/+56
* | | | | | Merge branch 'fc/remote-bzr'Junio C Hamano2013-05-062-81/+298
|\ \ \ \ \ \
| * | | | | | remote-bzr: avoid bad refsFelipe Contreras2013-05-061-15/+23
| * | | | | | remote-bzr: convert all unicode keys to strFelipe Contreras2013-05-061-2/+2
| * | | | | | remote-bzr: access branches only when neededFelipe Contreras2013-04-301-12/+16
| * | | | | | remote-bzr: delay peer branch usageFelipe Contreras2013-04-301-3/+3
| * | | | | | remote-bzr: iterate revisions properlyFelipe Contreras2013-04-301-2/+3
| * | | | | | remote-bzr: improve progress reportingFelipe Contreras2013-04-301-7/+13
| * | | | | | remote-bzr: add option to specify branchesFelipe Contreras2013-04-301-2/+18
| * | | | | | remote-bzr: add custom method to find branchesFelipe Contreras2013-04-301-5/+20
| * | | | | | remote-bzr: improve author sanitazionFelipe Contreras2013-04-301-2/+13
| * | | | | | remote-bzr: add support for shared repoFelipe Contreras2013-04-301-7/+15
| * | | | | | remote-bzr: fix branch namesFelipe Contreras2013-04-301-0/+1
| * | | | | | remote-bzr: add support for bzr reposFelipe Contreras2013-04-302-56/+138
| * | | | | | remote-bzr: use branch variable when appropriateFelipe Contreras2013-04-301-17/+18
| * | | | | | remote-bzr: fix partially pushed mergeFelipe Contreras2013-04-301-4/+13
| * | | | | | remote-bzr: fixes for branch divergeFelipe Contreras2013-04-301-1/+7
| * | | | | | remote-bzr: add support to push mergesFelipe Contreras2013-04-302-8/+57
| * | | | | | remote-bzr: always try to update the worktreeFelipe Contreras2013-04-301-1/+5
| * | | | | | remote-bzr: fix order of locking in CustomTreeFelipe Contreras2013-04-301-1/+1
| * | | | | | remote-bzr: delay blob fetching until the very endFelipe Contreras2013-04-301-3/+5
| * | | | | | remote-bzr: cleanup CustomTreeFelipe Contreras2013-04-301-7/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2013-05-052-0/+15
|\ \ \ \ \ \
| * | | | | | transport-helper: improve push messagesFelipe Contreras2013-05-052-0/+15
| | |_|_|/ / | |/| | | |