vicg4rcia + git   78

Alternatives To Git Submodule: Git Subtree | Atlassian Blogs
In this post I will be looking at git subtree and show why it is an improvement – albeit not perfect – over git submodule.
git  programming 
february 2016 by vicg4rcia
Git - Setting Up the Server
Let’s walk through setting up SSH access on the server side. In this example, you’ll use the authorized_keys method for authenticating your users. We also assume you’re running a standard Linux distribution like Ubuntu. First, you create a 'git' user and a .ssh directory for that user.
git 
september 2015 by vicg4rcia
Git Tip of the Day – pruning stale remote-tracking branches | Kparal's Fedora Blog
What you might not know is that this command allows you to prune all your local branches that track an already-deleted remote branch.
git  programming 
july 2015 by vicg4rcia
What’s with the 50/72 rule? — Medium
It is part of common sense to assume that the worthiest commit messages lie far from any extremes. Years ago, I often fell in the trap of hastily sending a commit after commit, annoyed by the fact that I have to add a summary to it (let alone a description). I’ve seen many projects whose commit summaries consist primarily of one-word verbs like [FIX], [CLEAN], [TEST], etc.
git  programming 
february 2015 by vicg4rcia
thoughtbot/dotfiles · GitHub
A set of vim, zsh, git, and tmux configuration files.
http://robots.thoughtbot.com
git  shell  vim 
february 2015 by vicg4rcia
python - Pip freeze does not show repository paths for requirements file - Stack Overflow
how to install a package with pip from github in the proper way so that it will be managed via pip freeze. the way this should be done is broken and this is the work-around to have everything handled gracefully.
pip  git  programming 
june 2014 by vicg4rcia
git add -p: The most powerful git feature you're not using yet
If you use git, you've used the command git add. But do you know about git add's "patch mode" using git add -p ? Patch mode allows you to stage parts of a changed file, instead of the entire file. This allows you to make concise, well-crafted commits that make for an easier to read history. Since I learned about it a year or so ago, patch mode has taken my git usage to another level. It's one of the most powerful git commands, right up there with rebasing, but much less dangerous!
git  development  programming 
january 2014 by vicg4rcia
git ready » interactive adding
Sometimes simple adding with git add . or git commit -am just isn’t enough. You may want to split changes up over several commits, or you’re just not ready to add everything yet. And who wants to add individual files one at a time? That’s just boring. Enter the interactive adder:
git 
january 2014 by vicg4rcia
Skuunk Works: Our git workflow
Decent workflow for teams that work independently
git  programming  workflow  agile 
january 2014 by vicg4rcia
How do I remove or delete a tag from a Git repo? - Bitbucket - Atlassian Documentation
You can use the git tag command to put a permanent marker on a specific commit. Later, you can use the tag to compare the tagged commit to other, future commits in the future. When you push to your Bitbucket remote repository, the tag goes along.
git  programming 
december 2013 by vicg4rcia
Git Tutorials - 5. Remote Git Repositories
SVN uses a single central repository to serve as the communication hub for developers, and collaboration takes place by passing changesets between the developers’ working copies and the central repository. This is different from Git’s collaboration model, which gives every developer their own copy of the repository, complete with its own local history and branch structure. Users typically need to share a series of commits rather than a single changeset. Instead of committing a changeset from a working copy to the central repository, Git lets you share entire branches between repositories.
git 
november 2013 by vicg4rcia
git ready » push and delete remote branches
This is an action that many Git users need to do frequently, but many (including the author) have forgotten how to do so or simply don’t know how. Here’s the definitive guide if you’ve forgotten.
git 
october 2013 by vicg4rcia
How to migrate SVN with history to a new Git repository?
I read git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: git://myserver/path/to/git/repos git-do-the-magic-svn-import-with-history svn://myserver/path/to/svn/repos git://myserver/path/to/git/repos I don't expect it to be that simple, and I don't expect it to be a single command. But I do expect it not to try to explain anything - just to say what steps to take given this example.
programming  git 
october 2013 by vicg4rcia
How can I move recent commit(s) to a new branch with git?
I'd like to move the last several commits I've made to master to a new branch and take master back to before those commits were made. Unfortunately, my Git-fu isn't strong enough yet, any help?
programming  git 
october 2013 by vicg4rcia
Git pissed
Git pissed tracks word counts in commit messages.
git 
september 2013 by vicg4rcia
git branch - How do I clone all remote branches with Git? - Stack Overflow
I have a master and a development branch, both pushed to GitHub. I've cloned, pulled, and fetched, but I remain unable to get anything other than the master branch back.

I'm sure I'm missing something obvious, but I have read the manual and I'm getting no joy at all.
branching  git 
august 2013 by vicg4rcia
Interactive rebase · GitHub Help
One often overlooked feature of git is the git rebase command. Rebase allows you to easily change a series of commits, reordering, editing, or squashing commits together into a single commit.
git 
august 2013 by vicg4rcia
detached HEAD explained
Git has something called a 'detached HEAD' that bears some explanation. You are told 'do not commit on a detached HEAD', and it is not always clear what or why this is. This document is here for historical reasons, and because it provides a nice analogy. However, Git for Computer Scientists (my version) should be a much nicer read for most people. Despite the name, it has very few mentions of linked lists, and no pseudo-code at all! Instead, it has a lot of nice pictures, and it also touches upon many other issues, not just on detached HEADs.
git 
july 2013 by vicg4rcia
git concepts simplified
Vaguely inspired by http://eagain.net/articles/git-for-computer-scientists, except this page is not just for CS folks. And it's a lot more detailed. Oh, and it's actively maintained, meaning I will respond to feedback ;-)
git 
july 2013 by vicg4rcia
Git - Tagging
Like most VCSs, Git has the ability to tag specific points in history as being important. Generally, people use this functionality to mark release points (v1.0, and so on). In this section, you’ll learn how to list the available tags, how to create new tags, and what the different types of tags are.
git 
july 2013 by vicg4rcia
How to use git to download a particular tag? - Stack Overflow
I'm trying to figure out how do download a particular tag of a git repository - it's one version behind the current version.

I saw there was a tag for the previous version on the git web page, with object name of something long hex number.
git 
july 2013 by vicg4rcia
Using Git Cherry Pick
Problem: You want to test a feature someone has developed, but it only exists in a remote branch which is woefully out of date. Example: Bug 3475, an enhancement from PTFS's "Harley" branch which adds the ability to copy an existing patron record when creating a new one. Checking out the branch and rebasing against origin will fail because the branch is so far out of date.
git 
july 2013 by vicg4rcia
Git: checkout a single file from another commit or branch — ariejan.net
I recently worked on a new feature in a separate branch. It didn’t work out well, so I branched master again and tried another solution. However, I needed a specific filesI committed in the first feature branch. To avoid placing those files back in my working copy by hand, I used git to checkout the specific file from the other branch.
git 
june 2013 by vicg4rcia
Git : Stashing
Often, when you’ve been working on part of your project, things are in a messy state and you want to switch branches for a bit to work on something else. The problem is, you don’t want to do a commit of half-done work just so you can get back to this point later. The answer to this issue is the git stash command.
git 
may 2013 by vicg4rcia
Git Tip: How to "Merge" Specific Files from Another Branch [jasonrudolph.com]
Part of your team is hard at work developing a new feature in another branch. They've been working on the branch for several days now, and they've been committing changes every hour or so. Something comes up, and you need to add some of the code from that branch back into your mainline development branch. (For this example, we'll assume mainline development occurs in the master branch.) You're not ready to merge the entire feature branch into master just yet. The code you need to grab is isolated to a handful of files, and those files don't yet exist in the master branch.
git 
april 2013 by vicg4rcia
None
The rebase command has some awesome options available in its --interactive (or -i) mode, and one of the most widely used is the ability to squash commits. What this does is take smaller commits and combine them into larger ones, which could be useful if you’re wrapping up the day’s work or if you just want to package your changes differently. We’re going to go over how you can do this easily.
git 
april 2013 by vicg4rcia
How to Create a New and Empty Branch in Git
In many coding projects the code is kept in one repository and the documentation is kept in another.

If the project is a web application with a database backend perhaps a backup of the SQL is kept in yet another repository.

In Git you can have it all in one repository and keep things separated and isolated in branches.
git 
april 2013 by vicg4rcia
Quick tip: git checkout specific files from another branch – Nicolas Gallagher
The git checkout command can be used to update specific files or directories in your working tree with those from another branch, without merging in the whole branch. This can be useful when working with several feature branches or using GitHub Pages to generate a static project site.
git 
april 2013 by vicg4rcia
Flat Terminal Theme
Just open the attached "Flat.terminal" file, and if you like it press the "Default" button down in Terminal Settings to use it every time.
git 
april 2013 by vicg4rcia
Mislav Marohnić : Keep TODOs in git
You can keep per-branch TODOs as empty commits in git:
git 
april 2013 by vicg4rcia
Handy Git tips to stop you getting fired
Below are some tips which might just stop you making that one horrible mistake that makes your CTO wonder if your probationary period is over.
git 
april 2013 by vicg4rcia
Git: Merge to master while automatically choosing to overwrite master files with branch - Stack Overflow
I am using Git to track my documentation latex source. I want to keep the master branch full of documents that are suitable for end user release, so when someone needs something, i can just switch to the master branch, compile and hand out the document.
git 
april 2013 by vicg4rcia
Git: how to merge modified files only - Stack Overflow
I have the following problem: We have a large product which is in master branch. Also we have other branches that have only few files, the files that are specific to this branch only. Each of those branches represent a plugin to the main product. So for example when you get the main product, you receive lots of files, install them, etc. and later when you decide to get a plugin, you receive a package containing several files only and by uploading these file (and replacing the original ones) you get the plugin installed.
git 
april 2013 by vicg4rcia
Five advanced Git merge techniques : Inside 206-105
Have you ever performed a merge in Git and not have it quite turn out the way you wanted it to? For example, you accidentally converted all of your UNIX line endings to DOS line endings, and now the entire file reports a conflict? Maybe you see a conflict that you don't really care about resolving, and want to resolve as theirs? Or perhaps the conflicted file is empty and you can't figure out just what happened there?
git 
march 2013 by vicg4rcia
How do you merge selective files with git-merge? - Stack Overflow
I'm using git on a new project that has two parallel -- but currently experimental -- development branches:

master: import of existing codebase plus a few mods that I'm generally sure of
exp1: experimental branch #1
exp2: experimental branch #2
exp1 and exp2 represent two very different architectural approaches. Until I get further along I have no way of knowing which one (if either) will work. As I make progress in one branch I sometimes have edits that would be useful in the other branch and would like to merge just those.

What is the best way to merge selective files from one development branch to another while leaving behind everything else?
git 
march 2013 by vicg4rcia
airblade/vim-gitgutter
A Vim plugin which shows a git diff in the 'gutter' (sign column). It shows whether each line has been added, modified, and where lines have been removed.
vim  git 
march 2013 by vicg4rcia
Git PPA for Ubuntu • A Virtual Home
I maintain a git PPA for Ubuntu which is hosted at Launchpad. I try to build packages of the latest git within a few days after it’s official release but sometimes other work takes priority, like work I get paid for. The official homepage of git can be found at http://git-scm.com/ where you can find the release notes of git, as well as several links to documentation on working with git.
git  ubuntu 
march 2013 by vicg4rcia
github - Git: Clone only one branch - Stack Overflow
"git clone" learned "--single-branch" option to limit cloning to a single branch (surprise!); tags that do not point into the history of the branch are not fetched.
git 
march 2013 by vicg4rcia
Installing latest git on Ubuntu with git-subtree support
Because this command is now merged into git-core since 1.7.11, we will need to install the latest git from a PPA.  Note that as of ‘now‘, the latest available package from the PPA we will use is 1.8.0, and it currently installs the subtree script
git  ubuntu 
march 2013 by vicg4rcia
Effectively Using Git With Subversion | Viget
Like many organizations using Rails, we have caught the git wave, and are in a state of transition between git and Subversion. Our open-source work is stored in git repositories, but our client work is still stored in Subversion repositories, and probably will be for some time. While git is amazing, Subversion still has its good qualities, and makes an excellent centralized repository, especially with its ecosystem of user-friendly tools.
git  svn 
february 2013 by vicg4rcia
How To Use Git-SVN as the Only Subversion Client You’ll Need at Everything In Between
I’ve been using git as my favorite version control tool for quite a while now. One of its numerous distinguishing features is an optional component called git-svn, which serves as a bi-directional “bridge” that enables native git repositories to interact with a Subversion repository, performing all the normal operations you would need to use svn for. In other words, since you can checkout, commit to, and query the logs of Subversion repositories (among other things) using git-svn, git can serve as your all-in-one Subversion client.
git  svn 
february 2013 by vicg4rcia
How do I delete a Git branch both locally and in GitHub? - Stack Overflow
I created a bugfix branch to fix a bug on a project that I had forked on GitHub. I issued a pull request to the developer to incorporate my fix, but the developer decided to implement a different fix for the problem. At this point, I want to delete the bugfix branch both locally and on my project fork on GitHub.
git 
february 2013 by vicg4rcia
cgit - a web frontend for git repositories
web interface (cgi) for git repositories, written in C
licensed under GPLv2
discussions, patches etc. goes to the list (archive, gmane).
common questions are answered in the faq.
git  cgit  scm 
december 2012 by vicg4rcia
Git How-To: Remove Your Password from a Repository | David Verhasselt
When you’re making an app that uses credentials to access some service, in the early stages of development before any code to access a config-file is written, a username and password are occasionally hard-coded in the source.
git 
december 2012 by vicg4rcia
JStoutenburg.com: Indefero Server
How to install Indefero on an Nginx/PHP FastCGI environment
git  indefero 
july 2012 by vicg4rcia
GitHub Flow | Scott Chacon on the Interwebs
I travel all over the place teaching Git to people and nearly every class and workshop I’ve done recently has asked me what I think about git-flow. I always answer that I think that it’s great - it has taken a system (Git) that has a million possible workflows and documented a well tested, flexible workflow that works for lots of developers in a fairly straightforward manner. It has become something of a standard so that developers can move between projects or companies and be familiar with this standardized workflow.
git  programming 
december 2011 by vicg4rcia
Help.GitHub - Send pull requests
Pull requests let you tell others about changes you've pushed to a GitHub repository. Once a pull request is sent, interested parties can review the set of changes, discuss potential modifications, and even push follow-up commits if necessary.

This guide walks through the process of sending a hypothetical pull request and using the various code review and management tools to take the change to completion.
git 
december 2011 by vicg4rcia
A successful Git branching model » nvie.com
In this post I present the development model that I’ve introduced for all of my projects (both at work and private) about a year ago, and which has turned out to be very successful. I’ve been meaning to write about it for a while now, but I’ve never really found the time to do so thoroughly, until now. I won’t talk about any of the projects’ details, merely about the branching strategy and release management.
git  programming 
december 2011 by vicg4rcia
Installation - Indefero
installation directions for Indefero web app
indefero  git  php  programming 
november 2011 by vicg4rcia
Moving to git and setting up InDefero as a web frontend | Simon Holywell
Anyway now I have an Ubuntu server that I am using for storing the repositories and as a pretty frontend I have installed InDefero which also allows us to manage tickets. InDefero is much like the code.google.com forge to manage and look at it so it is very simple. I like Trac but I was not happy with the existing integrations with git.
git  programming 
november 2011 by vicg4rcia
Kernel Hackers' Guide to git
This tutorial is a cookbook of recipes getting up and running with Linus's source code management (SCM) software, "git." Its targetted mainly at Linux kernel hackers, though others may find it useful.
git  programming 
october 2011 by vicg4rcia
reinh.com: Git Push: Just The Tip
Today we delve into the world of git push, one of the most often used git tools. git push is typically used to update a remote ref and associated objects based on a local ref – in other words, to push your local changes to an upstream repository – but you can also use it to create or delete remote branches and much, much more! actually, that’s about it.
git  programming 
october 2011 by vicg4rcia
Git for OS X
Includes .zip package to install git on OS X 10.4
git  osx  programming 
october 2011 by vicg4rcia
Using Git with Vim
I recently started using Git for my local revision control. Since I spend about 90% of my coding time inside the Vim editor, I went looking for a plugin that would make Vim play nice with Git. In this article I present two different vim plugins and explore their feature-set via screenshots.
git  vim  programming 
october 2011 by vicg4rcia
git-push is worse than worthless | The Fugue
Let's say you are a web developer, and you do development on your laptop, then when things are nice and shiny you want to push those changes to the webserver. Seems natural enough, right?
git  programming  system:unfiled 
october 2011 by vicg4rcia
A Git Primer | danielmiessler.com
git is a wicked-powerful distributed revision control system. It is confusing to many, so there are myriad tutorials and explanations online to help people understand it. This one will focus on the fundamental concepts and tasks rather than trying to compete with the documentation.
git  programming  c250 
october 2011 by vicg4rcia

Copy this bookmark:



description:


tags: