My experience is that early upgrades are very unstable and they take an eternity to fix bugs, I need to find a way to push myself from the early stage to the late stage.
[WayBack] Adding staged updates to SourceTree | SourceTree Blog
–jeroen
Archive for the ‘git’ Category
Adding staged updates to SourceTree | SourceTree Blog
Posted by jpluimers on 2016/12/01
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Source Code Management, SourceTree | Leave a Comment »
Mac OS X – installing pdf-tools using homebrew to circumvent “For the best experience, open this PDF portfolio in Acrobat 9 or Adobe Reader 9, or later.”
Posted by jpluimers on 2016/09/14
Adobe marketing scam
I don’t want Acrobat/Adobe Reader on my Mac. Period.
But Preview will show some PDF files as “For the best experience, open this PDF portfolio in Acrobat 9 or Adobe Reader 9, or later.” or “For the best experience, open this PDF portfolio in Acrobat X or Adobe Reader X, or later.”
This is some Adobe marketing scam where they generate a PDF file actually as a portfolio of PDF files having the first PDF being “marketing” message.
So I needed the pdf-tools on my Mac for which many sites suggest to use brew install pdf-tools. That worked not so well:
$ brew install pdf-tools Error: No available formula with the name "pdf-tools" ==> Searching for similarly named formulae... This similarly named formula was found: mupdf-tools To install it, run: brew install mupdf-tools ==> Searching taps... This formula was found in a tap: homebrew/emacs/pdf-tools To install it, run: brew install homebrew/emacs/pdf-tools
Searching for “Error: No available formula with the name” “pdf-tools” didn’t return useful results but looking for brew “pdf-tools” gone revealed pdf-tools: move to homebrew/emacs · wingyplus/homebrew@6e73af9 indicating the command should indeed be brew install homebrew/emacs/pdf-tools however that also ended up failing, in fact with multiple errors:
==> make server/epdfinfo Error: No available formula with the name "homebrew/dupes/tcl-tk" Please tap it and then try again: brew tap homebrew/dupes ==> Searching for similarly named formulae... Error: No similarly named formulae found. ==> Searching taps... Error: No formulae found in taps.
After doing abrew tap homebrew/dupes it finally worked.
Share this:
Posted in Apple, Development, DVCS - Distributed Version Control, git, GitHub, Home brew / homebrew, Power User, Source Code Management | Leave a Comment »
Oh, shit, git. via Kristian Köhntopp – Google+
Posted by jpluimers on 2016/09/10
Oh, shit, git. For +Tatiana Azundris, Originally shared by Stefani Banerian
Source: Kristian Köhntopp – Google+
Oh, shit, git!Oh shit, git! Git is hard: screwing up is easy, and figuring out how to fix your mistakes is fucking impossible. Git documentation has this chicken and egg problem where you can’t search for how to get yourself out of a mess, unless you already know the name of the thing you need to know about …
Right now the site is down from Amsterdam; luckily we have http://web.archive.org/web/20160909123413/http://ohshitgit.com/
If you’re fast, you might see http://ohshitgit.com redirect to http://ohshitgit.com/cgi-sys/suspendedpage.cgi which shows:
The website you were trying to reach is temporarily unavailable.
Please check back soon.
If you are the owner of this website, please contact Technical Support as soon as possible.
–jeroen
Image source: xkcd: Git [WayBack] via Christian Vogel [WayBack]
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
“Yes/No” question with what kind of buttons? Indeed “Yes/Cancel” SourceTree for Windows installer – latest version.
Posted by jpluimers on 2016/09/07
Yes, people still do this: Screenshot 2016-09-07 15.59.24.png
This one is worse than the usual “Yes/No” questions missing one or more of the “Yes” or “No” buttons in that it actually mentions you can click “No”.
Load SSH Key?
Do you have an SSH kkey that you’d like to load now? If not you can click “No” and create one later if you like”.
Share this:
Posted in DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, SourceTree | Leave a Comment »
When “git mv” on a directory gives you en error starting with “fatal: bad source”
Posted by jpluimers on 2016/08/23
I use “git mv” a lot because somehow it works a lot better than having git automagically find out about renames.
The problem with “git mv” is that the “fatal: bad source” errors are a catch-all for many causes. Just look at the
Searching for “git mv” directory “fatal: bad source” didn’t get me much further. The one link that did get me towards the right track is version control – Getting Git to follow renamed and edited files – Stack Overflow.
What happened was that I had manually deleted and edited some files as part of a mass script (the repository had a lot of files in it that didn’t belong there compile targets and user specific settings or didn’t adhere to the naming conventions) before executing the “git mv”.
Since “git mv” tries to administer all the files that it thinks originally were in the directory, it complains about those files.
Lesson learned: first “git mv” then perform other changes.
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Push a new local branch to a remote Git repository and track it too – Stack Overflow
Posted by jpluimers on 2016/07/27
Just what I needed: Push a new local branch to a remote Git repository and track it too – Stack Overflow But watch the comments to this answer:
Answer:
In recent versions of Git (1.7.0 and later), you can checkout a new branch:
git checkout -b <branch>Edit files, add and commit. Then push with the
-uoption:git push -u origin <branch>Git will set up the tracking information during the push.
Comments:
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, Visual Studio 2013, Visual Studio 2014, Visual Studio 2015, Visual Studio and tools | Leave a Comment »
Git Cheat Sheet
Posted by jpluimers on 2016/07/14
I had seen the bitmap Git Cheat Sheet referenced numerous times, so I went searching for the source and found it under Creative Commons 3.0 license at http://byte.kde.org/~zrusin/git/ which has the Vector Image Source by Zack Rusin.
Name Last modified Size Description
Parent Directory – git-cheat-sheet-large.png 29-Aug-2007 14:52 1.2M git-cheat-sheet-medium.png 29-Aug-2007 14:52 336K git-cheat-sheet.svg 29-Aug-2007 14:52 162K git-cheet-sheet-small.png 10-Sep-2007 09:05 87K license.html 29-Aug-2007 08:41 24K
![[ICO]](https://i0.wp.com/byte.kde.org/~zrusin/icons/blank.gif){kind=icon}
![[DIR]](https://i0.wp.com/byte.kde.org/icons/back.gif){kind=icon}
![[IMG]](https://i0.wp.com/byte.kde.org/icons/image2.gif){kind=icon}
![[TXT]](https://i0.wp.com/byte.kde.org/icons/text.gif){kind=icon}
And yes, they are all in the Wayback Machine: http://web.archive.org/web/*/http://byte.kde.org/~zrusin/git/
–jeroen
via: Zack Rusin: Git cheat sheet.
Git Cheat Sheet
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
GitHub has majour service outages…
Posted by jpluimers on 2016/07/06
Boom!
In a split second GitHub went to
from
from 
Share this:
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Software Development, Source Code Management | Leave a Comment »
case insensitive files systems and git – Lesson Learned – I Can’t Get My Git Repo Clean! | DrupalEasy
Posted by jpluimers on 2016/07/06
via: Lesson Learned – I Can’t Get My Git Repo Clean! | DrupalEasy
One file kept getting added to the git modified list: service/src/main/MySOAPdefinition.pas.
It was part of a repository that had been migrated from SVN (more on that in a future blog post) and along the way been renamed in directory service/src/main from MySOAPdefinition.pas to MySoapDefinition.pas. SVN (and TortoiseSVN) don’t object to this. But git does.
You’d see this on the command-line:
>git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: service/src/main/MySOAPdefinition.pas
no changes added to commit (use "git add" and/or "git commit -a")
>git add service\src\main\MySoapDefinition.pas
>git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: service/src/main/MySOAPdefinition.pas
no changes added to commit (use "git add" and/or "git commit -a")
Basically the add would do nothing.
On Windows, this is how to get around this:
Share this:
Posted in Delphi, Delphi XE8, Development, git, Mac OS X / OS X / MacOS, OS X 10.9 Mavericks, Power User, Software Development, Source Code Management, SourceTree, Windows, Windows 7 | 1 Comment »
git svn broken on Mac OS X under SourceTree but not from the terminal: how to fix it.
Posted by jpluimers on 2016/07/05
Not on the terminal, but only in SourceTree I got this error (full text below):
Can't locate SVN/Core.pm in @INC
Well, the Xcode binaries were here:
$ xcode-select -p
/Applications/Xcode.app/Contents/Developer
On Mavericks, perl is this version:
$ perl --version | grep -w for
This is perl 5, version 16, subversion 2 (v5.16.2) built for darwin-thread-multi-2level
(with 3 registered patches, see perl -V for more detail)
and git is this:
$ git --version
git version 1.9.5 (Apple Git-50.3)
Steps for fixing are at these blog entries:
- Fixing git-svn on OS X El Capitan | paul schreiber
- Solved: OS X Yosemite git svn broken – Contrid
- Solved: git svn Broken in Mavericks (or Mountain Lion)
All these solutions point you to change the system Perl installation, but since on my system it failed only on SourceTree, but from the terminal, I wanted to fix SourceTree.
Share this:
Posted in Apple, Development, DVCS - Distributed Version Control, git, Mac OS X / OS X / MacOS, OS X 10.9 Mavericks, Power User, Source Code Management, Subversion/SVN | 4 Comments »
The Wiert Corner - irregular stream of stuff 
git push -uwas introduced in Git 1.7.0 (2010-02-12). – Chris Johnsen Jun 4 ’11 at 4:16-uis short for--set-upstream—for what it does and why it’s needed I wouldn’t mind some explanation, too. :) – Anton Strogonoff Mar 9 ’14 at 6:07push.defaultis set toupstream, this will not do what you think it will do. It will try to push over the existing tracking branch. Use:git push -u origin mynewfeature:mynewfeatureor dogit branch --unset-upstreamfirst. – void.pointer May 19 ’14 at 18:07