summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-298-35/+221
|\
| * glossary: Update and rephrase the definition of a remote-tracking branchJohan Herland2013-04-211-6/+7
| * branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-213-3/+18
| * t9114.2: Don't use --track option against "svn-remote"-tracking branchesJohan Herland2013-04-211-1/+1
| * t7201.24: Add refspec to keep --track workingJohan Herland2013-04-211-0/+1
| * t3200.39: tracking setup should fail if there is no matching refspec.Johan Herland2013-04-211-4/+4
| * checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-213-26/+28
| * t2024: Show failure to use refspec when DWIMming remote branch namesJohan Herland2013-04-211-1/+69
| * t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'Johan Herland2013-04-211-0/+99
* | Merge branch 'jc/prune-all'Junio C Hamano2013-05-299-13/+58
|\ \
| * | prune: introduce OPT_EXPIRY_DATE() and use itJunio C Hamano2013-04-254-2/+16
| * | api-parse-options.txt: document "no-" for non-boolean optionsMichael Haggerty2013-04-181-0/+2
| * | git-gc.txt, git-reflog.txt: document new expiry optionsMichael Haggerty2013-04-182-4/+10
| * | date.c: add parse_expiry_date()Junio C Hamano2013-04-173-7/+30
* | | Merge branch 'mh/fetch-into-shallow'Junio C Hamano2013-05-293-3/+16
|\ \ \
| * | | t5500: add test for fetching with an unknown 'shallow'Michael Heemskerk2013-05-021-0/+14
| * | | upload-pack: ignore 'shallow' lines with unknown obj-idsMichael Heemskerk2013-04-282-3/+2
* | | | Merge branch 'js/transport-helper-error-reporting-fix'Junio C Hamano2013-05-294-15/+18
|\ \ \ \
| * | | | git-remote-testgit: build it to run under $SHELL_PATHJunio C Hamano2013-04-284-5/+2
| * | | | git-remote-testgit: further remove some bashismsJohannes Sixt2013-04-281-4/+9
| * | | | git-remote-testgit: avoid process substitutionJohannes Sixt2013-04-271-6/+7
* | | | | Merge branch 'fc/transport-helper-error-reporting'Junio C Hamano2013-05-294-43/+118
|\ \ \ \ \
| * | | | | transport-helper: fix remote helper namespace regressionFelipe Contreras2013-05-103-2/+21
| * | | | | test: remote-helper: add missing andFelipe Contreras2013-05-101-1/+1
| |/ / / /
| * | | | t5801: "VAR=VAL shell_func args" is forbiddenJunio C Hamano2013-04-251-1/+3
| * | | | transport-helper: update remote helper namespaceFelipe Contreras2013-04-172-4/+31
| * | | | transport-helper: trivial code shuffleFelipe Contreras2013-04-171-5/+3
| * | | | transport-helper: warn when refspec is not usedFelipe Contreras2013-04-172-2/+6
| * | | | transport-helper: clarify pushing without refspecsFelipe Contreras2013-04-173-7/+8
| * | | | transport-helper: update refspec documentationFelipe Contreras2013-04-171-5/+5
| * | | | transport-helper: clarify *:* refspecFelipe Contreras2013-04-173-18/+3
| * | | | transport-helper: improve push messagesFelipe Contreras2013-04-112-0/+15
| * | | | transport-helper: mention helper name when it diesJeff King2013-04-112-5/+5
| * | | | transport-helper: report errors properlyFelipe Contreras2013-04-113-1/+40
* | | | | Git 1.8.3v1.8.3Junio C Hamano2013-05-241-11/+11
* | | | | remote-hg: fix order of configuration commentsFelipe Contreras2013-05-211-3/+3
* | | | | remote-hg: trivial configuration note cleanupFelipe Contreras2013-05-211-1/+1
* | | | | completion: regression fix for zshFelipe Contreras2013-05-211-1/+1
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-05-203-6/+97
|\ \ \ \ \
| * | | | | git-svn: introduce --parents parameter for commands branch and tagTobias Schulte2013-05-203-1/+71
| * | | | | git-svn: clarify explanation of --destination argumentJonathan Nieder2013-05-201-5/+14
| * | | | | git-svn: multiple fetch/branches/tags keys are supportedNathan Gray2013-05-201-0/+12
* | | | | | remote-hg: set stdout to binary mode on win32Amit Bakshi2013-05-201-0/+4
|/ / / / /
* | | | | Git 1.8.3-rc3v1.8.3-rc3Junio C Hamano2013-05-171-1/+1
* | | | | Merge branch 'fc/doc-style'Junio C Hamano2013-05-1720-47/+37
|\ \ \ \ \
| * | | | | documentation: trivial style cleanupsFelipe Contreras2013-05-1720-47/+37
* | | | | | Merge branch 'dw/asciidoc-sources-are-dot-txt-files'Junio C Hamano2013-05-171-2/+4
|\ \ \ \ \ \
| * | | | | | CodingGuidelines: Documentation/*.txt are the sourcesDale Worley2013-05-101-2/+4
* | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-05-171-295/+338
|\ \ \ \ \ \ \
| * | | | | | | gitk: Update Swedish translation (304t)Peter Krefting2013-05-171-295/+338