Great set of tips; I’ve included to intro and ToC here so it’s easier for me to find, but all the details are at [WayBack] 19 Tips For Everyday Git Use. For each paragraph, the ToC lists the relevant command. The article itself also contains some very insightful animated images of which I included one below to get an impression.
Archive for the ‘git’ Category
19 Tips For Everyday Git Use
Posted by jpluimers on 2018/01/11
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | 1 Comment »
Senior Oops Engineer on Twitter <
Posted by jpluimers on 2017/12/31
A nice discussion followed on [WayBack] Senior Oops Engineer on Twitter: “what’s a blockchain?” It’s like git but for destroying the environment.
It basically comes down to: can alternatives like git together with a set of rules and contracts to facilitate upstream pushing to a global order of changes be sufficient alternative to the very resource intensive “calculate proof of work to achieve consensus”.
The discussion is at [WayBack] »”what’s a blockchain?” It’s like git but for destroying the environment.« – Kristian Köhntopp – Google+
References:
- [WayBack] whitequark on Twitter: you, sobbing: “you can’t just point at every thing using a merkle tree and call them blockchains” me, pointing at git: “blockchain”
- [WayBack] protip: if you write a pre-receive hook that checks if every commit hash has a given number of zeroes in the front you could have a proof-of-work enabled git repository
- [WayBack] whitequark on Twitter: for certain very narrow definitions of “work”
- [WayBack] TENSION MAX on Twitter: you, foolish: so, this new protocol, it uses a Merkle treeinvestors: (yawning)me, an intellectual: so, this new protocol, it uses a uh, non-proof-of-work blockchaininvestors: (throwing $1000 bills at the stage)
- [WayBack] How the Bitcoin protocol actually works | DDI
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Changing a commit message – User Documentation
Posted by jpluimers on 2017/11/15
When you haven’t pushed yet, git rebase --interactive HEAD~# where # is the number of commits to view is your friend: [WayBack] Changing a commit message – User Documentation.
At the first screen, replace aa with reword then change the commit message for each commit and copy the message.
Then in each following screen, if you changed the commit message for that commit, change it there as well.
Similar answers are at [WayBack] git – How to modify existing, unpushed commits? – Stack Overflow
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
mention-bot (Mention Bot) – automagically mentions potential review users for a pull request depending on context
Posted by jpluimers on 2017/09/28
mention-bot (Mention Bot) is cool!
It mentions potential review users on a pull-request depending on the context (currently: if the users have lines deleted by the pull request or have enough blame presence around the modified lines in the pull request).
First saw it used here: https://github.com/libssh2/libssh2/pull/144#issuecomment-257244996
It has source code at facebook/mention-bot: Automatically mention potential reviewers on pull requests.
And there is mention-bot/how-to-unsubscribe
–jeroen
Share this:
Posted in Continuous Integration, Development, DVCS - Distributed Version Control, git, GitHub, Power User, Software Development, Source Code Management | Leave a Comment »
GitHub: Searching your own repositories – excluding forks
Posted by jpluimers on 2017/09/12
The Searching repositories – User Documentation mentions
By default, forked repositories are not shown.
But it forgets this only holds for the main search box which is conveniently called “Search GitHub” but documented as “Search repositories“:
Based on that documentation you’d think the “Search Repositories” box would adhere to the same defaults, right?
Wrong. We live in the “form over function” era so that would be too easy.
Share this:
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Source Code Management, User Experience (ux) | Leave a Comment »
git – List all commits (across all branches) for a given file – Stack Overflow
Posted by jpluimers on 2017/08/30
From the “short git tips” department:
Try this:
git log --all -- path
Source: git – List all commits (across all branches) for a given file – Stack Overflow [WayBack]
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Using BC4 OSX with Version Control Systems
Posted by jpluimers on 2017/08/10
A great thread about Using BC4 OSX with Version Control Systems, -Tools and IDEs.
Some highlights:
- git
- Cornerstone
- Mercurial/Hg
- SourceTree
- Syncovery
- IntelliJ IDEA
- Tower
- Perforce
- Subversion/SVN
- Eclipse and Team Explorer Everywhere (TFS)
- SmartCVS
- Android Studio
- Using BComp instead of Beyond Compare.app for VCS and OSX Command Line Utilities
–jeroen
Share this:
Posted in Beyond Compare, CVS, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Power User, Software Development, Source Code Management, SourceTree, Subversion/SVN, TFS (Team Foundation System) | Leave a Comment »
Some git links that helped me
Posted by jpluimers on 2017/08/08
For my link archive:
- Merge local master branch with remote master branch in Git – Stack Overflow [WayBack]: fetch, rebase, merge.
- git: fetch and merge, don’t pull | Mark’s Blog [WayBack]
- How do I push a local Git branch to master branch in the remote? – Stack Overflow [WayBack]: dirty, but $
git push origin develop:masteror$ git push <remote> <local branch name>:<remote branch to push into>can save your ass - git pull keeping local changes – Stack Overflow [WayBack]: stash, stash pop, git checkout –theirs — config.php (note
theirsandourscan be very confusing). - : .gitattributes with merge=ours for some files
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Seems I need to say good bye to Bitbucket: no explanation of which limit I exceeded and by how much.
Posted by jpluimers on 2017/07/26
Seems I need to say good bye to Bitbucket: while creating a new repository without changing any user aspects, I got this nice message at https://bitbucket.org/repo/create which does not explain which limit I reached:
You’ve exceeded your user limit, restricting all your repositories to read-only access. Change your plan to restore write access. Learn more
Later I found that https://bitbucket.org/account/user/jeroenp/plans-and-billing/ lists I’m within the free plan:
–jeroen
Share this:
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Don’t Be Scared of git rebase – via: I care, I share, I’m Nathan LeClaire.
Posted by jpluimers on 2017/07/06
Must read for anyone using git: Don’t Be Scared of git rebase | I care, I share, I’m Nathan LeClaire.
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
The Wiert Corner - irregular stream of stuff 