latest 18 messages by dsync
+
[2016-03-31T19:37:26Z]
dsync
or is all or nothing?
+
[2016-03-31T19:36:58Z]
dsync
if i decide to merge my working branch with master, is it possible for me to revert one of the commits in the working branch in the merge commit?
+
[2016-03-31T15:28:26Z]
dsync
to get to the latest commit
+
[2016-03-31T15:26:13Z]
dsync
rom1504: you forgot that i need to do: "git pull origin jyz" after creating the branch
+
[2016-03-31T15:21:06Z]
dsync
because i can not rebase to something that doesn't show up in git log, now can i?
+
[2016-03-31T15:19:36Z]
dsync
or is there a way to make github give me the latest of jyz branch?
+
[2016-03-31T15:18:56Z]
dsync
as it is on the computer i made the changes
+
[2016-03-31T15:18:43Z]
dsync
on github, branch jyz is many commits ahead of master
+
[2016-03-31T15:18:17Z]
dsync
since; "git checkout jyz; git pull" only gets me to the point where master is
+
[2016-03-31T15:17:34Z]
dsync
looks like i need to do this on the computer that has my current personal branch
+
[2016-03-31T15:10:53Z]
dsync
my personal branch name is 'jyz' so i should use 'jyz-merge'?
+
[2016-03-31T15:08:58Z]
dsync
error: unknown switch `n'
+
[2016-03-31T15:07:41Z]
dsync
but i did make a bunch of other useful commits after that
+
[2016-03-31T15:07:28Z]
dsync
no deps
+
[2016-03-31T15:07:22Z]
dsync
the commit i don't want just changed some login details
+
[2016-03-31T15:03:45Z]
dsync
that would also destroy all the commits after it
+
[2016-03-31T15:00:18Z]
dsync
selckin: i could only use rebase up to the point where i made a commit i don't want?
+
[2016-03-31T14:57:19Z]
dsync
selckin: that branch is created via cherrypick or rebase or both or what?