Archive for the ‘DVCS – Distributed Version Control’ Category
Posted by jpluimers on 2016/06/22
The “embed” dropdown allows to get URLs for sharing and git cloning.
Recently I did my very first JavaScript in HTML development. Since it was a one page experiment, I didn’t want to put it in an official repository of it’s own.
I will explain about the content in a future post, but first about getting it on-line as a HTML file that can run JavaScript.
This is the hosted page: Work around G+ “403. That’s an error.” errors.
Gists are the base
Gists are pretty amazing. They have history, syntax highlighting (which you can embed on your own page, see Using Github as a Syntax Highlighter for Your Blog or Website), can show an overview of files or even raw content. This holds for public and secret gists.
The history of all the files comes from a repository: in fact all gists are in fact git repositories of which you can get the URL (be it https or ssh) is under the “Embed” dropdown: see the screenshot on the right.
So the gist itself is available under these URLs:
- gist
- syntax highlight script
- git https
- git ssh
The individual files can either be viewed as syntax highlighted (when they’re small enough, not binary and github knows how to highlight them), or as raw files:
Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, gist, git, GitHub, rawgit, Source Code Management | 2 Comments »
Posted by jpluimers on 2016/06/16
HTTP Error 404.0 – Not Found
Had this on a fresh Bonobo Git Server on a relatively fresh Windows 7 installation:
HTTP Error 404.0 – Not Found
At first I thought it was missing ASP because of the “StaticFile” in the error information, so I enabled it:
ASP is not enabled by default
Enable ASP
That didn’t help, so I searched for “MapRequestHandler” “HTTP Error 404.0 – Not Found” and found:
- HTTP Error 404.0 – Not Found (MapRequestHandler / StaticFile) when deploying WCF Web API on IIS 7.x | Alexander Zeitler
- aspnet_regiis.exe -i is still a solution : Fixing HTTP Error 404.0 – Not Found (MapRequestHandler / StaticFile) when deploying an application in IIS 7.x | Michael Hidalgo
Though ASP.NET was clearly enabled according to the Windows features, this was apparently for an old ASP.NET version so I manually re-registered ASP.NET (but now for Version 4: I had 4.6.1 installed):
C:\Windows\System32>%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_regiis.exe -ir
Microsoft (R) ASP.NET RegIIS version 4.0.30319.0
Administration utility to install and uninstall ASP.NET on the local machine.
Copyright (C) Microsoft Corporation. All rights reserved.
Start installing ASP.NET (4.0.30319.0) without changing existing web applications to use this version of ASP.Net.
.....
Finished installing ASP.NET (4.0.30319.0) without changing existing web applications to use this version of ASP.Net.
Windows 7 is .NET 2.0 all over the place…
Then it still didn’t work, but the second tip above also mentioned the application pool. And since Bonobo insists installing in wwwwroot, it’s using the default application which on Windows 7 – surprise! – is ASP.NET 2.0:
Default Windows 7 application pool for wwwroot uses ASP.NET 2.0
ASP.NET 4.0 needs to be the default.
Changing that to ASP.NET 4.0 made it all work.
Read the prerequisites
Too bad that ASP.NET registration part is only prominently visible in the readme.md on github, but not in the installation instructions of the web-site with a tiny link (overwhelmed by the screenshots) to prerequisites.
Same for the default credentials:
- username admin
- password admin
–jeroen
Posted in .NET, ASP.NET, Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2016/06/12
I found a working solution here.It works by using hg strip from the mq extension:$ hg strip my_pruned_branchAs mentioned in the comments, this should only be used for unpublished changesets.
Source: mercurial – Remove experimental branch – Stack Overflow
You need mercurial strip for that which ships with Mercurial 2.8 and up but isn’t enabled by default.
Enabling is easy and can be done globally or on a per-repository base which I like better: just edit your .hg/hgrc file inside your repository and add these lines:
[extensions]
strip =
The source StripExtension – Mercurial forgets to mention you can enable this on a repository base.
I used it to delete an experimental branch that I hadn’t yet pushed to the outside world.
–jeroen
Posted in Development, DVCS - Distributed Version Control, Mercurial/Hg, Source Code Management | Leave a Comment »
Posted by jpluimers on 2016/05/31
Always handy to have at hand as the git-reset documentation is toooooo long:
Undo a commit and redo
$ git commit ... (1)
$ git reset --soft HEAD~1 (2)
<< edit files as necessary >> (3)
$ git add .... (4)
$ git commit -c ORIG_HEAD (5)
- This is what you want to undo
- This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message1, or both. Leaves working tree as it was before “commit”.
- Make corrections to working tree files.
- Stage changes for commit.
- Commit the changes, reusing the old commit message.
reset copied the old head to .git/ORIG_HEAD; commit with -c ORIG_HEAD will open an editor, which initially contains the log message from the old commit and allows you to edit it. If you do not need to edit the message, you could use the -C option instead.
–jeroen
via: git – How to undo the last commit? – Stack Overflow.
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2016/05/25
There are so many ways to view the last Git commit on the command-line.
On the one hand this shows the versatility of Git. On the other hand there are so many trees in the forrest, that it is hard for people to find how to do simple things.
The one I like most is this:
git show --name-status --oneline
Others:
git log --name-status HEAD^..HEAD
git log -1
git show
git diff
git show --name-status
git log --stat -n 1
–jeroen
via: Git: See my last commit – Stack Overflow.
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2016/03/15
[WayBack] git-extras is awesome: it adds many [WayBack] useful commands to git. Like [WayBack] git ignore and [WayBack] git-info.
For instance, this adds README.md~ to the .gitignore file:
git ignore README.md~
It makes command-line git much more usable, even so much that it lessens the needs of SourceTree and other UIs tools.
You can get it at the GitHub repository [WayBack] tj/git-extras.
Lots of help is at [WayBack] git-extras/Commands.md: it explains all the commands that git-extras adds.
Thanks [WayBack] nifr for posting about git-extras at [WayBack] Is there an ignore command for git like there is for svn? – Stack Overflow.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Software Development, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2016/01/05
The GitHub Contributions Archive is based on the GitHub Archive (see below) and provides insight in anyones contributions. I discovered through a recent post by Ilya Grigorik:
Handy new tool (built on top of githubarchive.org dataset!) that aggregates all of your GitHub activity: bit.ly/1mraQyT.Apparently I’ve contributed to… – Ilya Grigorik – Google+
The GitHub Archive is amazing as it provides way more history than Github does by itself:
GitHub Archive is a project to record the public GitHub timeline, archive it, and make it easily accessible for further analysis.
Researching that data can provide tons of information, for instance about behaviour. It is also available through Google BigQuery so you can write your own queries for it.
The GitHub Contributions Archive – built by Liam Bowen – provides one (very usable) kind of insight: contributions, but there is much much more as quite some research, visualizations and talks have shown.
Interesting stuff!
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Power User, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/12/28
Unlike SourceTree for Windows, SourceTree for Mac still doesn’t automagically detect Beyond Compare even though that has been available for Mac OS X since : [SRCTREE-2092] Add built-in support for Beyond Compare version 4 – Atlassian JIRA.
Even modifying my ~/.gitconfig didn’t work, but manual configuration did. Here are the steps:
- Start the UI version of Beyond Compare
- Select the Beyond Compare menu, install the command-line tools
Read the rest of this entry »
Posted in Apple, Beyond Compare, Development, DVCS - Distributed Version Control, Keyboards and Keyboard Shortcuts, Mac, Mac OS X / OS X / MacOS, MacBook, MacBook Retina, MacBook-Air, MacBook-Pro, OS X 10.10 Yosemite, OS X 10.8 Mountain Lion, OS X 10.9 Mavericks, Power User, Source Code Management, SourceTree | 3 Comments »
Posted by jpluimers on 2015/11/24
A while ago, I had this error on BitBucket:
Running git.exe with arguments "fetch --prune" failed with return code 128 and error output: "fatal: unable to access 'https://%account%@bitbucket.org/%user%/%repository%.git/': Unknown SSL protocol error in connection to bitbucket.org:443
A quick search for “Unknown SSL protocol error in connection to bitbucket.org:443” pointed me to a comment by Ludwik Trammer on an answer by Jordfräs:
I resolved the issue by upgrading from git 1.8 to git 2.0.
Which reminded me this was a Windows system, where there is no package manager that verifies how far your non-system software is behind.
One day, I will write a script that finds out about the git version history and inform me of major/minor versions I’ve skipped.
Some notes for that:
Probably I will need to do something similar for Mercurial/hg in the future as well.
–jeroen
via: git – Unknown SSL protocol error in connection – Stack Overflow
Posted in Development, DVCS - Distributed Version Control, git, Power User, Software Development, Source Code Management, Windows, Windows 7, Windows 8, Windows 8.1, Windows 9, Windows Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 | Leave a Comment »
The Wiert Corner - irregular stream of stuff 