summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revision.c: Make --full-history consider more mergesKevin Bracey2013-05-165-47/+229
* Documentation: avoid "uninteresting"Kevin Bracey2013-05-161-2/+2
* rev-list-options.txt: correct TREESAME for PKevin Bracey2013-05-161-2/+1
* t6111: add parents to testsKevin Bracey2013-05-161-19/+19
* t6111: allow checking the parents as wellJunio C Hamano2013-05-161-9/+21
* t6111: new TREESAME test setKevin Bracey2013-05-161-0/+184
* t6019: test file dropped in -s ours mergeKevin Bracey2013-05-161-0/+19
* decorate.c: compact table when growingKevin Bracey2013-05-161-1/+1
* revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-163-1/+19
* t6019: demonstrate --ancestry-path A...B breakageKevin Bracey2013-05-131-1/+20
* test-bzr: do not use unportable sed '\+'Torsten Bögershausen2013-05-111-1/+1
* Merge git://git.bogomips.org/git-svnJunio C Hamano2013-05-119-7/+196
|\
| * git-svn: added an --include-path flagPaul Walmsley2013-05-095-3/+180
| * Git::SVN::*: add missing "NAME" section to perldocJonathan Nieder2013-05-094-0/+8
| * git-svn: avoid self-referencing mergeinfoMichael Contreras2013-05-092-4/+8
* | 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