Home » git

git

git merge resolve conflicts by always choosing merged branch

Snippet Instead of being asleep at 09:23 on 17 July 2015, kitt created this:

There are times when a branch has diverged so far from master or itself that doing a fetch-merge is just impossible without conflicts. Those with changing binary files or gigantic files? The worst.

$ git reset --hard HEAD
HEAD is now at 82a18be this is my last change, no really
$ git pull origin my_branch
From github.com:kitt/this-is-a-fake-repo
 * branch             my_branch -> FETCH_HEAD
Auto-merging some-project/project.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in some-project/project.xcodeproj/project.pbxproj
Auto-merging some-project.xcworkspace/contents.xcworkspacedata
Automatic merge failed; fix conflicts and then commit the result.

Solution, just take what the branch has, don't try to merge in changes, in case of conflict.

git merge -s recursive -X theirs branch-name

Applying branch changes to a new branch in git

Blog Written with a loving hand by kitt some time around 07:15 on 12 June 2015

I am unsure how other people do this, but this is how I apply changes from one branch to a new branch when the original branch can't be rebased to master (say, when the original branch is thousands, or really, maybe just hundreds or tens of conflicting, commits behind master).

$ git co branch-no-longer-loved

Git checkout local repo from N days ago

Blog kitt decided around 12:03 on 10 November 2014 to publish this: 
git checkout @{two.days.ago}

If only there were a way to checkout files from the fuyoocha. 

git checkout @{two.days.fromnow}

or maybe

git checkout @{two.days.aftercompleting}

Remove untracked files in git repo

Snippet Posted by kitt at 10:25 on 16 August 2014

Sometimes, you just want to clean up a git repo, getting rid of the untracked files. "git reset" will reset the repo, but not the untracked files. Use "git clean"

# remove untracked files and directories
$ git clean -f -d 
 
# do a test run first
$ git clean --dry-run -f -d
 
# clean ignored files (emacs turds!)
$ git clean -f -X

Archive and delete a git branch

Blog kitt decided around 12:22 on 17 September 2013 to publish this:

Head to the top of the git repository.

$ cd path/to/repo/top

Check out the branch you want, pull, update, whatever to put it into the state you want to archive.

$ git co branch-to-archive
$ git up
$ git pull
$ git whatever

Run this to archive the branch

$ git archive branch-to-archive | gzip > ../some/archive/path/repo-name-branch-name.YYMMDD.tar.gz

Check the repo is what you want:

$ tar tvfz ../some/archive/path/repo-name-branch-name.YYMMDD.tar.gz | less

Delete the branch remotely and locally:

$ git push origin :branch-to-archive
$ git branch -D branch-to-archive

And, of course, I have this in a script.

Search for a string in all git branches

Blog Posted by kitt at 21:19 on 15 September 2013

Yay, git grep!

git grep "string/regexp" $(git rev-list --all)

I love that it works with regular expressions, too.

Pages