Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate

#aslo-dev, 2010-09-24

 « Previous day | Index | Today     Channels | Search | Join

All times shown according to UTC.

Time Nick Message
10:46 manugupta <manugupta!3bb1c1d5@gateway/web/freenode/ip.> has joined #aslo-dev
12:19 manugupta has quit IRC
12:40 jatin <jatin!3bb1c62d@gateway/web/freenode/ip.> has joined #aslo-dev
12:40 jatin alsroot: hi
12:40 alsroot jatin: hi
12:42 jatin alsroot, i was trying the git diff and git log commands and had a problem with git diff
12:42 alsroot jatin: were are you stuck?
12:42 jatin alsroot: the git log command are showing the logs but git diff does not show anything
12:43 alsroot jatin: whats your current branch?
12:43 jatin alsroot: we have cloned aslo dev  project repository and tryed git log and git diff on it
12:44 alsroot: there is only one branch master
12:45 alsroot jatin: if you didn't checkout remote branch before use something like `git diff origin/upstream`
12:45 jatin: or checkout it `git checkout -b upstream origin/upstream`
12:45 jatin alsroot: ok
12:47 alsroot: fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout 'origin/upstream' which can not be resolved as commit?
12:47 alsroot : this is the error which comes up on typing the git checkout command
12:48 alsroot jatin: is it git.sugarlabs.org:slo-activities/mainline.git repo?
12:49 jatin no its http://git.sugarlabs.org/projects/aslo-dev/repos
12:50 alsroot jatin: I thought you are trying to get diff in old ASLO.. if you are trying to just get diff try `git diff <commit>` in the same branch
12:52 jatin: btw whats was the reason to clone it to git.sl.o? having it on github let use to be closer to w/ upstream
12:53 ..but it maybe the question to manusheel
12:55 jatin has quit IRC
13:12 jatin <jatin!7838ec5d@gateway/web/freenode/ip.> has joined #aslo-dev
13:13 jatin alsroot: sorry, got disconnected
13:14 alsroot: i ran the checkout command, it created another stream
13:14 alsroot: but git diff did not return anything
13:15 alsroot: *stream=branch
13:15 alsroot jatin: use just `git diff <commit>`
13:15 ..to see diff between <commit> and current HEAD
13:21 jatin alsroot: thanks, the command worked great
13:21 alsroot jatin: http://www.eecs.harvard.edu/~cduan/technical/git/ ;)
13:22 jatin_ <jatin_!3bb1c289@gateway/web/freenode/ip.> has joined #aslo-dev
13:22 jatin has quit IRC
13:24 jatin_ alsroot: actually shifted computers could you send us the link again
13:24 alsroot jatin_: http://www.eecs.harvard.edu/~cduan/technical/git/
13:24 jatin_ actually o
13:26 alsroot: actually only one branch name appears when i run the command git branch
13:28 alsroot: how do i check the difference between v4 and v4-theme branch
13:28 alsroot jatin_: in aslo-dev, there is only on branch, it is new aslo not previous one
13:28 old one is http://git.sugarlabs.org/projects/slo-activities
13:28 jatin_ working on slo-activities right now
13:29 alsroot jatin_: use full name of branch e.g. being in master, `git diff origin/upstream`
13:31 jatin_ alsroot: thanks, it worked fine
13:31 alsroot yw
13:58 jatin_ alsroot: one more question, could we clone the repository as it was after a specific commit?
13:59 alsroot jatin_: you all time clone the whole repo (though you can clone shallow repos as well), later you can use `git reset --hard` to reset current branch to any commit you want
14:01 jatin_ alsroot: thanks
14:39 jatin_ has quit IRC

 « Previous day | Index | Today     Channels | Search | Join

Powered by ilbot/Modified.