The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My work

  • My badges

  • Twitter Updates

  • My Flickr Stream

    20140508-Delphi-2007--Project-Options--Cannot-Edit-Application-Title-HelpFile-Icon-Theming

    20140430-Fiddler-Filter-Actions-Button-Run-Filterset-now

    20140424-Windows-7-free-disk-space

    More Photos
  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,497 other followers

Archive for the ‘Source Code Management’ Category

Many (not One!) weird tricks for powerful Git aliases – Atlassian Blogs

Posted by jpluimers on 2015/07/07

The One weird trick for powerful Git aliases – Atlassian Blogs post has many great git aliases, and other Git tricks and references the below great video.

–jeroen

Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »

Git: Remove sensitive data using git filter-branch and the BFG Repo-Cleaner.

Posted by jpluimers on 2015/07/02

Hoping I never need it, but just in case:

Git: Remove sensitive data using git filter-branch and the BFG Repo-Cleaner.

Anyone who knows if there are equivalents for Mercurial/Hg?

–jeroen

via:

Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Source Code Management | Leave a Comment »

`git init –bare`: to create a new git repository from an existing one (via: Stack Overflow)

Posted by jpluimers on 2015/06/23

I needed to get an existing Git repository to a client that had a tightened network. No SSH allowed, web proxy filtering out all sorts of sites and also performing a HTTPS man-in-the-middle to detect and reject all kinds of binaries, etc.

But we needed a public repository locally.

Which worked, thanks to pestrella, who answered about `bare` repositories to get my last steps correct:

In order to create a new Git repository from an existing repository one would typically create a new bare repository and push one or more branches from the existing to the new repository.

The trick is to know that server-side repositories are `bare` and client side repositories are `regular`. `bare` means the absence of a working copy on the server side.

I performed these steps:
Read the rest of this entry »

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

Git SVN: an easy way to try out Git when your main repository is still SVN (via: XE6 still stuck on an old SVN version…)

Posted by jpluimers on 2015/06/16

Graeme Geldenhuys posted a great comment below.

Summary:

Git can do SVN, so locally you will see it as a Git repository, but the SVN repository will stay “as is” and not be affected neither will other SVN users be affected.

Two of the great benefits of this:

  1. You have fill local history so no need for long server-round trips to access it.
  2. You have the full query featureset of Git at your disposal. Locally.

Combined, you can do these without the need to be online or wait for the SVN connection and transfer:

For instance to view your branches:

git branches -vv

Or to show the branch-history:

git show-branch

It is how I access the FastMM repository from Git and described the git commands on how to get started and keep up to date.

Here is Graeme’s comment:           Read the rest of this entry »

Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »

A flowchart to help you with your git…

Posted by jpluimers on 2015/06/11

I wish I had known this years ago. Thanks This is why I code!

This is why I Code Shared publicly: #Git  A flowchart to help you with your git decisions http://justinhileman.info/article/git-pretty.

This is the blog post; the chard is below.

Git pretty

This chart is from the presentation Changing History, or How to Git Pretty. Check it out to learn how to use this IRL.
Here’s a printable PDF version, if you’re into that sort of thing.

interactive git chart

If you like a more interactive way of decision making, this one is more elaborate: On undoing, fixing, or removing commits in git.

Note that on Windows, git does not like this:

git reset HEAD^

But does like this equivalent:

git reset HEAD~1

–jeroen

via A flowchart to help you with your git….

So you've made a mess of things?

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

 
Follow

Get every new post delivered to your Inbox.

Join 1,497 other followers

%d bloggers like this: