Archive for the ‘Source Code Management’ Category
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/28
As part of some TFS related posts, I wrote about Find an installed tf.exe, then run it with the command-line parameters specified.
Below are some more batch files related to this. In each batch file, you can replace tf with call "%~dp0tf.bat" so the above batch file is executed first.
Read the rest of this entry »
Posted in Batch-Files, Development, Scripting, Source Code Management, TFS (Team Foundation System) | 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 