The output of git branch -a shows that you have a remote-tracking branch called origin/master. Perfectly normal. However, the output of git show-ref master contains 6726b4985107e2ddc7539f95e1a6aba536d35bc6 refs/origin/master which indicates that you most likely ran something like the following low-level command: git update-ref refs/origin/master master This command creates a branch (pointing at the same commit as … Read more
It indicates that you do not have a newline (usually ‘\n’, aka CR or CRLF) at the end of file. That is, simply speaking, the last byte (or bytes if you’re on Windows) in the file is not a newline. The message is displayed because otherwise there is no way to tell the difference between … Read more
Actually, I found an even better way with the –no-ff option on git merge. All this squash technic I used before is no longer required. My new workflow is now as follows: I have a “master” branch that is the only branch that I dcommit from and that clone the SVN repository (-s assume you … Read more
Both Git (the software) and GitHub (the web service) have a concept called “pull request”, and unfortunately they are not exactly the same thing. Native Git The native Git request-pull command has a very short manual page with the following one-sentence description: Summarizes the changes between two commits to the standard output, and includes the … Read more
check out the git-update-index man page and the –assume-unchanged bit and related. when I have your problem I do this git update-index –assume-unchanged dir-im-removing/ or a specific file git update-index –assume-unchanged config/database.yml
That seems consistent with what a rebase does. git svn rebase will fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it. git rebase does mention: Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> … Read more
A Git commit ID is a SHA-1 hash of every important thing about the commit. I’m not going to list them all, but here’s the important ones… The content, all of it, not just the diff. Commit date. Committer’s name and email address. Log message. The ID of the previous commit(s). Change any of that … Read more
Here’s a method that avoids hijacks, which our team used this method quite successfully for over a year, until we retired ClearCase for Subversion (per company policy, although it is a backwards step for our team – we were basically just using ClearCase as a dumb file system, and virtually working natively in git, but … Read more
You can manually add the remote branch, git config –add svn-remote.newbranch.url https://svn/path_to_newbranch/ git config –add svn-remote.newbranch.fetch :refs/remotes/newbranch git svn fetch newbranch [-r<rev>] git checkout -b local-newbranch -t newbranch git svn rebase newbranch
You’ve already discovered the simplest way to specify a shallow clone in Git-SVN, by specifying the SVN revision number that you want to start your clone at ( -r$REV:HEAD). For example: git svn clone -s -r1450:HEAD some/svn/repo Git’s data structure is based on pointers in a directed acyclic graph (DAG), which makes it trivial to … Read more