Under [branch “master”], try adding the following to the repo’s Git config file (.git/config): [branch “master”] remote = origin merge = refs/heads/master This tells Git 2 things: When you’re on the master branch, the default remote is origin. When using git pull on the master branch, with no remote and branch specified, use the default … Read more
Disclaimer: I use Git, follow Git development on git mailing list, and even contribute a bit to Git (gitweb mainly). I know Mercurial from documentation and some from discussion on #revctrl IRC channel on FreeNode. Thanks to all people on on #mercurial IRC channel who provided help about Mercurial for this writeup Summary Here it … Read more
Update for 2022 from TrinitronX Fast-forward to 2021 and now Bundler docs [web archive] now say to commit the Gemfile.lock inside a gem… ¯_(ツ)_/¯ I guess it makes sense for developers and ease of use when starting on a project. However, now CI jobs need to be sure to remove any stray Gemfile.lock files to … Read more
I discovered git-annex recently which I find awesome. It was designed for managing large files efficiently. I use it for my photo/music (etc.) collections. The development of git-annex is very active. The content of the files can be removed from the Git repository, only the tree hierarchy is tracked by Git (through symlinks). However, to … Read more
git reset If all you want is to undo an overzealous “git add” run: git reset Your changes will be unstaged and ready for you to re-add as you please. DO NOT RUN git reset –hard. It will not only unstage your added files, but will revert any changes you made in your working directory. … Read more
A possible solution from git config: git config –global mergetool.keepBackup false After performing a merge, the original file with conflict markers can be saved as a file with a .orig extension. If this variable is set to false then this file is not preserved. Defaults to true (i.e. keep the backup files). The alternative being … Read more
The following is an excerpt from my personal blog . Using Git with 3D Games Update Oct 2015: GitHub has since released a plugin for Git called Git LFS that directly deals with the below problem. You can now easily and efficiently version large binary files! Git can work fine with 3D games out of … Read more
The ‘git branch -d’ subcommand can delete more than one branch. So, simplifying @sblom’s answer but adding a critical xargs: git branch -D `git branch –merged | grep -v \* | xargs` or, further simplified to: git branch –merged | grep -v \* | xargs git branch -D Importantly, as noted by @AndrewC, using git … Read more
If you update your libs, you want to commit the lockfile too. It basically states that your project is locked to those specific versions of the libs you are using. If you commit your changes, and someone pulls your code and updates the dependencies, the lockfile should be unmodified. If it is modified, it means … Read more
To get undo/show dir’s/files that are set to assume-unchanged run this: git update-index –no-assume-unchanged <file> To get a list of dir’s/files that are assume-unchanged run this: git ls-files -v|grep ‘^h’