+ [2014-09-24T19:06:14Z] pierrot you're very cool tobiasvl . I'm really thankful
+ [2014-09-24T19:06:30Z] tobiasvl hehe, no prob
+ [2014-09-24T22:52:53Z] Trindaz_ An error that happens semi-regularly: `git rebase master` creates merge conflicts. I resolve the conflicts. Then do `git rebase --continue` and I get "No changes - did you forget to use 'git add'?"
+ [2014-09-24T22:53:00Z] Trindaz_ what's going on?
+ [2014-09-24T23:11:10Z] pierrot sb end

message no. 49089

Posted by mythicalbox in #github at 2014-09-24T01:47:19Z

if i do a --no-ff merge from branch1 to master and push to github it shows branch1 as "this is 1 commit behind master", does that sound correct?
+ [2014-09-25T04:28:00Z] gasull How do I checkout the branch of a contributor? Do I need to fork his fork?
+ [2014-09-25T05:36:22Z] gasull How do I checkout the branch of a contributor? Do I need to fork his fork for this?
+ [2014-09-25T06:47:17Z] milki gasull: you can clone the repo as normal or learn how to add remotes
+ [2014-09-25T06:50:29Z] bigblackbook In git we use, "git reset HEAD file", to remove a file from stage but how does it work? Doesn't HEAD refer to the most recent commit. How is it realted to staging area?
+ [2014-09-25T06:51:44Z] milki bigblackbook: its a soft reset to the current commit. stage is ahead of the current commit. so you are !unstage ing the file