Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-21

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:01 amikiri joined #git
00:03 HurricaneHarry joined #git
00:03 ozmage joined #git
00:03 rwb joined #git
00:05 IRCFrEAK joined #git
00:05 Abbott I just switched to another branch that I was working on on another computer, but doing `git checkout new_code` didn't delete the files and directories from the other branch
00:05 crst joined #git
00:05 Abbott how do I switch over to the branch new_code?
00:07 nivag joined #git
00:07 fragMental Abbott: You mean there were changes on a branch with the same name on a remote?
00:08 Abbott fragMental: a remote branch was edited and I'm trying to pull that branch on this machine that was on a different branch
00:08 xaviergmail_ joined #git
00:08 Abbott but I changed branches with `git checkout new_branch` and the files from old_branch are still here
00:09 Abbott git pull says "there is not tracking information for the current branch"
00:09 kadoban Abbott: Files that aren't tracked aren't on any branch. That's probably what you're looking it.
00:09 kadoban looking at*
00:09 IRCFrEAK left #git
00:10 kadoban No idea why 'git pull' would be relevant here.
00:10 thebird joined #git
00:11 Abbott how do I get the files to copy to the working directory?
00:11 kadoban Huh?
00:11 Abbott I just want to reset my dir to what exists in the current head of new_branch
00:12 Abbott you said I'm probably looking at untracked files, so I rm'ed everything and then tried to checkout again but it didn't copy files to my working directory
00:12 fragMental Abbott: `pull` is basically `fetch` + `merge`, that might not be what you want, maybe make it a habit to use fetch instead of pull.
00:14 fragMental Abbott: As long as you didn't rm .git, you should be able to checkout the changes.
00:14 Abbott fetch downloads the latest .git folder from an online repository and merge attempts to merge the local commit with the one you just downloaded, right?
00:14 Abbott fragMental: that's what I'm trying to do, but I dont' know how to restore to the head of a branch
00:14 Abbott i rm'ed everything (except .git) and did checkout new_branch and I still have no files
00:15 fragMental Abbott: merge without any arguments attempts to merge the tracking branch of HEAD into the current HEAD.
00:16 fragMental Abbott: What does `git branch -avv` show you? Maybe you have a local branch with the same name.
00:17 miczac_ joined #git
00:18 justanotheruser joined #git
00:19 Abbott fragMental: http://dpaste.com/1D8C7A9
00:19 LordRyan left #git
00:21 Sample joined #git
00:21 Abbott okay, i did git checkout remotes/origin/new_code and now everything is in place
00:21 fragMental Abbott: The * marks the branch you have checked out, and as you can see, it is on a different commit than the remote branch with the same name.
00:22 Abbott fragMental: right, you were right, i had a local branch with the same name
00:22 Abbott now it says HEAD detached at origin/new_code, though
00:22 ispn joined #git
00:23 fragMental Abbott: You should also set up the remote branch as tracking branch for your local one, that makes pushing and merging easier.
00:23 clemf joined #git
00:23 fragMental Abbott: Remote tracking branches are what's shown in [] if you pass -vv
00:25 war_pigs joined #git
00:25 Abbott fragMental: is that git branch --set-upstream-to
00:26 fragMental Abbott: Another handy command I recommend making an alias for in your .gitconfig is `git log --oneline --decorate --graph --all` It's similar to GitHub's network view and gives you an idea of what your history looks like.
00:26 madewokherd joined #git
00:26 matoro joined #git
00:27 fragMental Abbott: Yes, or -u for short. You can also do that right when you push new branches, with `git push -u origin HEAD`, that pushes your current branch and sets up tracking.
00:27 [Brain] joined #git
00:28 fragMental Abbott: If you have a tracking branch set up, you chn just do `git push` in the future and it will know where to push (same for pull).
00:29 fragMental Also you get useful information on how far behind/aead your local branch is with `git status` that wouldn't be there when you don't have a tracking branch.
00:29 fragMental *ahead
00:30 Abbott okay that makes sense
00:30 Abbott I thought that all pulls were tracking branches
00:30 Abbott or rather that there weren't non-tracking branches
00:30 Abbott or whatever
00:33 DolpheenDream joined #git
00:34 nivag joined #git
00:35 fragMental Abbott: When you do `git checkout some-remote-branch-you-dont-have-locally-yet` it will also set up the tracking info automatically. Yes I think half the people at my office don't know either and always type out `git push origin branch-name:branch-name`, I see it a lot :P
00:35 Abbott okay, so now I did `git branch -u new_code origin/new_code` then `checkout new_code` then `git pull` and it says I'm up-to-date
00:36 Abbott BUT, `git status` right after that says that src/.gitignore and src/Tuttle_constants.txt are deleted. Why would they be deleted if these files are tracked and I just did a `git pull` and it says I'm up to date?
00:36 fragMental Abbott: I think the checkout was redundant, but it doesn't hurt.
00:37 fragMental Becaust pull preserves changes in your working dir whenever it can.
00:37 samcaldwell joined #git
00:38 fragMental Abbott: If you want to completely align your working dir with the last commit, do `git reset --hard`, but note that that will lose every untracked change.
00:39 Abbott I actually read the hint in git status that said to discard changes to do git checkout -- file and did that for both files
00:39 Abbott so now I'm completely aligned
00:39 Abbott git reset --hard will probably come in use down the line though
00:39 Oatmeal joined #git
00:40 fragMental Abbott: Also usually you put .gitignore into the project root, not subdirectories, except for special cases.
00:41 Abbott i had .gitignore files in all my directories but now that you said that I can see that that's silly and I should just have one in the root and use directories in the name lol
00:43 fragMental Abbott: reset is useful in different cases, check the man page and read about the different modes (--hard, --soft, --mixed), good to know when you need to undo mistakes.
00:45 fragMental If you're just starting though, don't bother for now, I guess the basics take a bit to get used to already :)
00:47 Abbott lol
00:48 Abbott thank you for your help fragMental
00:48 zzz joined #git
00:49 sunri5e joined #git
00:49 cliluw joined #git
00:52 explody joined #git
00:53 CussBot_ joined #git
00:59 peterbecich joined #git
01:02 DolpheenDream joined #git
01:04 Learath2 joined #git
01:04 sveinse joined #git
01:06 jimi_ joined #git
01:11 shgysk8zer0 joined #git
01:12 ecuanaso joined #git
01:14 lb joined #git
01:15 MattMaker joined #git
01:17 cqi joined #git
01:18 duderono_ joined #git
01:22 zzz joined #git
01:23 mischat joined #git
01:30 dhollinger joined #git
01:34 ngladitz joined #git
01:34 ngladitz joined #git
01:36 raynold joined #git
01:38 SpiderDisco left #git
01:38 MattMaker joined #git
01:39 thebird joined #git
01:42 roelmonnens joined #git
01:42 sharon_so_ left #git
01:43 kbs joined #git
01:44 j7k6 joined #git
01:46 menip joined #git
01:46 solenodic joined #git
01:48 atomi joined #git
01:48 gugah joined #git
01:50 Atm0spher1c joined #git
01:51 glspi joined #git
01:52 shgysk8zer0 joined #git
01:53 thebird joined #git
01:54 rchavik joined #git
01:54 johnny56_ joined #git
01:56 zzz joined #git
02:03 zzz joined #git
02:05 jameser joined #git
02:08 peterbecich joined #git
02:11 ozmage joined #git
02:16 netj joined #git
02:19 s2013 joined #git
02:21 User458764 joined #git
02:22 jccn joined #git
02:22 nivag joined #git
02:22 finalbeta joined #git
02:22 Vampire0_ joined #git
02:25 mischat joined #git
02:26 d1z joined #git
02:26 causasui joined #git
02:26 causasui joined #git
02:27 MattMaker joined #git
02:29 skered joined #git
02:30 watabou joined #git
02:32 Doc-Saintly joined #git
02:32 clickjack joined #git
02:33 Doc-Saintly I had a branch where two commits were not ready to release, so I split them into their own branches and then rolled back the commits on the main development branch
02:33 Doc-Saintly Now when I try to merge the separate branches back in, it never picks up the changes.
02:33 Doc-Saintly Is it assuming that the main branch doesn't want the changes because it rolled them back already?
02:34 Emperor_Earth joined #git
02:37 cdg joined #git
02:38 ResidentBiscuit joined #git
02:38 clickjack joined #git
02:38 matoro joined #git
02:38 CountryNerd joined #git
02:46 mizu_no_oto joined #git
02:46 Doc-Saintly well, i took the approach of merging the branch (without commit) in order to clean things up, and also cherry-picking the commit that was reverted. This makes a single commit that appears to make the changes from the branch.
02:46 fuzy joined #git
02:47 d^sh joined #git
02:47 dreiss joined #git
02:47 SwiftMatt joined #git
02:48 Guest7076 left #git
02:49 kbs joined #git
02:49 Rodya_ joined #git
02:52 Rodya__ joined #git
02:52 kbs joined #git
02:55 ShapeShifter499 joined #git
02:55 mtp00 joined #git
02:55 peterbecich joined #git
02:56 bumpy joined #git
02:59 ramsub07 joined #git
03:00 dermoth joined #git
03:01 explody joined #git
03:02 chichou joined #git
03:02 ljc joined #git
03:02 pks joined #git
03:02 ash_workz joined #git
03:03 ojdo joined #git
03:04 clemf joined #git
03:07 blunaxela joined #git
03:08 nimbleark joined #git
03:11 hexagoxel_ joined #git
03:11 s2013 joined #git
03:12 fstd_ joined #git
03:13 aavrug joined #git
03:13 puff Good afternoon.
03:14 puff Evening, actually.
03:14 brent__ joined #git
03:14 hhee2 joined #git
03:16 puff Question, when it comes to git and eclipse and egit, I see different answers on whether or not .classpath should be added/committed to git.  People seem okay with adding .project, but for .classpath I see it going both ways.  Is there a definitive answer?
03:17 Vortex34 joined #git
03:20 chachasmooth joined #git
03:21 Oatmeal joined #git
03:22 CEnnis91 joined #git
03:25 mischat joined #git
03:27 ahr3n joined #git
03:30 rivarun joined #git
03:31 jimi_ joined #git
03:31 larry619 joined #git
03:32 hhee2 joined #git
03:39 aspiers joined #git
03:39 clickjack joined #git
03:44 fahadash joined #git
03:45 j7k6 joined #git
03:45 johnny56_ joined #git
03:48 cqi joined #git
03:50 clickjack joined #git
03:52 svm_invictvs joined #git
03:53 sunri5e joined #git
03:54 ResidentBiscuit joined #git
03:55 patarr joined #git
03:56 solenodic joined #git
04:00 cbreak joined #git
04:01 Virox joined #git
04:01 raspado joined #git
04:05 xall joined #git
04:06 Goplat joined #git
04:08 Virox joined #git
04:08 CustosLimen joined #git
04:11 lektrik joined #git
04:15 solenodic joined #git
04:17 a_thakur joined #git
04:18 ResidentBiscuit joined #git
04:19 pur3eval joined #git
04:21 duderonomy joined #git
04:24 pks joined #git
04:26 mischat joined #git
04:37 wilornel On remote, I did `git checkout master; git merge branch_a; git push origin master;` . Now, the branch_a is merged into master. If I go in another (stale) clone of the repo, and pull master, everything is fine. However, when I checkout branch_a and do `git pull origin branch_a` , it creates a new merge commit
04:38 ecuanaso joined #git
04:38 wilornel I feel like I did things out of order. Should I have done `git checkout branch_a; git pull origin branch_a;` first?
04:40 Virox joined #git
04:43 Sample joined #git
04:44 cqi joined #git
04:44 s2013 joined #git
04:44 chipotle joined #git
04:45 CustosLimen joined #git
04:47 ayogi joined #git
04:49 ramsub07 joined #git
04:50 nevodka joined #git
04:50 lu_zero joined #git
04:50 lu_zero joined #git
04:50 orzo joined #git
04:53 ffilozov wilornel, What are you trying to do?
04:53 acln joined #git
04:56 aw1 joined #git
04:56 ramsub07 joined #git
04:57 Cabanoss- joined #git
04:58 mtp00 left #git
04:58 robotroll joined #git
04:59 wilornel I wanted to merge branch_a into master
04:59 wilornel but master and branch_a reside in many locations
04:59 dsdeiz joined #git
04:59 dsdeiz joined #git
04:59 wilornel I did so in one location, and wanted the same change to happen in another place
05:00 ffilozov git checkout master; git merge branch_a.
05:00 ffilozov This moves master forward, not branch_a.
05:02 wilornel I see. I'm confused because the graph representation shows how branch_a merges into master. It looks like branch_a is affected (that it ends there)
05:02 wilornel but as I now recall, branches are just labels
05:02 ffilozov Right, you'll see branch_a merged into master, but the branch_a won't be on the merge commit.
05:02 wilornel yes
05:02 ffilozov branch_a label*
05:02 wilornel alright, I get this part
05:03 wilornel now, when I was pulling, it was just getting the latest data from branch_a and thus doing a merge to get it
05:03 wilornel alright, thank you ffilozov!
05:03 war_pigs joined #git
05:03 ffilozov When you pulled, it updated master. branch_a did not change.
05:04 mehola joined #git
05:04 mehola joined #git
05:04 thebird joined #git
05:16 s2013 joined #git
05:19 sim590 joined #git
05:21 kaldoran joined #git
05:28 mischat joined #git
05:28 neeri joined #git
05:30 rchavik joined #git
05:33 hahuang65 joined #git
05:34 variable joined #git
05:36 navidr joined #git
05:36 inflames joined #git
05:45 j7k6 joined #git
05:54 govg joined #git
05:55 ayogi joined #git
05:55 shgysk8zer0_ joined #git
06:01 dec0n joined #git
06:06 rscata joined #git
06:07 xaviergmail_ joined #git
06:12 marianina8 joined #git
06:13 ljc joined #git
06:14 a_thakur joined #git
06:14 pks joined #git
06:15 marianina8 joined #git
06:16 jas4711 joined #git
06:18 nickenchuggets joined #git
06:24 dreiss joined #git
06:29 mischat joined #git
06:29 dmc joined #git
06:33 sunrunner20__ joined #git
06:33 zeroed joined #git
06:37 zulutango joined #git
06:40 acetakwas joined #git
06:40 Introoter joined #git
06:40 sarri joined #git
06:40 sarri joined #git
06:40 xall joined #git
06:45 zeroed joined #git
06:48 CAPRA-MAU joined #git
06:48 d0nn1e joined #git
06:48 CAPRA-MAU left #git
06:51 qt-x joined #git
06:52 jimklo joined #git
06:52 checkItOut joined #git
06:54 ThomasLocke joined #git
06:54 SwiftMatt joined #git
06:56 marianina8 joined #git
06:56 pur3eval joined #git
06:56 a_thakur joined #git
06:59 Raging_Hog joined #git
07:00 j7k6 joined #git
07:03 Random832 joined #git
07:09 Wulf joined #git
07:16 kurdzman joined #git
07:21 solenodic joined #git
07:21 s2013 joined #git
07:22 chele joined #git
07:24 thebird joined #git
07:24 roelmonnens joined #git
07:25 roelmonnens joined #git
07:29 Learath2 joined #git
07:29 mischat joined #git
07:30 thierryp joined #git
07:33 lb1c joined #git
07:34 JeroenT joined #git
07:34 a_thakur joined #git
07:36 Macaveli joined #git
07:37 drodger joined #git
07:38 Tobbi joined #git
07:38 jfr joined #git
07:40 ashokrajar joined #git
07:41 roelmonn_ joined #git
07:41 jnavila joined #git
07:42 ashokrajar joined #git
07:43 masuberu joined #git
07:43 johnny56_ joined #git
07:46 HElephant joined #git
07:46 ToxicFrog joined #git
07:51 Alienpruts joined #git
07:51 thebird joined #git
07:52 elect joined #git
07:54 User458764 joined #git
07:59 Tobbi joined #git
08:00 s2013 joined #git
08:02 theoceaniscool joined #git
08:04 ashokrajar joined #git
08:06 weep left #git
08:06 elect joined #git
08:09 Andrew_K joined #git
08:10 xanadu joined #git
08:11 TomyWork joined #git
08:16 MattMaker joined #git
08:18 zefferno joined #git
08:22 Andrew_K joined #git
08:24 djb-irc joined #git
08:25 F0rTh3J3st_ joined #git
08:26 mischat joined #git
08:27 solenodic joined #git
08:31 sarbs joined #git
08:31 johnny56_ joined #git
08:31 djb-irc joined #git
08:34 RahulAN joined #git
08:34 RahulAN Hi All
08:34 RahulAN I am trying to get the function name which are changed and which are newly added , How can i di it
08:34 RahulAN *do
08:35 RahulAN I tried git diff -W a.c b.c   but no success
08:35 RahulAN any idea about it ?
08:35 a_thakur joined #git
08:36 ixpict joined #git
08:42 UniFreak joined #git
08:42 rscata joined #git
08:42 servicion-- joined #git
08:43 Dumblez0r joined #git
08:43 Tobbi joined #git
08:43 mehola joined #git
08:44 miczac joined #git
08:47 j7k6_ joined #git
08:49 garethdaine joined #git
08:51 Ldip joined #git
08:53 Tobbi joined #git
08:53 ashokrajar joined #git
08:55 JeroenT joined #git
08:57 metalraiden34 joined #git
08:57 diogenese joined #git
08:58 ph88 joined #git
08:59 ph88 is that right that git 1.8.3.1 shows no color in diff ?
09:01 Balliad joined #git
09:01 mizu_no_oto joined #git
09:02 mikecmpbll joined #git
09:03 leeN joined #git
09:03 Tobbi joined #git
09:03 TomyWork joined #git
09:04 JeroenT joined #git
09:04 kurkale6ka joined #git
09:06 JeroenT joined #git
09:07 JeroenT joined #git
09:07 Snugglebash joined #git
09:09 BooK joined #git
09:09 Murii joined #git
09:09 ph88 damn i'm not getting color in my git diff :(
09:09 ph88 i also tried so-fancy-diff but that didn't help
09:09 osse ph88: ''git config color.ui auto''
09:09 osse then try again
09:10 bongjovi joined #git
09:11 zulutango joined #git
09:11 ph88 yey :D
09:11 ph88 can i set that color for default new projects ?
09:11 marcogmonteiro joined #git
09:12 osse git config --global color.ui auto
09:17 zulutango joined #git
09:17 ph88 oh thank you :)
09:19 Kartagis joined #git
09:19 Kartagis ehlo
09:19 grawity -ERR Not a SMTP server
09:20 Kartagis could you remind me, what's the command to see the difference between local and remote?
09:20 MattMaker joined #git
09:20 Kartagis git log something
09:20 osse master..origin/master (for example)
09:20 osse or origin/master..master
09:20 osse depends on what you mean exactly
09:20 MattMaker joined #git
09:21 Kartagis osse: how many commits I'm behind/ahead of remote
09:21 osse in that case, both of my answers
09:21 MattMaker joined #git
09:21 osse in that order
09:22 clmsy joined #git
09:23 notebox joined #git
09:25 Kartagis with git log?
09:25 osse yes
09:25 osse or rev-list
09:25 osse or rev-list --count
09:26 osse do you want see the commits or just get the numbers?
09:26 nd joined #git
09:26 Kartagis both
09:26 osse then both my answers again :p
09:26 nettoweb joined #git
09:26 redeemed joined #git
09:26 Forlorn joined #git
09:27 Kartagis nothing comes up
09:27 osse !repro
09:27 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
09:27 Kartagis it means I've already pull'd
09:27 Kartagis ?
09:27 osse could be
09:27 ixpict joined #git
09:27 danslo joined #git
09:27 Kartagis oh, I looked at the file and yes I did
09:28 osse maybe you're ahead instead of behind
09:30 ashokrajar joined #git
09:31 Tobbi joined #git
09:37 ferr1 joined #git
09:37 suttonwilliamd__ joined #git
09:39 thebird joined #git
09:40 a_thakur joined #git
09:42 seni joined #git
09:44 seni1 joined #git
09:45 Tobbi joined #git
09:46 mischat joined #git
09:50 xall joined #git
09:52 pijiu joined #git
09:54 crst_ joined #git
09:56 ahr3n joined #git
09:57 crst_ Hi, I tried to make changes from a github repo into my branch and pull updates from master. It didn't work, then I deleted my branch... there's more, it would take long to explain. How can make the repo as clean as after a fresh git clone?
10:01 Squarism If you are going to "compare" spreadsheet data - is there some software that is better than what libre office has to offer? One added row just messes up all comparrison
10:04 achadwick joined #git
10:06 danslo joined #git
10:09 ashokrajar joined #git
10:10 balu_23 joined #git
10:12 ruxu joined #git
10:13 balu_23 left #git
10:16 s1scha joined #git
10:17 a_thakur joined #git
10:21 t0by joined #git
10:21 t0by joined #git
10:22 a_thakur joined #git
10:23 MattMaker joined #git
10:24 xaviergmail_ joined #git
10:24 astrofog joined #git
10:25 JeroenT joined #git
10:26 dwmw2_gone joined #git
10:26 clickjack joined #git
10:27 chll_ joined #git
10:31 mischat_ joined #git
10:32 Andrew_K joined #git
10:33 JeroenT joined #git
10:35 atomi joined #git
10:36 dwmw2_gone joined #git
10:36 Tobbi joined #git
10:38 mentazoom joined #git
10:40 nedzadhrnjica joined #git
10:41 ashokrajar joined #git
10:41 JeroenT joined #git
10:42 ashokraj_ joined #git
10:45 borkr joined #git
10:45 mehola joined #git
10:45 manuelschneid3r joined #git
10:45 tvw joined #git
10:49 acidjnk22 joined #git
10:49 modin joined #git
10:49 User458764 joined #git
10:51 JeroenT joined #git
10:54 Tobbi joined #git
10:55 Gustavo6046 joined #git
10:56 Anticom joined #git
10:57 Andrew_K joined #git
10:58 JeroenT joined #git
10:58 theoceaniscool joined #git
11:00 kexmex joined #git
11:04 rnsanchez joined #git
11:06 ashokrajar joined #git
11:07 theoceaniscool joined #git
11:08 irqq_ joined #git
11:08 sostenuto joined #git
11:10 zeroed joined #git
11:10 zeroed joined #git
11:11 CountryNerd_ joined #git
11:12 pbrewczynski joined #git
11:12 tokkee joined #git
11:15 spac3h joined #git
11:15 Masber_080 joined #git
11:16 bremner git is okish at comparing csv data
11:16 bremner you need to turn out --colour-words to get sensible output for changes within a row
11:19 mahakal joined #git
11:21 ronskisika joined #git
11:22 amikiri joined #git
11:22 waveclaw joined #git
11:23 dimi1947 joined #git
11:23 MattMaker joined #git
11:25 YuGiOhJCJ joined #git
11:26 Raging_Hog joined #git
11:30 nettoweb1 joined #git
11:39 Snugglebash joined #git
11:40 ozmage joined #git
11:41 nevodka joined #git
11:46 paws_ joined #git
11:47 Ratler joined #git
11:49 adamru joined #git
11:50 chipotle joined #git
11:51 d1z joined #git
11:56 jerv joined #git
11:56 jerv how can I get the latest commit of the entire repo?
11:56 metalraiden34 joined #git
11:57 xaim joined #git
11:58 jerv git log --all --date-order -n1 ?
11:58 Seveas depends on your definition of latest.
11:59 jerv Seveas: I want to find out from the server. So basically the last commit that was pushed to it.
11:59 osse jerv: fetch then you can run your command
11:59 metalraiden34 joined #git
11:59 Seveas check the reflogs of all branches, compare the timestamps of their latest entries
12:00 Seveas osse: no good. Branch could be pushed months after creating the last commit on it :)
12:00 jerv Seveas: what's wrong with git log --all --date-order -n1?
12:02 JeroenT_ joined #git
12:02 roelmonnens joined #git
12:02 Seveas because that's not necessarily the latest commit pushed, see my previous comment.
12:05 jerv Seveas: doesn't --date-order use committer date which is set when the commit is pushed?
12:06 jerv I might be throwing author and committer date around
12:06 jerv There's also --author-date-order
12:07 courrier joined #git
12:07 mischat joined #git
12:08 crst joined #git
12:09 mikecmpbll joined #git
12:09 ixpict joined #git
12:10 nettoweb joined #git
12:11 amikiri joined #git
12:15 osse Seveas: Oh right
12:15 KnightsOfNi joined #git
12:17 sagerdearia joined #git
12:21 Sample joined #git
12:22 venmx joined #git
12:23 thebird joined #git
12:24 MattMaker joined #git
12:24 rorro joined #git
12:29 solenodic joined #git
12:31 sarbs joined #git
12:31 hhee joined #git
12:32 m4sk1n joined #git
12:33 a_thakur joined #git
12:33 UniFreak joined #git
12:36 khfeng joined #git
12:37 test3 joined #git
12:39 test3 left #git
12:41 Seveas I did once greatly confuse some colleagues by cherry-picking 6 months old commits on top of the main branch of a repo that sees hundreds of commits per day and rolling out the result. Many people thought someone did a 6-month rollback :)
12:42 Kartagis heh
12:42 Kartagis and nothing broke?
12:43 rorro joined #git
12:44 mischat_ joined #git
12:44 oskarkv joined #git
12:45 shinnya joined #git
12:46 Seveas no, why would it?
12:48 jast if would if someone started trying to "fix" it
12:50 JeroenT joined #git
12:53 j7k6_ joined #git
12:55 Bodger joined #git
12:56 EV3RYDAYPR0GRESS joined #git
12:58 jerv Seveas: I see what you're saying now. I thought the committer date might be overwritten on push. With the reflog approach, could I just check the last entry in git reflog --all? Or is the last entry not necessarily the last entry because it's sorted by reference?
12:58 DolpheenDream joined #git
12:58 User458764 joined #git
13:00 jast I believe the entries are ordered chronologically... but I can't check because in my repo the output gets all messed up near the end
13:01 jast actually never mind, I was thinking in the wrong order. the most recent end of the reflog is fine, and ordered chronologically
13:02 jerv hm but it doesn't look like you can show timestamps with `git reflog`. I'll have to stat the actual files.
13:03 JeroenT joined #git
13:04 jast jerv: git log -g --all shows the same information but in normal log format
13:04 treia joined #git
13:04 HElephant joined #git
13:05 thebird joined #git
13:06 synthroid joined #git
13:07 JeroenT joined #git
13:07 a_thakur joined #git
13:08 gfixler joined #git
13:08 mischat joined #git
13:09 mda1 joined #git
13:09 tureba joined #git
13:12 Darcidride joined #git
13:13 blackwind_123 joined #git
13:13 KnightsOfNi joined #git
13:14 jameser joined #git
13:15 suttonwilliamd joined #git
13:16 masuberu joined #git
13:22 Raging_Hog joined #git
13:24 DolpheenDream joined #git
13:25 MattMaker joined #git
13:28 jeffreylevesque joined #git
13:28 _ng joined #git
13:28 jerv jast: I guess the problem is log shows me only commit date info. Not push date info. I am interested in the latter, which can be achieved by checking when the reflogs were updated.
13:31 _ikke_ Because git does not store this information
13:34 feodaron joined #git
13:34 Raging_Hog joined #git
13:34 srandon1213 joined #git
13:34 srandon1213 hello all i have doubts on how  imanage conflicts...
13:35 srandon1213 when i have to resolve conflicts i edit directly the file with the lines "<<<<<<<<<<<<<<<<<HEAD" and so on... is this the correct way to solve conflicts ?
13:35 osse srandon1213: Yes
13:35 osse !eek
13:35 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
13:36 perlpilot joined #git
13:37 jast jerv: so, you're looking at reflogs on the server? the timestamps are recorded in the reflog files, I'm not seeing a straightforward way to read them via git tools. the reflog format is fairly easy to parse, though.
13:38 explody joined #git
13:38 jerv jast: yeah I've restored to stating .git/logs/refs/heads/*
13:38 dendazen joined #git
13:38 acidjnk joined #git
13:38 jast jerv: actually if you look at a single branch this will show the reflog timestamps in the output: git log -g branch@{now}
13:38 jast it's a little obscure for parsing, though
13:41 Brando753-o_O_o joined #git
13:41 Bodger left #git
13:42 jerv it looks like some of my old repos do not have .git/logs. Does the gc clear it by any chance when it packs refs?
13:43 Snugglebash joined #git
13:43 peacememories joined #git
13:45 JeroenT joined #git
13:46 ismithers joined #git
13:50 courrier joined #git
13:50 peacememories joined #git
13:51 seni1 joined #git
13:52 publio joined #git
13:54 seni13 joined #git
13:54 netj joined #git
13:56 dsdeiz joined #git
13:56 dsdeiz joined #git
13:57 Derperperd joined #git
14:01 paissad joined #git
14:01 mischat_ joined #git
14:03 mischat_ joined #git
14:03 JeroenT joined #git
14:03 paissad hello guys, i would like to create a git repository where users who would have to access it have to be declared into a specific LDAP domain
14:04 paissad how can i configure the LDAP authentication ?
14:04 tobiasvl paissad: that's not really a git question
14:04 paissad from the httpd server in front ? or is it possible to do it with git ?
14:04 tobiasvl paissad: you can use something like gitolite with LDAP
14:05 tobiasvl paissad: sure, you can set up httpd/apache/whatever to handle authentication over LDAP
14:05 raspado joined #git
14:06 JeroenT joined #git
14:07 marcogmonteiro joined #git
14:07 jast gitolite can be set up to work with an HTTP server. I wouldn't recommend doing it without a fair bit of experience of setting up your web server of choice, though, and being good at reading docs. gitolite deliberately isn't advertising HTTP support too strongly.
14:08 a_thakur joined #git
14:08 jast if you prefer having other people do most of the work for you... gitlab supports LDAP authentication (in the open source edition, too)
14:09 Tobbi joined #git
14:10 theoceaniscool joined #git
14:10 paissad jast: let's suppose i install gitlab, will i be able to create git repositories from its UI ? ... the same as i would be able to do with github ?
14:11 treehug88 joined #git
14:11 paissad after, would i be able to set the authentication for a specific repo ? ... using LDAP auth for example ?
14:11 xissburg joined #git
14:11 Achylles joined #git
14:11 s2013 joined #git
14:12 tobiasvl what does that last question mean? are you conflating authentication with authorization?
14:12 tobiasvl yes, you can create git repositories from gitlab's UI. also: #gitlab
14:13 paissad no, authentication  only for the moment ... and i hope authorization as well :D
14:13 tobiasvl authentication for a specific repo doesn't really make sense though
14:14 tobiasvl you authenticate to log into gitlab/gitolite/whatever. then you're logged in
14:14 ckruczek joined #git
14:14 jast paissad: it's basically all handled exactly like in github. you can login using your LDAP account, and choose which accounts have access to which repos (and how much)
14:15 jast gitlab allows creating repositories via the web interface, too, unlike gitolite for example (which is for people who don't need that much GUI :))
14:15 paissad jast: ok thanks, i just joined #gitlab, and i will google too to know if it should fit my needs :)
14:15 paissad thanks to you all
14:15 jast gitlab is a one-stop solution that contains pretty much everything
14:15 ckruczek currently my company is planing to switch from svn to git(i am so glad) and I was assigned to find a process similar to our current process, which means we have alot of svn externals we somehow need to integrate in our new git repo. any experiences how to do it *WITHOUT* submodules in a acceptable way?
14:15 jast it's a beast but it works :)
14:16 jast ckruczek: !subpro
14:16 gitinfo ckruczek: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
14:16 KnightsOfNi joined #git
14:16 jast trade-offs, trade-offs everywhere
14:17 ckruczek yes subtree is a option, but i don't like the fact that the extneral projects influence my main history
14:17 tobiasvl ckruczek: what are your needs?
14:17 bsanford joined #git
14:17 ckruczek adding them to the main .gitignore is interesting fact. what are the trade-offs for this?
14:17 cdown joined #git
14:17 jeffreylevesque joined #git
14:17 ckruczek tobiasvl: basically i want to achieve almost the same as with submodules. i want to share keep them in my main repo, but have different histories
14:18 ckruczek ahh not with submodules. I meant, the same like with svn-externals
14:18 ckruczek my fault
14:19 tobiasvl why not submodules then
14:19 tobiasvl oh ok. not familiar with svn
14:19 tobiasvl but still: why not submodules exactly?
14:19 aspiers joined #git
14:19 jimi_ joined #git
14:20 ckruczek the submodules trade-offs are too heavy for me. i don't like adding more complexity and more new commands because all active developers are overchallenged enough with the migration from svn to git
14:20 ckruczek they all don't know about git, so i want to have the setup as clean and easy as possible
14:20 ckruczek so we can concentrate on the main facts of git.
14:21 ckruczek and as far as i know, submodules will polute my main-history also, and i don't want this.
14:21 ph88 left #git
14:21 synthroi_ joined #git
14:22 ckruczek adding them into the main project and updating the gitignore is nice, because I can handle them like 'external repos' and have seperated histories because of different remotes...
14:22 CEnnis91 joined #git
14:22 cdg joined #git
14:22 ckruczek atm I don't see a tradeoff for this use-case, any other opinions?
14:22 cdg joined #git
14:23 tobiasvl well, everyone will need to clone the separate repos separately
14:23 ckruczek yes, but this is only a initial trade-off/overhead
14:23 qqx You also get absolutely no tracking of what versions are meant to work together.
14:23 Sample joined #git
14:23 kpease_ joined #git
14:23 ckruczek qqx: thx for this fact, ill note it down as well.
14:24 qqx And no notice of when other repos are out of sync with what is expected.
14:24 tobiasvl I'm not completely clear on what "tradeoffs" you're considering here. submodules aren't perfect, but they only "pollute" your history in that you get a commit whenever you update the "revision" (to speak SVN) it should point to. I'd assume the same was true for svn-externals
14:24 ckruczek qqx: uhi, i totally forgot that fact...good hint.
14:25 tobiasvl just a quick reading of svn-externals docs make it seem like submodules are the closest thing, really
14:25 ckruczek yes submodules are totally a analogy to svn-externals.
14:25 tobiasvl but like I said I don't know SVN, I'm just not clear on what criteria you have for a solution here
14:25 tobiasvl yeah ok
14:25 LBV_User joined #git
14:25 qqx tobiasvl: That isn't necessarily true with svn externals. They can be set to track a branch rather than a specific revision.
14:26 MattMaker joined #git
14:26 tobiasvl qqx: ah, ok. I was just going off this part in the docs: "An externals definition is a mapping of a local directory to the URL—and ideally a particular revision—of a versioned directory"
14:26 qqx I think the key word there is "ideally".
14:27 diphtherial joined #git
14:27 tobiasvl yeah, maybe so!
14:27 Derperperd joined #git
14:28 King_Hual joined #git
14:28 jameser joined #git
14:28 ShekharReddy joined #git
14:28 tobiasvl anyway, if one main caveat of adding submodules into the mix is added complexity and new commands, I didn't see how the same wasn't always true for svn-externals. seems about the same level of complexity. but tracking a branch in svn is of course a bit less complex than the case of submodules
14:30 kpease joined #git
14:30 navidr joined #git
14:31 ckruczek one sec...
14:32 peterppp joined #git
14:33 Tobbi joined #git
14:33 xissburg_ joined #git
14:34 peterppp Hi, how can I add a specific commit of a another repository as a submodule?
14:34 diphtherial left #git
14:34 dviola joined #git
14:35 inflames joined #git
14:35 peterppp somehow I can't seem to figure this out
14:36 JeroenT joined #git
14:36 texinwien_ joined #git
14:37 metalraiden34 joined #git
14:37 epic__ left #git
14:37 j7k6_ joined #git
14:37 tobiasvl peterppp: just go into the submodule directory, checkout the commit you want, then go back out and commit it
14:37 jast peterppp: checkout the commit inside the submodule, go back up, 'git add path/to/submodule', commit
14:37 griffindy joined #git
14:37 peterppp thanks
14:38 peterppp that kind of sounds too obvious
14:38 Learath2 is it okay to base a feature branch on someone elses yet unmerged feature branch?
14:38 venmx joined #git
14:38 Rodya_ joined #git
14:39 qqx Learath2: That depends on the state of the feature branch. You should talk to the person who owns it to determine if they'll be rebasing it.
14:39 qqx If they aren't planning to do that, it's probably OK.
14:39 chipotle_ joined #git
14:40 Learath2 qqx: it will be rebased before they merge it, so would mine be, would it complicate the rebase?
14:40 Anticom joined #git
14:40 qqx Learath2: Yes, if the branch you want to base work off of is going to be rebased, that will complicate things for your work.
14:40 Learath2 hmm we should stop merging fastforward this much....
14:41 JeroenT joined #git
14:42 qqx If it's just going to be a straight rebase, without any other modifications it still might not be too bad. Although you may need to specify the branch point when rebasing your work.
14:43 qqx But if that's something that is happening regularly, I'd suggest changing the workflow.
14:43 AaronMT joined #git
14:43 jameser joined #git
14:43 GodGinrai joined #git
14:44 Learath2 yeah ill propose some changes, thx qqx
14:44 JeroenT joined #git
14:47 j7k6_ joined #git
14:48 treehug88 joined #git
14:51 ash_workz joined #git
14:52 geoid_ joined #git
14:53 Es0teric joined #git
14:53 nickabbey joined #git
14:53 User458764 joined #git
14:53 bannakaffalatta joined #git
14:54 GingerGeek joined #git
14:54 GingerGeek joined #git
14:57 Hozy joined #git
14:58 explody joined #git
15:00 troulouliou_div2 joined #git
15:00 YuGiOhJCJ joined #git
15:01 Dougie187 joined #git
15:01 gfgaki joined #git
15:02 solenodic joined #git
15:02 marcogmonteiro joined #git
15:03 rwb joined #git
15:03 gugah joined #git
15:03 j7k6 joined #git
15:03 mischat joined #git
15:04 Pursuit joined #git
15:05 marianina8 joined #git
15:07 suttonwilliamd joined #git
15:08 bsanford joined #git
15:09 brendyn joined #git
15:10 kini joined #git
15:10 pijiu joined #git
15:11 publio joined #git
15:11 borkr joined #git
15:11 pijiu joined #git
15:12 Tobbi joined #git
15:12 LeBlaaanc joined #git
15:12 markelite joined #git
15:12 pijiu joined #git
15:15 war_pigs joined #git
15:17 kekumaruchan joined #git
15:17 ayogi joined #git
15:17 clmsy joined #git
15:17 dave0x6d joined #git
15:19 User458764 joined #git
15:20 Electrometro joined #git
15:21 thebird joined #git
15:21 borkr joined #git
15:21 clemf joined #git
15:23 byte512 joined #git
15:26 borkr joined #git
15:26 MattMaker joined #git
15:28 cdown joined #git
15:29 p4trix joined #git
15:30 dgonzo joined #git
15:30 Andrew_K joined #git
15:33 Guest9696 joined #git
15:34 hasc joined #git
15:34 mischat joined #git
15:34 jstimm joined #git
15:35 mischat joined #git
15:38 jnavila_ joined #git
15:39 xissburg joined #git
15:41 eroux joined #git
15:41 Es0teric joined #git
15:42 farblue joined #git
15:43 farblue Hi all :) Trying to use git-svn and it's bombing out on an SVN tag called "${branchName}-11278". The --ignore-paths parameter doesn't seem to work. Can someone point me towards people that might be able to help?
15:44 Derperperd joined #git
15:44 marcogmonteiro joined #git
15:45 boombatower joined #git
15:45 roxlu hey, I've used a submodule in a project (was a while that I did that)... and made some changes to the sub module source. I want to commit them but my submodule is detached from head. I thought to fix it by doing a checkout of master, but then I get the message "Warning: you are leaving 1 commit behind, not connected to any of your branches". Before I continue I wanted to ask if someone knows how I can make
15:45 roxlu sure my changes are merged and pushed with the master branch of the submodule?
15:46 boombatower joined #git
15:46 mischat_ joined #git
15:46 jast 1) write down the commit ID (if you don't have it, it's the output of 'git rev-parse HEAD@{1}' right now). 2) update the branch. 3) git cherry-pick <commit ID>
15:46 durham joined #git
15:46 jast @roxlu
15:47 roxlu thanks jast, what do you mean with (2) ?
15:47 mischat_ joined #git
15:47 jast if necessary, pull so you get an up-to-date version of the submodule's master branch
15:47 roxlu ah ok, I did have an up-to-date version
15:47 jast generally submodules track a specific commit, so after doing all this you may want to tell the main repo to pin that new commit (git add path/to/submodule and then commit)
15:48 roxlu So I guess I only have to cherry pick
15:48 jast yep
15:48 jast you can merge instead of cherry-picking in this specific case
15:48 roxlu ah ok, thanks this worked
15:48 jast *presumably*, if master hasn't changed in the meantime
15:48 jast great
15:50 roxlu jast: will main repository (that has this repos as a submodule) be automtically pointing to the latest commit (the one I just did) ?
15:50 jast farblue: the git mailing list might be able to help
15:50 jast !list
15:50 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
15:50 farblue thanks jast :)
15:50 overlord_tm joined #git
15:51 narendraj9 joined #git
15:51 GodGinrai joined #git
15:52 synthroid joined #git
15:52 jast roxlu: it depends on the submodule definition. the normal case is that you need to update the reference (the way I described). it's possible to have a submodule that automatically tracks a branch (this is the case if .gitmodules has a 'branch' line for the submodule)
15:52 roxlu Ah ok, thanks
15:55 aspiers joined #git
15:55 ecuanaso joined #git
15:57 lektrik joined #git
15:57 VA3VNA joined #git
15:59 Tobbi joined #git
15:59 LosPup joined #git
16:02 Gustavo6046_ joined #git
16:02 neilthereildeil joined #git
16:03 neilthereildeil i just pulled to my local git repo and refs/head/master is not updated. only HEAD points to newest commit. how can i fix this?
16:03 ToBeCloud joined #git
16:04 roelmonnens joined #git
16:05 Caelum joined #git
16:05 canton7 neilthereildeil, what exactly did you type?
16:05 canton7 and which branch was checked out at the time?
16:05 neilthereildeil git pull ssh:<REMOTE_IP>
16:06 KnightsOfNi joined #git
16:06 cjbrambo joined #git
16:06 neilthereildeil i dont think i had master checked out. i was detached on master branch cuz i checked out an older commit
16:07 clickjack joined #git
16:07 User458764 joined #git
16:07 canton7 neilthereildeil, right, so 'git pull' only affects the currently-checked-out branch
16:07 Jackneill joined #git
16:07 dreiss joined #git
16:08 canton7 btw, you're aware that pulling directly from a url is a very rare operation? Do you know how remotes, and remote-tracking branches, work?
16:08 armyriad joined #git
16:09 qqx joined #git
16:10 qqx joined #git
16:11 nickabbey joined #git
16:11 puff Good morning.
16:11 dviola joined #git
16:12 akkad joined #git
16:12 jnavila_ joined #git
16:12 p4trick joined #git
16:15 jimklo joined #git
16:15 jagob joined #git
16:16 Snugglebash joined #git
16:16 clemf joined #git
16:19 nowhereman joined #git
16:19 tvw joined #git
16:21 marcogmonteiro joined #git
16:21 neilthereildeil canton7: so checking out an old commit in master doesnt count master as the "checked out" branch?
16:22 canton7 neilthereildeil, you said that refs/heads/master is not updated. If you don't have master checked out, then no, git pull won't update it
16:23 qqx neilthereildeil: To count as having a branch checked out you need to explicitly check out the branch, not some commit that it contains.
16:23 jantje I have a 'git-co' shell script in my $PATH. When I run 'git co' it correctly calls the script and passes all the parameters. But option before the 'co' are lost, ie, git --git-dir $path co $ops , there '--git-dir $path' is 'lost', and so I'm having difficulties executing other git commands.
16:23 GodGinrai neilthereildeil: git pull only updates a branch if your HEAD points to a branch pointer
16:23 qqx There can be many branches that contain any given commit.
16:24 dsdeiz joined #git
16:24 dsdeiz joined #git
16:24 Sample joined #git
16:25 ij joined #git
16:25 nettoweb joined #git
16:25 svm_invictvs joined #git
16:25 mischat joined #git
16:25 xaviergmail_ joined #git
16:26 Raging_Hog joined #git
16:26 nickabbey joined #git
16:26 OverCoder joined #git
16:28 Murr joined #git
16:28 ij If HEAD is a ref, reset changes ref, checkout changes HEAD. That seems so odd.
16:28 MattMaker joined #git
16:29 garethdaine joined #git
16:30 Achylles joined #git
16:30 albel727 joined #git
16:31 osse ij: HEAD is a symbolic ref. Think of it as a symlink to another ref.
16:31 osse In fact it used to be
16:31 osse 2
16:32 shgysk8zer0_ joined #git
16:33 MojoJojo joined #git
16:34 bannakaf_ joined #git
16:34 MojoJojo Good morning fellas, I'm new to git! Playing with branches currently.
16:34 dersand joined #git
16:34 kexmex joined #git
16:35 ij osse, I think I know what HEAD is, not new to this. I'm weirded out by the command names and functions. It feels kind of odd — shouldn't it be the same command?
16:36 osse ij: what do what?
16:37 vdl joined #git
16:38 cagomez joined #git
16:38 venmx joined #git
16:39 MojoJojo Who can help me? I created a branch named "testing" after a commit (61fae8a). I didn't checkout. Yet I see the following on my git log (with --decorate). I see > * 61fae8a (testing) "commit msg"
16:39 MojoJojo what does that indicate?
16:40 osse MojoJojo: the --decorate option just label commits with branch names and whatnot as appropriate
16:40 osse it just means the tip of the testing branch is there
16:41 brent__ joined #git
16:42 timvisher joined #git
16:42 neilthereildeil ok thanks
16:42 brent__ joined #git
16:43 ecuanaso joined #git
16:44 MojoJojo Thank you osse, I then made 2 more commits, still not using checkout,  and my git log then looks like this >  *a2f12d (master) "commit msg", *ad398b3 "commit msg", *61fae8a (testing) "commit msg"
16:44 osse that's expected
16:47 Dumblez0r joined #git
16:47 MojoJojo Is there any technical info on why git does that, osse?
16:47 osse MojoJojo: does what?
16:47 MojoJojo the branch tips
16:47 osse MojoJojo: because you asked for it, with the --decorate option
16:49 MojoJojo Thank you for the help osse, I appreciate it.
16:50 Electrometro joined #git
16:50 perlpilot MojoJojo: Do you have experience with other revision control systems?
16:50 jstimm joined #git
16:50 mehola joined #git
16:50 osse MojoJojo: I'm curious about your question though. It sounds to me like you think it's a bad thing
16:50 Snugglebash joined #git
16:50 osse "Why would it do that!?"
16:51 pbrewczynski joined #git
16:52 Electrometro joined #git
16:52 MojoJojo I think I'm trying to understand why it's labeling it as such.
16:53 osse it makes more sense when they don't follow eachother, so that you see a graph structure
16:53 osse MojoJojo: but why would it not?
16:53 MojoJojo I'm a bit new to this, day 3 on documentatin
16:55 synthroid joined #git
16:56 robotroll joined #git
16:56 MojoJojo I think I just don't comprehend git fully yet, and this is my first VCS as well.
16:56 MojoJojo So hence the weird question, I may come back with more though lol.
16:56 mischat joined #git
16:57 menip joined #git
16:58 YOUR_NIC joined #git
16:58 cagomez joined #git
16:59 blackwind_123 joined #git
17:00 flaviodesousa joined #git
17:01 guardian hello, is there a shorter dance than: 1. cd path/to/submodule 2. git checkout XXX 3. cd - 4. git add path/to/submodule
17:01 MojoJojo Oh, osse. In reference to my question earlier. Are these "branch tips"?
17:01 guardian I'm doing an interactive rebase and I would like to sync a submodule to specific SHA1s
17:02 multi_io joined #git
17:03 perlpilot MojoJojo: There's a video called "git for ages 4 and up" You might find it useful for understanding things.   The presenter uses tinker toys to explain git concepts.
17:03 perlpilot MojoJojo: https://www.youtube.com/watch?v=3m7BgIvC-uQ
17:03 multi_io what's the easiest way to programmatically get the name of the branch HEAD is pointing at?
17:04 MojoJojo Sweet. Thanks perlpilot, I'll use in combination with material from Pluralsight
17:04 multi_io git show-ref HEAD and parse it out?
17:04 osse MojoJojo: techincally they're just branches. there's no difference in Git between a branch and what humans consider the tip of the branch.
17:04 osse MojoJojo: short answer: yes.
17:05 tvw joined #git
17:05 canton7 multi_io, git symbolic-ref HEAD
17:05 MojoJojo Thanks osse.
17:06 jimsio joined #git
17:08 explody joined #git
17:09 madewokherd joined #git
17:11 multi_io joined #git
17:11 mikecmpbll joined #git
17:12 exitcode1 joined #git
17:13 arunpyasi joined #git
17:14 MarioBranco joined #git
17:14 tyreld joined #git
17:15 synthroi_ joined #git
17:15 cagomez joined #git
17:19 dreiss joined #git
17:21 nettoweb joined #git
17:21 tvw joined #git
17:21 LeBlaaanc joined #git
17:22 KnightsOfNi joined #git
17:22 treehug88 joined #git
17:22 oncall-pokemon joined #git
17:23 kpease joined #git
17:23 TomyLobo joined #git
17:23 kpease_ joined #git
17:24 cjbrambo joined #git
17:24 farblue joined #git
17:26 gusnan joined #git
17:27 solarfly joined #git
17:27 Rodya_ joined #git
17:28 j7k6 joined #git
17:28 govg joined #git
17:29 MattMaker joined #git
17:33 a_thakur joined #git
17:34 explody joined #git
17:34 ecuanaso joined #git
17:35 UTAN_dev joined #git
17:36 cagomez joined #git
17:37 b3kNik joined #git
17:38 tang^ joined #git
17:40 cagomez_ joined #git
17:42 prsn joined #git
17:43 tvw joined #git
17:43 prsn my last three commits were 1. code change 2. merge commit from conflict with 1 after pulling 3. code change. If i do 'git rebase -i', change nothing, and close the editor, i get 'error: could not apply...' How does this make any sense?
17:44 prsn (the thing i'm actually trying to do is change the commit message on 1. and this is preventing me)
17:44 thebird joined #git
17:46 prsn (the error is about 1.)
17:48 joeco joined #git
17:51 humboldt-xie_ joined #git
17:52 xall joined #git
17:53 rwp prsn, I would look for other things. Permissions? Disk space? What was the exact error? Make a complete copy (rsync -av src dst) and try your change on another box. That type of thing. Along the way your root cause of the problem will reveal itself.
17:54 hahuang65 joined #git
17:55 thebird joined #git
17:55 raspado joined #git
17:56 tgies joined #git
17:56 prsn rwp: i already gave up and pushed without changing the message. definitely not disk space, can't imagine there was anything with permissions. exact error was 'error: could not apply <short hash of 1.> <message of 1.>
17:57 prsn pretty curious how it's possible, but no longer an immediate concern
17:57 neilthereildeil left #git
17:58 rwp You could make a completely copy of the working copy including the ./.git/ directory and play to figure it out to satisfy your curiosity. If it happened once it will happen again.
17:58 sbeller joined #git
17:59 nickabbey joined #git
17:59 cagomez joined #git
18:00 MrMojit0 joined #git
18:02 humboldt-xie_ left #git
18:02 fahadash joined #git
18:02 Es0teric joined #git
18:03 MattMaker joined #git
18:04 mikecmpbll joined #git
18:06 heroux joined #git
18:08 humboldt-xie_ joined #git
18:09 humboldt-xie_ left #git
18:10 mischat_ joined #git
18:11 humboldt-xie_ joined #git
18:12 jrnieder joined #git
18:13 alexbobp joined #git
18:14 humboldt joined #git
18:14 alexbobp is it safe to git reset to an older commit, after doing git stash, if I want to oblitierate the commits and the changes they made, but not lose uncommitted changes?
18:15 jnavila_ joined #git
18:16 ixpict joined #git
18:16 impermanence joined #git
18:16 impermanence I had a branch, both locally and remotely roll back by accident to an old tag.  I want to move it ahead to the most recent stable tag.  How do I do this?
18:17 mloy alexbobp: yes your stash will remain the same
18:17 maurer git reset --hard name-of-most-recent-stable-tag
18:18 impermanence maurer: thank you.  from the branch I'm look to roll forward?
18:19 maurer Yes
18:19 duderonomy joined #git
18:19 impermanence And then how do I check *everything* back in?  git add *?
18:19 maurer Don't need to
18:19 maurer git reset will change the current branch to point at that tag
18:19 impermanence I'm working with puppet so this code does need to go out to "place"...
18:19 maurer it will be checked in already
18:20 impermanence ah...hm...
18:20 impermanence oh.  Then what is the correct way to push all of this re-added code?
18:20 crayon joined #git
18:20 impermanence "push" is what I meant.  Do I need to push this all back out to the remote again?
18:21 maurer Should just be git push branchname
18:21 heftig joined #git
18:21 maurer if you're sending it to that branch's default remote
18:21 maurer and the tags are in the same history
18:21 impermanence they should be.  fingers crossed...
18:22 e01 joined #git
18:22 impermanence Maurer: upon git push: "hint: Updates were rejected because the tip of your current branch is behind"
18:22 impermanence etc. etc.
18:22 impermanence Do I actually need to git pull again?
18:22 maurer That means that the two tags are not in the same history line
18:23 maurer e.g. you may have A -> B, B -> C, B -> D, D -> E
18:23 maurer and one tag is C, and the other is E
18:23 alexbobp mloy: thanks, it went well :)
18:24 maurer I'll tell you the command that ignores this, but be very sure that you understand the current state of your repos before you proceed, and know you are doing the right thing, because this is the first step that could potentially destroy data
18:24 maurer git push -f
18:24 impermanence haven't done anything like that yet...
18:24 impermanence cuz I hear you...
18:24 explody joined #git
18:25 Sample joined #git
18:27 ESphynx joined #git
18:27 ESphynx hey guys, I had cloned with --signle-branch, and now I can’t seem to be able to fetch another branch from the remote... what should I do?
18:28 _ikke_ ESphynx: Adjust the refspec I believe
18:28 ESphynx _ikke_: how would I go about doing that
18:29 dminuoso ESphynx, git fetch --unshallow  perhaps?
18:29 * dminuoso is unsure
18:29 ESphynx dminuoso: I tried that!
18:29 ESphynx told me made no sense to do this on a complete repository :P
18:29 ESphynx I got it
18:29 thiago joined #git
18:29 ESphynx git remote set-branches --add origin otherbranch
18:30 _ikke_ git right, but that means you have to do it for each branch
18:30 qqx ESphynx: git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
18:30 ESphynx qqx: thanks
18:30 qqx That would apply the default refspec as if you'd done the clone without --single-branch.
18:30 g105b joined #git
18:31 ESphynx perhaps git remote set-branches --add origin * works too?
18:31 ESphynx either way, I just wanted to add this one branch. thanks guys
18:32 Guest11257 joined #git
18:32 marianina8 joined #git
18:32 MineCoins joined #git
18:32 marianina8 joined #git
18:33 joshszep joined #git
18:33 qqx At least `git remote set-branches origin \*` seems to work as well.
18:33 marianina8 joined #git
18:34 peterbecich joined #git
18:34 _ikke_ interesting
18:35 peterbecich joined #git
18:35 ESphynx qqx: ah great, thanks.
18:36 ESphynx left #git
18:38 nickabbey joined #git
18:39 kasual joined #git
18:39 venmx joined #git
18:41 aspiers joined #git
18:45 m4sk1n joined #git
18:46 turlutton joined #git
18:47 metalraiden34 joined #git
18:47 Raging_Hog joined #git
18:51 mehola joined #git
18:52 turlutton Hey guys. I don't use git often. I have git repo with my .dotfiles, in there I have a submodule with fonts for powerline. In that .fonts/ I have untar another font dir for Latex. Now I'm ver confused on how to add that last dir to the submodule. Do I have to checkout a new branch? Do I have to change the remote to my github ? Do I work from the .fonts/ submodule or from the .dotfiles/ repo? I have try readin some tuto, but they mostly talk about
18:53 chachasmooth joined #git
18:53 turlutton Is that even how I should use submodules ?
18:58 e01 joined #git
18:58 humboldt joined #git
18:59 e01 joined #git
18:59 e01 joined #git
18:59 e01 joined #git
18:59 e01 joined #git
19:00 e01 joined #git
19:00 e01 joined #git
19:00 humboldt joined #git
19:01 turlutton How can I help you to help me ?
19:01 _ikke_ turlutton: You can either work directly on the submodule, or clone the original repo and work in there
19:01 e01 joined #git
19:01 roelmonnens joined #git
19:01 Vampire0 turlutton, Maybe you should start finishing your first sentence, everything after "talk about" is missing
19:02 e01 joined #git
19:02 e01 joined #git
19:02 turlutton Vampire0: hum, your irssi client did that perhaps ?
19:03 e01 joined #git
19:03 e01 joined #git
19:03 Vampire0 turlutton, probably not, because I don't use irssi
19:03 synthroid joined #git
19:03 Vampire0 turlutton, but IRC servers don't like too long strings and just cut them off
19:03 turlutton Vampire0: s/irssi/IRC/
19:03 Vampire0 turlutton, your client may show the full message, everyone else doesn't see it
19:03 turlutton Vampire0: ho, I've always thought it was the client doing that not freenode
19:03 Vampire0 turlutton, unlikely that XChat did that
19:04 Vampire0 turlutton, XChat even splits a long message into long lines automatically to prevent this from happening when I write long texts
19:04 chachasmooth joined #git
19:05 _ikke_ It's IRC
19:05 turlutton What was missing: "but they mostly talk about updating the submodules from source, not working with them."
19:05 Vampire0 I think the protocol cuts at 510 characters or something like that
19:06 Vampire0 to be at 512 with the CRLF at the line end
19:07 Vampire0 turlutton, well, if you actively work on the repos and also at the same time in my personal opinion submodules are not really the best way. submodules are fine if you integrate someone elses repository and from time to time update the state to a newer version
19:07 Vampire0 turlutton, !sub
19:07 gitinfo turlutton: [!subgit] SubGit is a two-way git<->svn bridge. It provides a (self-)hosted alternative to git-svn, with some advantages. See http://subgit.com/
19:07 Vampire0 turlutton, !subr
19:07 gitinfo turlutton: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
19:08 SwiftMatt joined #git
19:09 Es0teric joined #git
19:10 satifant joined #git
19:10 satifant joined #git
19:12 peacememories joined #git
19:12 turlutton Vampire0: so for you, the solution would be ?
19:17 User458764 joined #git
19:17 acetakwas joined #git
19:19 Sasazuka__ joined #git
19:19 jon-mac joined #git
19:21 joeco_ joined #git
19:21 msonntag joined #git
19:22 cfoch joined #git
19:23 e14 joined #git
19:23 Vampire0 turlutton, I didn't really understand the use-case and it heavily depends on your exact specific needs and likings. I showed you three alternative to submodules. Read about them and decide what way you want to go.
19:26 ShapeShifter499 joined #git
19:26 turlutton Vampire0: okay, for now I will keep the submodule option as I've seen people using it with their dotfiles and vim configuration plugins for example. I don't trust my git skill on this one. But I keep in mind the !subr command for later. Thank you.
19:26 gitinfo Vampire0: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
19:27 wilbert joined #git
19:27 turlutton Woa, I know why they use the @nick thing in some channel now.
19:27 MrMojit0 joined #git
19:28 e01 joined #git
19:29 robattila256 joined #git
19:30 joeco_ joined #git
19:32 Vampire0 What is the @nick thing turlutton?
19:32 aspiers joined #git
19:33 marianina8 joined #git
19:33 PrashantJ joined #git
19:33 marianina8 joined #git
19:34 Sasazuka__ joined #git
19:35 turlutton Vampire0: on some channel the command is adressed only to the nick -if and only if- @nick follows the command (not sure about the need of the '@' ). Second possible change: the command is issued only if it starts the message.
19:36 Sample joined #git
19:36 turlutton 'trigger'command @nick
19:40 PrashantJ I created a branch for my project on github and also created branch on local machine. How do I push from local branch to github branch? I have cloned from the master branch. but want to commit to the branch created on github. some help there, please?
19:41 war_pigs joined #git
19:41 mischat joined #git
19:41 nedbat PrashantJ: you don't need to create a branch on github.  just create the branch locally, and then push it to github
19:42 e14 joined #git
19:42 PrashantJ nedbat, then my master on github will not remain clean. I want that to be always clean
19:42 PrashantJ shouldn't I?
19:43 nedbat PrashantJ: when you push the branch to github, it will be a branch there too
19:43 nedbat PrashantJ: git checkout -b my-branch;  (commit);  git push -u origin my-branch
19:43 PrashantJ ohh nedbat I never knew this. Thanks!!!
19:43 Phanes- hello.  for svn->git conversion am i better off using git tooling?  i am hoping to retain history in the logs but omit tags
19:45 _ikke_ Phanes-: There are several tools that allows this conversion
19:45 Phanes- aye.  not really sure how to pick the one i need.  i am embarrassedly unfamiliar with svn.
19:46 Phanes- it seems git-svn is the way to go here
19:46 Phanes- just need that control during clone to omit tags as it blows the storage up
19:47 _ikke_ !svn2git
19:47 gitinfo For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763
19:47 _ikke_ Depending on the size of the history, git-svn can take a lot of time
19:48 Phanes- ah you are the bomb
19:48 e14 joined #git
19:48 Phanes- thanks
19:49 acetakwas joined #git
19:49 Guest79771 joined #git
19:50 metalraiden34 joined #git
19:52 gusnan joined #git
19:55 e14 joined #git
19:58 aw1 joined #git
19:58 metalraiden34 joined #git
19:59 Vampire0 turlutton, not very practical. That way you cannot integrate it in a sentence like "When is !beer best"?
19:59 gitinfo turlutton: Beer! It's what's for dinner!
19:59 m0viefreak joined #git
19:59 Vampire0 turlutton: but I remember correctly !nom
19:59 gitinfo turlutton: [!botsnack] Om nom nom
20:00 Vampire0 turlutton you can use the nick without comma or colone to not direct stuff like !zom
20:00 gitinfo [!zombie] Brainzz! More brainzzzz!  For information about detached heads, see !detached
20:00 Vampire0 s/colone/colon/
20:00 Neobenedict !beer
20:00 gitinfo Beer! It's what's for dinner!
20:00 jlewis_ joined #git
20:01 fatalhalt joined #git
20:02 Ldip joined #git
20:02 turlutton Vampire0: with great powers, comes great responsabilities. It's to up to you, best contributors of this channel, to choose how the bot is triggered.
20:03 __rgn joined #git
20:03 jstimm joined #git
20:03 Es0teric joined #git
20:03 e14 joined #git
20:05 xaviergmail_ joined #git
20:05 hussam joined #git
20:07 kexmex joined #git
20:09 hanthings_ joined #git
20:12 Guest79771 joined #git
20:12 User458764 joined #git
20:13 xpk joined #git
20:13 xpk joined #git
20:17 Guest79771 joined #git
20:20 Murii joined #git
20:20 jnavila joined #git
20:21 war_pigs joined #git
20:21 askb joined #git
20:22 Guest79771 joined #git
20:22 finalbeta joined #git
20:23 ecuanaso joined #git
20:23 Achylles joined #git
20:25 ahr3n joined #git
20:25 mda1 joined #git
20:26 gopar joined #git
20:27 Guest79771 joined #git
20:27 Phanes- svn2git seems to be much more appropriate
20:27 Phanes- i am not seeing yet how to properly map trunk to master
20:28 Phanes- http://paste.silogroup.org/sicigibube.pas
20:30 fuzzybear3965 joined #git
20:30 wilbert joined #git
20:32 venmx joined #git
20:33 LiftLeft joined #git
20:34 aidalgol joined #git
20:37 durham joined #git
20:40 kurdzman joined #git
20:41 a_thakur joined #git
20:43 gigq joined #git
20:44 raynold joined #git
20:48 aLeSD joined #git
20:50 roelmonnens joined #git
20:53 adymitruk joined #git
20:53 mehola joined #git
20:56 aw1 joined #git
20:57 ecuanaso joined #git
20:58 Atm0spher1c joined #git
20:58 diogenese joined #git
21:00 aspiers joined #git
21:01 peacememories joined #git
21:03 guardian following up my initial question: is it possible with update-index to update the sha1 of a submodule without cd into it checking out etc?
21:04 Ryanar joined #git
21:07 cagomez joined #git
21:08 masuberu joined #git
21:09 Vampire0 Phanes-, !svn2git
21:09 gitinfo Phanes-: For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763
21:09 whaley joined #git
21:10 ertes joined #git
21:10 Tobbi joined #git
21:10 Balliad joined #git
21:13 joshszep joined #git
21:15 joshszep joined #git
21:16 joshszep joined #git
21:18 tristanp joined #git
21:18 finalbeta joined #git
21:20 debian_ joined #git
21:20 d1z joined #git
21:21 brent__ joined #git
21:21 WayToDoor joined #git
21:22 cdg joined #git
21:25 cdg joined #git
21:27 sagerdearia joined #git
21:29 Tobbi joined #git
21:29 nettoweb joined #git
21:31 GodGinrai joined #git
21:34 marenz_ joined #git
21:34 marenz_ left #git
21:35 marenz joined #git
21:35 marenz Greetings
21:36 marenz I want to basically delete the history of a remote git repo and just keep the latest commit. I did a shallow clone (it is rather large) and was hoping I can just force push that shallow version so that the history is dropped
21:36 marenz But apparently things aren't that easy
21:36 marenz it just says "Everything up-to-date" so I guess there is something more I need to do
21:37 SwiftMatt joined #git
21:37 RichiH marenz: a shallow clone won't rewrite history
21:37 kadoban marenz: This sounds like a fairly bad idea, but if you really want to ...  easiest way is probably just start a new orphan branch, commit the current state, and then force push that to the remote ref.
21:37 RichiH you need to create a new repo from that
21:38 RichiH or that
21:38 woodjk joined #git
21:38 bannakaffalatta joined #git
21:40 marenz that seems to have worked well
21:40 marenz I never knew about --orphan
21:40 marenz nice
21:40 marenz thank you very much
21:41 marenz and I didn't even need to retransmit data
21:42 kadoban 'welcome. Hmm, yeah that's interesting actually, it probably had all of the blobs already I suppose.
21:43 BSaboia joined #git
21:43 Bass10 joined #git
21:43 RichiH hmm
21:43 RichiH well, it would have the whole history, which is the diff between nothing and current state
21:43 RichiH and as it's an orphan branch, it's in the same repo so the same objects exist
21:44 RichiH it would be interesting to see if a forced cleaning of all objects after the orphan & cherry-pick would result in transmission
21:44 RichiH same for a new repo
21:44 eblip joined #git
21:45 RichiH this _has_ to have at least partial client side support
21:45 peacememories joined #git
21:46 ErkiDerLoony It also depends on the transfer protocol. The git protocol I think has some intelligence in this regard.
21:47 peterbecich joined #git
21:48 Rodya_ joined #git
21:52 matsaman joined #git
21:53 tvw joined #git
21:56 venmx joined #git
21:56 t0by joined #git
21:56 mehola joined #git
21:56 MattMaker joined #git
21:58 raspado joined #git
21:58 masuberu joined #git
22:01 joshszep joined #git
22:01 robotroll joined #git
22:01 staafl joined #git
22:01 TomyLobo joined #git
22:01 finalbeta joined #git
22:02 mikecmpbll joined #git
22:02 ghoti joined #git
22:02 jfr joined #git
22:04 PtxDK joined #git
22:04 le_melomane joined #git
22:04 spm_draget joined #git
22:05 Blkt joined #git
22:05 pks joined #git
22:05 KnightsOfNi joined #git
22:05 heftig joined #git
22:05 hasc joined #git
22:05 thiago_ joined #git
22:05 cjbrambo joined #git
22:06 bjoe2k4 joined #git
22:06 Atm0spher1c joined #git
22:06 manitu joined #git
22:07 steven joined #git
22:08 buckowski joined #git
22:09 ybe joined #git
22:10 b3kNik joined #git
22:11 d0nn1e joined #git
22:14 rwb joined #git
22:14 Murr joined #git
22:16 finalbeta joined #git
22:16 Achylles joined #git
22:16 dsdeiz joined #git
22:16 dsdeiz joined #git
22:19 vdv joined #git
22:20 Sasazuka_ joined #git
22:22 ISmithers joined #git
22:27 thiago joined #git
22:29 xissburg_ joined #git
22:29 miczac joined #git
22:31 svm_invictvs joined #git
22:31 wilbert joined #git
22:34 nowhereman joined #git
22:37 MojoJojo that youtube video, Git for ages 4 and up was a tremendous help. Thanks #git
22:37 Atm0spher1c joined #git
22:38 sitaram joined #git
22:38 sitaram joined #git
22:38 venmx joined #git
22:38 roelmonnens joined #git
22:39 bvcosta joined #git
22:41 kyan joined #git
22:41 a_thakur joined #git
22:43 matsaman what would cause 'git merge master' to /not/ copy over files that exist in master but not in the currently checked-out branch?
22:43 matsaman MojoJojo: linux.conf.au 2013 one?
22:44 aspiers joined #git
22:44 MojoJojo Yes! Excellent intro after reading the first 3 chapters of git documentation.
22:44 matsaman oh man, you don't want to read git's own documentation =P that's just a reference
22:44 matsaman although I should read man gitworkflow sometime, I guess
22:45 jerrcs joined #git
22:46 xanadu joined #git
22:48 clemf joined #git
22:49 Rodya_ joined #git
22:54 venmx joined #git
22:57 MattMaker joined #git
22:58 solenodic joined #git
22:59 MarioBranco joined #git
22:59 Atm0spher1c joined #git
23:01 fmeerkoetter joined #git
23:01 thiago joined #git
23:02 dendazen joined #git
23:07 gopar joined #git
23:10 nidr0x joined #git
23:11 thiago joined #git
23:11 humboldt joined #git
23:13 NumberStation08 joined #git
23:14 a3Dman joined #git
23:15 clickjack joined #git
23:15 DolphinDream joined #git
23:15 aspiers joined #git
23:21 venmx joined #git
23:21 cdg_ joined #git
23:22 MattMaker joined #git
23:29 pig joined #git
23:30 polyrob_ joined #git
23:31 pig left #git
23:31 sveinse left #git
23:32 MacWinner joined #git
23:35 humboldt joined #git
23:36 thebope joined #git
23:38 neilthereildeil joined #git
23:39 neilthereildeil is there is a remote non-bare repo, with branches A and B, and branch A is checked out remotely, i have a local repo, how can i pull changes from remote's branch B?
23:40 Atm0spher1c joined #git
23:41 kadoban neilthereildeil: Same way as usual. It doesn't matter what is checked out remotely. Though that's a bit of a weird setup, mostly because you should avoid pushing to that remote.
23:41 neilthereildeil yea i dont push to it
23:41 kadoban But fetching/pulling works fine and isn't a problem.
23:41 neilthereildeil ok, so i just checkout the local branch B and git pull?
23:42 kadoban It depends on what upstreams you have, I'd 'git fetch' and then check what's up. But I personally almost never use pull.
23:42 neilthereildeil theres only this 1 upstream
23:42 cdg joined #git
23:43 raspado joined #git
23:44 mischat joined #git
23:44 jalr[m] joined #git
23:44 neilthereildeil kadoban: no, im getting conflicts when i try that
23:45 neilthereildeil i checked out B localls and rann git pull
23:45 kadoban Well, that depends on the relationships between them, and !eek
23:45 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
23:46 neilthereildeil i shouldnt be having any merge conflicts, as i never commit to the local tree. i just use it for code reviews
23:47 kadoban Then abort the merge and check !lol or gitk --all and see what the relationships are. Do a fetch if you didn't already first.
23:47 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
23:47 Gustavo6046 joined #git
23:48 ffilozov joined #git
23:48 neilthereildeil ok i just ran fetch. no errors. also, does it matter that the remote tree is not bare?
23:50 MattMaker joined #git
23:50 Rodya_ joined #git
23:50 mischat_ joined #git
23:50 Atm0spher1c joined #git
23:51 kadoban No
23:51 kadoban Fetching works the same regardless
23:52 neilthereildeil kadoban: after i fetch, what should i do next?
23:52 neilthereildeil kadoban: i still dont see the new commits in my log
23:52 neilthereildeil my local log
23:53 kadoban Whatever is appropriate -- I don't really know what the relationship is between your repos or what you're trying to achieve. What about in gitk --all ?
23:54 theoceaniscool joined #git
23:55 aspiers joined #git
23:57 Kaisyu joined #git
23:57 Ryanar joined #git
23:58 mehola joined #git
23:58 neilthereildeil left #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary