+ [11 years ago] luminous hello! quick question: when setting up .gitconfig for a user, which field(s) is/are github looking for to associate the commits with a github user in the web ui?
+ [11 years ago] imkmf luminous: https://help.github.com/articles/setting-your-email-in-git
+ [11 years ago] KrofDrakula anyone here used .gitattributes merge attribute? i'm having trouble implementing a custom merge driver with git 1.7.2.5 on debian: https://gist.github.com/KrofDrakula/9e4a880cf58bf6fb4444

message no. 49431

Posted by milki in #github at 2014-09-25T06:51:44Z

bigblackbook: its a soft reset to the current commit. stage is ahead of the current commit. so you are !unstage ing the file
+ [11 years ago] Gurpartap Couldn’t git clone for a good couple of minutes
+ [11 years ago] Gurpartap from machines across the world.
+ [11 years ago] daMaestro Evening. I'm trying to create a PR of commits that have already been committed into master. I'm curious how I can achieve this. I've created a branch from the tag I would like to compare from, but I'm unable to create a PR because the commits in question have already been merged into master.
+ [11 years ago] daMaestro A `git diff master..branch_name` shows the changes, but I can't use a PR at this time.
+ [11 years ago] daMaestro Got it, just had to reverse the comparison.