[17:36:28] [## Class Started at Fri Jun 28 17:36:28 2013 ##] [17:36:28] startclass [17:36:33] now [17:36:37] now [17:36:37] -------------SESSION STARTS--------------- [17:36:43] ROLL CALL [17:36:47] Priyanka Kotiyal [17:36:48] Pritha Ganguly [17:36:50] purva [17:36:50] Anisha Agrawal [17:36:50] Avinash Kumar Dasoundhi [17:36:51] Umesh Agarwal [17:36:52] Rashmi [17:36:52] Devyani [17:36:52] now [17:36:52] Pankhudi Jain [17:36:53] Bidisha Mukherjee [17:36:53] Rahul Chowdhury [17:36:54] kirk [17:36:55] anurag kumar [17:36:56] Nilanjit Mitra [17:36:58] suman roy [17:36:59] Shalini Roy [17:37:00] satarupa sinha [17:37:04] dot|not, [17:37:07] korak ghosh [17:37:13] ravi kumbhkar [17:37:14] shantanu sarkar [17:37:20] Anwesha Das [17:37:35] siddhant sengar [17:37:35] pingall: roll call if you missed [17:37:36] amresh kumar [17:37:41] Josep Caselles [17:37:51] Yogesh Chaudhari [17:37:55] elita lobo [17:38:00] christina Beemer [17:38:06] manish [17:38:36] sudip gorai [17:38:43] any questions on things we discussed still now ? [17:38:53] ! [17:39:32] rahulch, ask [17:40:09] Iam sudip [17:40:34] Terry Mackin [17:40:46] suppose there is a directory containing some files under it, and i am interested in adding the whole directory including the files under it. can it be done in any way other than individually adding the files and placing them under one common directory? [17:40:51] william crane [17:41:09] Aniket Anvit [17:41:24] Mayank Jha [17:41:50] rahulch, git add directory/* [17:42:08] kushal, got it :) [17:42:21] so git log shows logs for the whole repository [17:43:14] can anyone guess which command will show logs of commits for a particular file ? do not answer if you already know [17:44:21] git log filename? [17:44:28] J_Caselles, correct :D [17:44:29] try [17:44:54] ! [17:45:13] shantanu, ask [17:45:26] kushal, can you please repeat your instruction, if any? i had lost my connection :( [17:45:33] kushal, tried. but it is showing log of both files [17:46:13] rahulch_, nothing done yet [17:46:13] kushal, http://fpaste.org/21729/ [17:46:17] ! [17:46:24] shantanu, press ! and wait [17:46:30] kushal, ok [17:46:39] people are also forgetting to type [17:46:48] [17:46:50] [17:47:25] shantanu, eeks, it seems you never followed anything we did till now [17:48:00] shantanu, your commit messages are totally off the hook [17:48:04] kushal, what if i made a mistake putting my second last commit? how can this be corrected [17:48:15] oops sorry [17:48:18] mistake [17:48:31] kushal, but they were showing last time i did [17:48:33] nilanjit, generally you are not supposed to make changes to any of those old histories [17:48:58] shantanu, then I don't know what happened [17:49:16] kushal, ok [17:49:16] ok [17:49:29] nilanjit, btw, why you asked out of turn ? [17:50:20] kushal, i did a mistake, sorry for that.. i was waiting for your permission [17:50:35] somehow the enter button got pressed [17:50:38] now [17:50:53] [17:50:59] nilanjit, like a cat walked on your keyboard and pressed the Enter key [17:51:01] anyway [17:51:11] git is distributed [17:52:14] kushal, sorry that cat was me [17:52:29] I will explain that later [17:52:33] nilanjit, no problem [17:53:13] generally the project decides one git repo in the internet as the primary place [17:53:14] thanks [17:53:21] others clone the repo from there [17:53:36] clone == I guess you can guess that [17:53:53] copy? [17:53:55] kushal, copy [17:53:59] kushal, make copy. [17:54:01] clone [17:54:15] means every thing will be same [17:54:49] for tonight we will clone itside our computer [17:56:02] rahulch_ is now known as rahulch [17:56:25] let us goto home directory and create a directory called clonedrepo01 [17:56:29] do it [17:58:42] tell me if you have any problem till now [17:58:51] no [17:59:09] ok [17:59:31] goto that directory [17:59:44] [gitu@localhost clonedrepo1]$ git clone ../repo01 . [18:00:55] now do a git log to see if you managed to clone it properly [18:01:16] ! [18:01:35] elita15, ask [18:01:50] ! [18:02:08] ! [18:02:12] ! [18:02:17] i got error, as bad default revision 'HEAD' [18:02:59] ! [18:03:10] tenstormavi, tutum anurag rahulch ask [18:03:14] got cleared my doubt. same as elita15 . [18:03:16] http://fpaste.org/21731/24419951/ <-- I got this after i did 'git log' [18:03:26] is there anything wrong in this? http://fpaste.org/21732/24420471/ [18:03:32] is this correct? [18:03:39] same as elita15 [18:03:41] http://fpaste.org/21733/72442075/ [18:03:56] yes [18:04:00] ! [18:04:13] all of you get a spec with positive power [18:04:28] none of you gave the command I typed [18:04:34] ! [18:04:41] tell me what you missed [18:04:47] siddhant, dell_ ask [18:04:50] http://fpaste.org/21734/ [18:05:09] dot after repo01? [18:05:11] siddhant, check my answer above [18:05:24] elita15, who will type that ? superman ? [18:05:53] kushal, i am sorry, thought it was a full stop. [18:05:58] elita15: dot as here this directory [18:06:16] http://fpaste.org/21735/44211513/ [18:06:56] ! [18:07:00] dell_, your paste is password protected [18:07:03] dell_, and the password is ? [18:07:07] ! [18:07:14] supriya, nilanjit ask [18:07:31] is this ok? - http://fpaste.org/21736/72442284/ [18:07:39] i got error, as bad default revision 'HEAD' [18:07:49] supriya, nilanjit no, not ok [18:08:18] all of you missed the . at the end [18:08:50] ! [18:08:52] people who did the mistake [18:09:09] kushal, sorry, let me try this again [18:09:10] remove repo01 from clonedrepo1 [18:09:18] rm -rf repo01 [18:09:38] do not give that command from home directory, that will delete the main repo [18:09:49] kushal:password [18:10:01] kushal, http://www.fpaste.org/21738/ ok ? [18:10:17] kushal: password [18:10:22] amresh, yes [18:10:46] dell_, same answer as others [18:10:49] ! [18:11:21] umesh, ask [18:11:23] ! [18:11:28] kushal, http://fpaste.org/21741/ is that ok ? [18:11:54] looks good [18:12:04] others please do not show me the output [18:12:11] you check and use your brain [18:12:13] tutum, ask [18:12:15] kushal: as i gave that command from clonerepo01 direcrory? [18:12:39] s/direcrory/directory [18:12:40] dell_, no check what elita15 said [18:12:46] dell_, you missed the . at the end [18:12:59] kushal,i wanted to show the output,its correct i guess. [18:13:09] tutum, good [18:13:28] everyone working ? [18:13:32] tell me yes/no [18:13:35] yes [18:13:36] yes [18:13:37] ! [18:13:40] yes [18:13:40] kushal,yes [18:13:40] yes [18:13:43] yes [18:13:44] no [18:13:50] yes [18:13:50] yes [18:13:53] dell_, fix it [18:13:56] yes [18:13:58] elita15, ask [18:14:20] yes [18:14:24] yes [18:14:25] not sure what happened to the rest [18:14:30] yes. [18:14:34] yes [18:14:37] http://fpaste.org/21744/42675137/ is this fine i deleted the directory and created again. [18:14:37] yes [18:14:40] ? [18:14:44] yes [18:14:44] [18:14:46] yes [18:14:49] yes [18:14:52] yes [18:14:55] yes [18:14:57] yes [18:14:57] elita15, yes [18:15:10] yes [18:15:17] now [18:15:34] you can image repo01 from someone else , it may be there in internet [18:15:50] and clonedrepo1 is your cloned repo [18:15:59] so you can make any changes to this one [18:16:21] which will not reflect to the other repository you cloned from [18:16:33] btw, that repository is know as remote [18:16:46] there can be more than one remote [18:16:58] $ git remote [18:17:16] shows remote [18:17:21] $ git remote -v [18:17:27] shows the remote details [18:17:40] the default is known as origin [18:18:18] ! [18:18:23] J_Caselles, ask [18:18:32] ! [18:18:39] anurag, ask [18:18:40] sorry, which is the remote, repo01 [18:18:49] J_Caselles, yes [18:19:03] J_Caselles, name of that remote is origin [18:19:10] oh, now I understand the output of remote -v :D [18:19:16] both are set as origin [18:19:52] anurag, yes, one is for fetch and one for push, generally they are same [18:20:09] name /.../, corrent? [18:20:12] fetch to get from the remote, push to send back [18:20:17] J_Caselles, yes [18:20:23] try this [18:20:25] thanks [18:20:31] ok [18:20:34] $ git pull [18:20:45] It should say "Already up-to-date." [18:20:54] as we never made any changes to repo01 [18:21:18] let us go back to repo01 [18:21:27] $ cd ../repo01/ [18:22:35] now create a new file there , [18:22:50] README.txt [18:22:55] inside [18:23:16] write [18:23:29] This is a test README file. [18:23:37] do it^^^ [18:23:48] save and exit [18:24:19] rahulch_ is now known as rahulch [18:25:26] $ git add README.txt [18:25:31] $ git commit -m "Adds a README file" [18:25:57] ^^ tell me when you are done [18:26:07] done [18:26:13] done [18:26:16] done [18:26:17] done [18:26:21] done [18:26:22] done [18:26:24] done [18:26:24] done [18:26:25] done [18:26:26] done [18:26:27] done [18:26:28] done [18:26:31] done [18:26:32] done [18:26:35] done [18:26:43] done [18:26:43] done [18:26:47] done [18:26:49] done [18:26:59] done [18:27:03] done [18:27:09] done [18:27:30] now one think this as an upstream change, image if the person from whom you cloned your repo made some changes like this [18:27:52] Ritu_ is now known as dell_ [18:27:53] s/image/imagine/ [18:27:54] What kushal meant to say was: now one think this as an upstream change, imagine if the person from whom you cloned your repo made some changes like this [18:27:56] done [18:28:02] done [18:28:39] so this change will not show up in your cloned repo automatically [18:28:53] let us first check that [18:29:20] let us go to clonedrepo1 [18:29:29] $ cd ../clonedrepo1/ [18:29:39] check the directory name carefully [18:29:43] git log [18:30:42] should be clonedrepo01 [18:31:48] now you can see this does not have the remote changes [18:32:31] you can pull these changes down to your cloned repo [18:33:21] $ git pull [18:33:39] this above command will pull all changes from the origin [18:33:56] $ git pull [18:33:57] remote: Counting objects: 4, done. [18:33:57] remote: Compressing objects: 100% (2/2), done. [18:33:57] remote: Total 3 (delta 0), reused 0 (delta 0) [18:33:57] Unpacking objects: 100% (3/3), done. [18:33:57] From /home/gitu/clonedrepo01/../repo01 [18:33:59] bf5c05b..a9aafbb master -> origin/master [18:34:01] Updating bf5c05b..a9aafbb [18:34:05] Fast-forward [18:34:07] README.txt | 1 + [18:34:09] 1 file changed, 1 insertion(+) [18:34:11] create mode 100644 README.txt [18:34:13] you can try to do a git log now [18:34:42] tell me if you have any confusion here [18:34:48] no [18:35:11] ! [18:35:38] elita15, ask [18:35:52] ! [18:36:15] rahulch, ask [18:36:26] i got aldready up to date [18:36:35] in the output, what is the meaning of "Fast-forward"? [18:36:57] rahulch, you will learn it slowly :D [18:37:01] rahulch, no hurry [18:37:10] kushal, okay :) [18:37:29] elita15, have you committed those changes in repo01 [18:37:52] ? [18:38:01] no [18:38:02] anyone else any problem [18:38:06] elita15, then ? [18:38:38] elita15, if you do not follow the steps, none of these things will work [18:38:46] next [18:39:37] you want to know the changes made in the 2nd commit from the first ever commit [18:39:55] $ git show commit_hash [18:40:13] use the commit hash you want learn about [18:40:50] ! [18:41:05] ! [18:41:10] ! [18:41:15] anurag, tenstormavi rahulch ask [18:41:21] fatal: ambiguous argument 'commit_hash': unknown revision or path not in the working tree. [18:41:21] Use '--' to separate paths from revisions, like this: [18:41:22] 'git [...] -- [...]' [18:41:28] i got this [18:41:37] tenstormavi, use fpaste to show error [18:41:44] kushal, http://fpaste.org/21753/44436713/ [18:41:45] from which directory we will enter that [18:41:46] ? [18:41:48] kushal, sorry [18:42:04] anurag, clonedrepo01 [18:42:13] kushal, solution? [18:43:15] tenstormavi, rahulch you have to give a valid hash [18:43:24] get it from git log command [18:43:28] like example [18:43:51] in my repo [18:43:52] $ git show bf5c05b676a540bab3e31616ceef200676e84500 [18:45:00] try with other log hashes [18:45:13] tell me when you are done [18:45:22] done [18:45:25] done [18:45:26] done [18:45:30] done [18:45:35] done [18:45:36] ! [18:45:37] done [18:45:38] done [18:45:43] done [18:45:44] done [18:45:47] done [18:45:50] done [18:45:51] kirk_iowa, ask [18:45:53] done [18:46:01] done [18:46:15] done [18:46:16] kushal, does it seem okay? http://fpaste.org/21757/13724446/ [18:46:20] done [18:46:23] manishjain is now known as dell_ [18:46:24] the previous revisions are stored, where ? in the .git directory ? [18:46:42] done [18:46:48] done [18:46:50] fewcha_ is now known as fewcha [18:47:18] kirk_iowa, yes [18:47:28] kirk_iowa, we will learn about them :) [18:47:47] ! [18:47:54] rahulch, ask [18:48:10] http://fpaste.org/21757/13724446/ is it okay now? [18:48:23] rahulch, you should be answering that [18:48:49] so next [18:49:15] I am going make some changes to README.txt file [18:49:15] got it [18:49:19] and then push it [18:49:45] Adding this line "We can do git pushes from our repo." [18:50:18] and then [18:50:19] $ git commit [18:50:24] no -m message here [18:51:04] ! [18:51:14] of course we did $ git add README.txt [18:51:50] rahulch, ask [18:52:18] we will make the change in repo01 or clonedrepo01? [18:52:53] rahulch, clonedrepo01 [18:52:58] $ git commit [18:53:10] ! [18:53:13] should open vi or vim to write commit message [18:53:17] ok [18:53:20] you write what all you want there [18:53:29] ! [18:53:35] like I wrote [18:53:39] Put details on README file. [18:53:43] and save and exit [18:54:00] amresh, prikotiyal ask [18:54:19] commit without -m gives an error http://www.fpaste.org/21761/72445102/ [18:54:44] amresh, you don't have vim installed [18:54:58] i have, and it works [18:55:11] kushal, i got this http://fpaste.org/21762/72445136/ , is it ok? [18:55:19] done kushal [18:55:30] prikotiyal, yes, it is vim [18:55:48] prikotiyal, start writing in a new line in the beginning [18:56:02] ok thanks [18:56:17] ! [18:56:24] prikotiyal, ask [18:56:39] kushal, what to write? anything? [18:56:43] ! [18:56:51] prikotiyal, I already gave that [18:57:02] ! [18:57:03] ok i will see that [18:57:07] prikotiyal, Put details on README file. [18:57:14] siddhant, rahulch ask [18:57:16] http://fpaste.org/21763/ [18:57:54] what is this file that just opened on vim after "git commit"? [18:57:55] kushal, http://paste.fedoraproject.org/21764/24453331/ [18:58:07] kushal, is this all right? [18:58:10] rahulch, that is a temporary file created by git [18:58:25] and its purpose? [18:58:51] tenstormavi, yes, but we went ahead made more changes [18:59:01] tenstormavi, see what I asked to do [18:59:19] ok its vi not vim on my system, got it working by changing the config of git [18:59:21] rahulch, to have a bigger commit message [18:59:44] siddhant, also you are using root account [18:59:45] kushal, okay. [18:59:47] which is bad [19:00:32] kushal,so what i have to use? [19:00:32] and now we can push this to remote [19:00:39] siddhant, a normal user [19:00:43] non root user [19:00:48] siddhant, install vim for now [19:00:53] kushal,ok [19:00:58] $ git push [19:01:25] ^^ the above command will push the changes to the repo, default is origin [19:01:30] http://paste.fedoraproject.org/21768/45550137/ [19:01:32] is it ok? [19:02:11] supriya, yes, it is vim only, write the commit message and save and exit [19:02:27] ! [19:02:30] elita15, ask [19:02:45] ! [19:02:51] tutum, ask [19:03:07] ! [19:03:17] http://fpaste.org/21769/72445650/ <--It is giving this. [19:03:38] tutum, same problem here [19:03:39] http://fpaste.org/21771/72445677/ [19:03:43] got an error [19:03:58] ! [19:04:42] tutum, do a git pull ? [19:05:00] nilanjit, ask [19:05:15] kushal, got error - same as elita15 - http://fpaste.org/21772/44568913/ [19:05:40] kushal, http://paste.fedoraproject.org/21773/45802137/ [19:05:47] kushal, is its ok? [19:05:48] tutum, nilanjit elita15 amresh show me $ history | tail [19:05:52] output [19:05:58] same problem [19:05:59] ! [19:06:02] ! [19:06:09] ! [19:06:16] tenstormavi, you are like 3-5 steps behind [19:06:22] anisha, rahulch prikotiyal ask [19:06:31] i am getting this- http://fpaste.org/21770/24456631/ [19:07:11] http://fpaste.org/21774/45877137/ <-- result of history | tail. [19:07:17] [19:07:17] anisha, rahulch prikotiyal ask [19:07:24] i am getting this- http://fpaste.org/21770/24456631/ [19:07:31] kushal, after doing git pull ? i am getting this http://fpaste.org/21775/13724458/ [19:07:44] ! [19:07:51] kushal, output- http://fpaste.org/21776/37244590/ [19:07:52] [19:07:59] [19:09:00] kushal,http://fpaste.org/21778/44599713/ [19:09:12] rahulch, try: git config --global push.default matching [19:09:17] and then pushing again [19:09:28] kushal, okay trying that [19:09:28] kushal on doing history|tail [19:09:41] i m getting this [19:09:47] http://fpaste.org/21779/44601813/ [19:10:41] kushal, it showed no output at all. is it normal? [19:10:41] people who are showing me history, you all did git pull before ? [19:10:53] rahulch, yes, try to push after that [19:11:14] ! [19:11:21] ! [19:11:26] kushal, i am still getting errors [19:11:36] speak freely [19:11:42] http://fpaste.org/21782/37244615/ [19:11:51] kushal, i did git pull before [19:11:52] Same error like others. [19:11:58] kushal please check this history|tail [19:12:02] kushal,yes i did a git pull while pulling the changes from the origin to the clonedrepo01 [19:12:05] same error [19:12:22] kushal, http://fpaste.org/21783/24462001/ [19:12:24] And even after this "git config --global push.default matching" [19:12:55] now just one person [19:12:58] elita15, you [19:13:03] elita15, goto repo01 [19:13:10] elita15, and try git config --bool core.bare true [19:13:20] and then comeback to clonedrepo01 [19:13:25] and try to push [19:14:40] ! [19:14:54] elita15, worked ? [19:15:00] prikotiyal, ask [19:15:13] ! [19:15:21] kushal, yes [19:15:22] anurag, ask [19:15:29] ! [19:15:29] elita15, git push worked ? [19:15:43] kushal, yes, what was wrong? [19:16:12] who all getting error can read http://stackoverflow.com/questions/2816369/git-push-error-remote-rejected-master-master-branch-is-currently-checked and try to understand [19:16:14] ! [19:16:20] I am not the best person to explain [19:16:32] but you can use the steps I told above [19:16:33] i got this http://fpaste.org/21775/13724458/ after git pull ? i am getting eror.what to do.even git push is not working [19:16:40] [19:16:41] ok [19:16:49] kushal, http://fpaste.org/21785/ worked [19:16:53] rahulch, say [19:17:04] prikotiyal, show us which directory you are in [19:17:12] pwd [19:17:14] ? [19:17:21] ! [19:17:30] dell_, ask [19:17:44] say yes, if it worked for you properly [19:17:47] kushal, i got this http://fpaste.org/21783/24462001/ [19:17:53] yes [19:17:59] kushal,yes it worked.:) [19:18:13] rahulch, see the steps I told to elita15 [19:18:18] i got http://ur1.ca/egwlg [19:18:21] http://fpaste.org/21787/44655013/ <------ this one [19:18:25] okay. [19:18:29] kushal, that worked, but i am getting it. why and how things are happening. :( [19:18:36] *not [19:18:43] dell_, for which command ? [19:18:43] kushal, yes worked [19:18:53] git push [19:19:10] yes worked [19:19:24] dell_, means push worked before [19:19:24] kushal: is it right? [19:19:31] dell_, yes, you already pushed [19:19:34] http://fpaste.org/21789/24466361/ [19:19:40] it is showing this [19:19:47] worked :) [19:20:00] kushal, its done :) where was i going wrong? [19:20:15] kushal, it worked :) [19:20:32] supriya, please show us full error messages not half [19:20:43] supriya, first git config --global push.default matching [19:20:53] and then follow the steps I said to elita15 [19:20:54] rahulch: it has to do to with security block introduced in newer git versions [19:21:14] http://fpaste.org/21790/44674113/ [19:21:33] it is the full error message whoch i got [19:21:40] kushal, ok [19:21:42] which [19:21:50] supriya, I told you the solution [19:22:04] J_Caselles, thanks [19:22:06] i did it that way [19:22:20] supriya, how us history output [19:22:24] show us [19:23:10] http://fpaste.org/21791/44685613/ [19:24:09] supriya, you missed the other command I typed [19:24:32] git config --global push.default matching [19:25:05] ya ok [19:25:08] i got it now [19:25:25] let us move to the last part for tonight [19:25:30] branches [19:25:39] kushal: Sorry for interrupting, Why we are doing this "git config --global push.default matching" ? [19:25:48] [19:26:00] iam_sudip, supriya 's error message has the answer [19:26:04] go read it [19:26:56] in git branches are named pointers to commits [19:27:05] default branch is master [19:27:11] $ git branch [19:27:20] ! [19:27:23] will tell you all branches in the repo [19:27:26] anurag, ask [19:27:33] directory ? [19:28:06] anurag, clonedrepo01 [19:29:23] now we can create a branch from master [19:29:39] Ritu_ is now known as dell_ [19:30:02] $ git branch newbranch [19:30:14] this will create a branch named new branch [19:30:22] and then $ git checkout newbranch [19:30:32] will go to newbranch [19:30:44] for now it is same of master [19:31:14] you can use git branch command to see in which branch you are in [19:31:32] it will show with the star [19:31:56] ! [19:32:06] rahulch, ask [19:32:17] what is newbranch pointing at now? [19:32:29] master [19:32:36] ok [19:32:41] ! [19:33:32] siddhant, ask [19:33:34] http://fpaste.org/21793/37244742/ ,i'm getting this [19:34:08] siddhant, you repo name is strange [19:34:50] kushal,yes i changed that because i made a mistakr earlier [19:35:03] *mistake [19:35:06] ! [19:35:12] siddhant, sorry but I can not help/debug your problem now [19:35:24] siddhant, try to follow the logs over the weekend [19:35:27] rahulch, ask [19:35:35] kushal,ok [19:35:46] if master is a branch, what is it pointing at? [19:35:55] rahulch, latest commit in master [19:36:10] now a small tric [19:36:15] trick [19:36:23] open the bashrc file [19:36:45] vim ~/.bashrc [19:36:54] ! [19:37:45] at the end write this http://paste.fedoraproject.org/21794/37244773/ [19:37:49] save and exit [19:37:53] elita15, ask [19:38:05] how do we come back to master branch from newbranch? [19:38:47] ! [19:38:53] elita15, wait, get some patience [19:38:56] J_Caselles, ask [19:39:09] what does this trick do? [19:39:16] J_Caselles, you will see [19:39:23] after save and exit [19:39:29] oh ok [19:40:35] then $ source ~/.bashrc [19:42:09] from now on whenever you are inside a git directory it will show you the branch name [19:42:13] magic :D [19:42:17] kushal, its working [19:42:24] say yes it id working [19:42:31] s/id/is/ [19:42:32] What kushal meant to say was: say yes it is working [19:42:33] yes [19:42:33] yes.:) [19:42:33] yes [19:42:36] kushal, cool :) [19:42:38] yes [19:42:43] yes [19:42:44] yes:) [19:42:45] yes [19:42:46] yes [19:42:47] yes [19:42:49] yes [19:42:49] yes [19:42:53] yes [19:42:54] yes [19:42:55] yes [19:42:58] Quick side note: RegExp are ugly sometimes.. [19:43:08] cool, and colorful :) [19:43:10] yes [19:43:38] dot|not, yes and do not ask me to explain that one :D [19:43:43] yes [19:43:43] yes [19:43:48] yes [19:44:18] now to go to any branch [19:44:33] command is $ git checkout branchname [19:44:45] so to go to master $ git checkout master [19:45:59] May I change the color palette? [19:47:12] J_Caselles, of course :D [19:47:53] now let us do some changes in the newbranch [19:48:07] $ (master) git checkout newbranch [19:48:40] in the names.txt add dgplug at the last in a new line [19:48:46] save and commit [19:49:26] $ (newbranch) git add names.txt [19:49:33] $ (newbranch) git commit -m "Adds dgplug to the list." [19:50:11] do a git log [19:50:36] and then go back to the master branch [19:51:28] if you do git log there [19:51:40] you will not see the change we made few minutes back [19:51:51] as it is in a different branch [19:53:04] can everyone follow me ? [19:53:10] yes/no [19:53:12] yes [19:53:13] yes [19:53:15] yes [19:53:18] yes [19:53:18] yes [19:53:19] yes [19:53:20] yes [19:53:20] yes [19:53:21] yes [19:53:21] yes [19:53:22] yes [19:53:23] yes [19:53:24] no [19:53:27] no [19:53:30] yes [19:53:30] yes [19:53:34] yes [19:53:44] yes [19:53:44] yes [19:53:48] siddhant, shantanu what is your problem ? [19:53:49] Yes. [19:53:52] i am getting the same error message [19:53:56] yes [19:54:04] yes [19:54:05] yes [19:54:16] [root@siddhant] cloned_repo01 $ (master) git checkout newbranch [19:54:16] fatal: This operation must be run in a work tree [19:54:19] siddhant, for you, you have to start cleanly from begining [19:54:27] kushal,ok [19:54:39] now branches are very important [19:54:53] in any project master is the stable branch [19:55:01] means things which are in master works [19:55:11] kushal, http://paste.fedoraproject.org/21805/ [19:55:20] people do make development work in another branch, say development [19:55:54] and for each different kind of change, they create a new branch and go; there , make changes, commit, come back to development branch [19:56:03] and then merge the other branch [19:56:19] in our case we will merge the newbranch into; master branch [19:56:34] so that we can get the changes made in newbrach into; master branch [19:56:39] to do;so [19:57:16] kushal, sorry, got it [19:57:25] shantanu, ok [19:57:54] $ (master) git merge newbranch [19:57:55] Updating 74b6979..32bff0b [19:57:55] Fast-forward [19:57:55] names.txt | 1 + [19:57:55] 1 file changed, 1 insertion(+) [19:58:31] so the generic command is $ git merge branchname [19:58:44] branchname is the branch you want merge [19:58:50] always remember [19:59:28] please do any development work in a separate git branch [19:59:31] any questions ? [20:00:01] ! [20:00:11] anurag, ask [20:00:20] I would point out the merging has to be done when on master [20:00:32] J_Caselles, yes :) [20:00:42] i need to understand more of git and branches. [20:00:58] anurag, what you want to understand ? [20:01:26] anyone else, any question? [20:01:29] yes/no [20:01:35] no [20:01:36] no [20:01:38] no [20:01:38] no [20:01:38] no [20:01:39] no [20:01:40] no [20:01:42] no [20:01:42] no [20:01:43] no [20:01:45] no [20:01:47] no [20:01:48] no [20:01:50] no [20:01:50] no [20:02:00] in this session, lot of things i didn't understood. I did what you were doing [20:02:01] btw, for reference: [20:02:01] no [20:02:09] no [20:02:15] Yes. [20:02:21] no [20:02:22] anurag, ask any friend later in the channel [20:02:25] iam_sudip, ask [20:03:13] What is fast-forward? You said you will know later. Today or another day? [20:03:26] iam_sudip, another week or month [20:03:51] Oh! It's long. :p [20:03:56] so I will upload the log now [20:03:57] Ok. Thanks. [20:04:03] pingall: ROLL CALL [20:04:09] Elijah [20:04:10] amresh kumar [20:04:11] shantanu sarkar [20:04:12] siddhant sengar [20:04:12] Pritha Ganguly [20:04:12] satarupa sinha [20:04:13] suman [20:04:14] Avinash Kumar Dasoundhi [20:04:15] anurag kumar [20:04:15] supriya saha [20:04:16] elita lobo [20:04:16] Umesh Agarwal [20:04:17] Pankhudi [20:04:19] Rahul Chowdhury [20:04:19] gitkirk [20:04:19] ravi kumbhkar [20:04:19] Josep Caselles [20:04:20] Sanjiban Bairagya [20:04:20] Iam sudip [20:04:20] manish [20:04:20] anisha agrawal [20:04:20] purva [20:04:22] Bidisha Mukherjee [20:04:23] Anwesha Das [20:04:24] christina Beemer [20:04:28] Priyanka Kotiyal [20:04:32] Devyani [20:04:36] Nilanjit Mitra [20:04:44] sudipgorai [20:05:13] kushal :please give us the link of this session. as it is so important for us. Please it is a request. [20:05:13] Terry Mackin [20:05:14] Shalini Roy [20:05:20] *: [20:05:33] dell_, yes, wait for few minutes [20:05:42] dot|not, sorry. Toilet. [20:05:45] Piotr Bednarek [20:05:52] kushal: ok [20:06:04] -------SESSION ENDS----------- [20:06:07] endclass [20:06:07] [## Class Ended at Fri Jun 28 20:06:07 2013 ##]