summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-294-5/+173
|\
| * branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-212-2/+2
| * 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-211-3/+3
| * 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 'mh/fetch-into-shallow'Junio C Hamano2013-05-291-0/+14
|\ \
| * | t5500: add test for fetching with an unknown 'shallow'Michael Heemskerk2013-05-021-0/+14
* | | Merge branch 'js/transport-helper-error-reporting-fix'Junio C Hamano2013-05-291-5/+0
|\ \ \
| * | | git-remote-testgit: build it to run under $SHELL_PATHJunio C Hamano2013-04-281-5/+0
* | | | Merge branch 'fc/transport-helper-error-reporting'Junio C Hamano2013-05-291-20/+55
|\ \ \ \
| * | | | transport-helper: fix remote helper namespace regressionFelipe Contreras2013-05-101-0/+14
| * | | | 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-171-0/+12
| * | | transport-helper: warn when refspec is not usedFelipe Contreras2013-04-171-2/+4
| * | | transport-helper: clarify pushing without refspecsFelipe Contreras2013-04-171-3/+3
| * | | transport-helper: clarify *:* refspecFelipe Contreras2013-04-171-15/+0
| * | | transport-helper: improve push messagesFelipe Contreras2013-04-111-0/+14
| * | | transport-helper: mention helper name when it diesJeff King2013-04-111-1/+1
| * | | transport-helper: report errors properlyFelipe Contreras2013-04-111-0/+20
* | | | git-svn: introduce --parents parameter for commands branch and tagTobias Schulte2013-05-201-0/+48
* | | | difftool: fix dir-diff when file does not exist in working treeJohn Keeping2013-05-171-0/+7
* | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-05-112-1/+149
|\ \ \ \
| * | | | git-svn: added an --include-path flagPaul Walmsley2013-05-091-0/+149
| * | | | git-svn: avoid self-referencing mergeinfoMichael Contreras2013-05-091-1/+0
* | | | | Sync with v1.8.2.3Junio C Hamano2013-05-091-4/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
* | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-061-0/+51
|\ \ \ \ \
| * | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-0/+51
* | | | | | Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2013-05-051-0/+14
|\ \ \ \ \ \
| * | | | | | transport-helper: improve push messagesFelipe Contreras2013-05-051-0/+14
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-0/+22
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-011-0/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-241-8/+3
| * | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
| * | | | | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* | | | | | | Merge branch 'zk/prompt-rebase-step'Junio C Hamano2013-05-011-4/+10
|\ \ \ \ \ \ \
| * | | | | | | bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-251-4/+10
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2013-04-281-38/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | t/Makefile: remove smoke test targetsJohn Keeping2013-04-281-38/+0
* | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-281-0/+13
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-0/+13
* | | | | | Merge branch 'th/bisect-skipped-log'Junio C Hamano2013-04-261-0/+20
|\ \ \ \ \ \
| * | | | | | bisect: Log possibly bad, skipped commits at bisection endTorstein Hegge2013-04-231-0/+20
* | | | | | | Merge branch 'ph/rebase-original'Junio C Hamano2013-04-261-0/+7
|\ \ \ \ \ \ \
| * | | | | | | rebase: find orig_head unambiguouslyPhil Hord2013-04-231-0/+7
View Lorry Controller Status