| # |
Jul 31st 2009, 16:04 |
alkemann |
i ended up just pushing it http://thechaw.com/bakery/commits/view/b277acaded587bfe8f9ff287d52c53d04cffff57 |
| # |
Jul 31st 2009, 16:04 |
jperras |
I gotta go for now though |
| # |
Jul 31st 2009, 16:04 |
jperras |
ok, I'll take a look at it this weekend if you want |
| # |
Jul 31st 2009, 16:04 |
alkemann |
now they are at the same commit |
| # |
Jul 31st 2009, 16:04 |
jperras |
hm |
| # |
Jul 31st 2009, 16:02 |
alkemann |
i hate to push a commit of a newline thing, but thats whwere the stash is from. i keep having to create branches and delete it with the single commit to get rid of this invisible change that keeps happening to a file |
| # |
Jul 31st 2009, 16:02 |
jperras |
yeah, sometimes that's the only easy way |
| # |
Jul 31st 2009, 16:01 |
alkemann |
i gave up on the subway map from phally :P i cherry picked his fox back into usersplugin and merge it back |
| # |
Jul 31st 2009, 16:00 |
alkemann |
stash clear did it. sorta |
| # |
Jul 31st 2009, 16:00 |
jperras |
which will apply and remove the topmost item |
| # |
Jul 31st 2009, 16:00 |
jperras |
you can do a git stash pop |
| # |
Jul 31st 2009, 16:00 |
jperras |
it'll show you the two stashes |
| # |
Jul 31st 2009, 16:00 |
jperras |
do a git stash list |
| # |
Jul 31st 2009, 16:00 |
alkemann |
yea i tried stash apply |
| # |
Jul 31st 2009, 15:59 |
jperras |
that's just a stash that you made |
| # |
Jul 31st 2009, 15:59 |
jperras |
that |
| # |
Jul 31st 2009, 15:59 |
jperras |
hey |
| # |
Jul 31st 2009, 15:56 |
alkemann |
git problem http://imagebin.ca/img/XgT6eM.gif |
| # |
Jul 31st 2009, 15:55 |
alkemann |
jperras: alive? |
| # |
Jul 31st 2009, 10:01 |
alkemann |
sigh.. cant figure this out now. i gotta head out. laters |
| # |
Jul 31st 2009, 10:00 |
alkemann |
tried ti cherry pick the 2.0 commit into the userplugin comtti and got conflict.. |
| # |
Jul 31st 2009, 09:56 |
alkemann |
i am looking at the gitk visualization. but .. |
| # |
Jul 31st 2009, 09:55 |
jperras |
a graphical viewer does help, you just need to get used to it |
| # |
Jul 31st 2009, 09:54 |
jperras |
well, svn has merge commits as well |
| # |
Jul 31st 2009, 09:54 |
alkemann |
the difference between my local 2.0 and the remote 2.0 is 4 commits and 4 merges. not in order |
| # |
Jul 31st 2009, 09:53 |
alkemann |
these merge commits gives me troubles.. i know ther suppose to help, but tbh it does |
| # |
Jul 31st 2009, 09:52 |
jperras |
no graph for you |
| # |
Jul 31st 2009, 09:52 |
jperras |
ah, oh well |
| # |
Jul 31st 2009, 09:52 |
alkemann |
1.6.1.9 |
| # |
Jul 31st 2009, 09:51 |
jperras |
if you have git 1.6.3, try a git log --graph |
| # |
Jul 31st 2009, 09:51 |
jperras |
haha |
| # |
Jul 31st 2009, 09:51 |
alkemann |
jperras: these gitk lines looks like a subway system made by a blind man.. not sure it helps alot heh |
| # |
Jul 31st 2009, 09:50 |
alkemann |
indeed u had better |
| # |
Jul 31st 2009, 09:50 |
jperras |
P |
| # |
Jul 31st 2009, 09:50 |
jperras |
25? oy. Guess I better get crackin' |
| # |
Jul 31st 2009, 09:50 |
jperras |
and then run a git revert on the hash you want to get rid of |
| # |
Jul 31st 2009, 09:50 |
jperras |
so cherry-pick the commit from one to the other |
| # |
Jul 31st 2009, 09:49 |
alkemann |
jperras: and 25 in pending ;) |
| # |
Jul 31st 2009, 09:48 |
alkemann |
the merge of 2.0 into 2.0 doesnt sound like it does anything usefull anyways |
| # |
Jul 31st 2009, 09:47 |
jperras |
and then change 2.0 so that the commits are reversed |
| # |
Jul 31st 2009, 09:47 |
jperras |
well, you can cherry-pick the commits from 2.0 to usersplugin |
