[02:08:21] --- squinney has become available [05:46:59] --- mvitale has become available [06:19:01] --- ballbery has become available [06:44:22] --- meffie has become available [07:11:02] --- deason has become available [08:05:28] --- meffie has left [09:16:56] --- squinney has left [09:53:59] --- mvitale has left [09:54:22] --- mvitale has become available [09:54:42] --- mvitale has left [09:54:42] --- mvitale has become available [10:47:48] --- mvitale has left [10:47:48] --- mvitale has become available [10:48:13] --- mvitale has left [10:48:13] --- mvitale has become available [11:26:53] I *did* run git rebase --whitespace=fix [11:28:16] ]$ git rebase --whitespace=fix fatal: Needed a single revision invalid upstream [11:28:28] and now it fails [11:31:29] do I have to run it with something other than "master" since I did a checkout to create a local branch? [11:33:18] when you create the local branch you should "git checkout -b origin/master" [11:33:46] that tells git to create the new branch tracking the upstream master. If you don't have an upstream associated with the branch., you cannot rebase [11:34:02] I did git check -b myname origin/master [11:34:07] er, s/check/checkout [11:34:19] so, do I do a git rebase --whitespace=fix myname [11:34:25] or a git rebase --whitespace=fix origin/master ? [11:35:15] --- stephan.wiesand has become available [11:35:18] origin/master [11:35:59] ok, done [12:16:16] if whoever has access could release the merged openafs-web out to the webpage [12:16:32] :-D [12:58:01] --- stephan.wiesand has left [13:31:17] --- ballbery has left [13:37:07] --- Brandon Allbery has left [15:26:53] --- mdionne has become available [17:40:12] --- Brandon Allbery has become available [19:21:12] --- mdionne has left [20:37:51] --- jaltman/FrogsLeap has left: Disconnected [20:42:18] --- jaltman/FrogsLeap has become available [22:12:18] --- deason has left [22:12:19] --- deason has become available [22:19:24] --- deason has left [23:46:47] --- jaltman/FrogsLeap has left: Disconnected [23:49:39] --- jaltman/FrogsLeap has become available [23:51:53] --- asedeno has left [23:52:12] --- asedeno has become available