IRCloggy #git 2014-03-22

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2014-03-22

→ armyriad joined00:00
← jrahmy left00:00
→ Zaknefain joined00:01
→ stonelasley joined00:01
→ AccessibleWeb joined00:01
← cowlicks left00:01
→ mani2399 joined00:03
← dobalina left00:03
→ johnkevinmbasco joined00:04
← darnir_ left00:04
← lcuff left00:04
→ EClaesson joined00:04
← EClaesson left00:04
→ carbon joined00:05
← carbon left00:05
← Zaknefain left00:05
→ EClaesson joined00:05
← AccessibleWeb left00:05
← EClaesson left00:05
← stonelasley left00:06
← mishunika left00:06
← Balliad left00:08
→ cowlicks joined00:08
← imachuchu left00:09
← m0viefreak left00:10
← HerrK left00:11
→ carbon joined00:11
→ EClaesson joined00:11
← carbon left00:12
→ Gavrisimo joined00:12
← tyreld left00:13
→ xSmurf joined00:13
← thiago left00:13
→ Gavrisimooo joined00:14
→ m0viefreak joined00:14
← bluesm left00:15
→ jrahmy joined00:15
← Gavrisimo left00:17
→ montyboy joined00:17
→ Kayra joined00:18
← Gavrisimooo left00:18
← jrahmy left00:20
← cowlicks left00:20
→ jrahmy joined00:21
→ demifuror joined00:22
← sdouglas left00:23
demifuror hi guys. i have a website/web hosting. on my webhost, ive created a git directory. i have some git repos on my local machine that i want to push to my webhost (as a backup, and so that i can pull the changes down to my work machine). how do i go about doing this? i would also like to password protect the web host git repos00:23
→ sdouglas joined00:23
Foxhoundz oh git00:23
how I love you00:23
← karadoc left00:23
← sdouglas left00:23
Foxhoundz if only my workplace switched from svn00:23
← matthiaskrgr left00:23
Foxhoundz I would be happy00:23
→ sdouglas joined00:24
← johnkevinmbasco left00:24
→ ErKa joined00:25
→ ilmgb joined00:25
→ johnkevinmbasco joined00:26
→ snuffeluffegus joined00:26
→ l0x3py joined00:27
← Lemony left00:27
← LeMike left00:27
← asQuirreL left00:27
→ Lemony joined00:27
→ cowlicks joined00:28
← ilmgb left00:29
sysvalve demifuror: check out gitolite. It's git repo hosting software00:30
→ jbranchaud joined00:31
→ mikepack joined00:31
← lethjakman left00:31
bremner demifuror: gitolite is great, but if you will only ever want one user to access the repos, you can also just use ssh00:31
← leeN left00:32
← watabou left00:34
bremner demifuror: iirc, instructions for both approaches are in !book00:36
gitinfo demifuror: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable00:36
← hamster left00:36
→ WaReZ joined00:36
→ lethjakman joined00:36
← lavaman left00:37
→ kevinold joined00:37
← cads left00:38
→ Praise joined00:39
← bwreilly_ left00:39
→ lavaman joined00:39
→ zumba_addict joined00:41
← kevinold left00:41
← lavaman left00:42
zumba_addict what do you think about gitflow folks?00:42
demifuror thanks guys, got it sorted. is it possible to have two different origins for 2 different *branches* in git?00:43
→ cads joined00:44
rawtaz zumba_addict: that it suits some, but not all00:45
its nice if one wants a ready made workflow to follow, and it probably suits a lot of ppl/projects00:45
zumba_addict ok. Because my boss is planning to use it00:45
rawtaz just beware/know that it doesnt have finished support for support branches00:45
zumba_addict what's going on right now is that we have so many remote branches00:45
what is support branches?00:46
rawtaz but the devel, master, hotfix, feature stuff works fine afaik00:46
branches meant for support/patching of old versions of the software00:46
zumba_addict k00:46
we can just create a new branch right?00:46
rawtaz yes00:47
zumba_addict k00:47
→ polyzen joined00:47
rawtaz the thing is basically that you cant do like you do with e.g. feature branches; start, .., finish00:47
← kembrek left00:47
→ Caretaker joined00:48
rawtaz zumba_addict: its really just a detail, the small piece that's missing is something one can do manually00:49
its just git, after all00:49
zumba_addict got it00:49
rawtaz see https://groups.google.com/d/msg/gitflow-users/I9sErOSzYzE/AwVH06CuKT0J for a bit of discussion about the missing parts of support branches00:49
zumba_addict thanks00:49
→ upene joined00:49
→ jrbalsano joined00:50
← montyboy left00:50
rawtaz yw00:51
→ laserbeam joined00:53
→ truetype joined00:53
← upene left00:54
→ lithiumjake joined00:54
← vijay13 left00:54
→ Goplat joined00:55
→ Zaknefain joined00:55
← PeterBooker left00:56
→ ilmgb joined00:56
← laserbeam left00:57
→ cagedwisdom joined00:59
→ ezekielnoob joined00:59
← WaReZ left00:59
← mellernoia left00:59
← Zaknefain left01:00
← yhager left01:00
← johnkevinmbasco left01:00
→ laserbeam joined01:00
→ mellernoia joined01:00
← ilmgb left01:00
← jrbalsano left01:00
← truetype left01:01
← ArcTanSusan left01:02
→ bwreilly joined01:02
← BuSerD left01:02
← lethjakman left01:02
→ nb_bez_ joined01:03
← hkj left01:03
→ ket1v joined01:03
→ wethu joined01:04
→ kukks joined01:05
→ ArcTanSusan joined01:05
→ hkj joined01:06
← robbyoconnor left01:06
→ BuSerD joined01:06
→ lethjakman joined01:06
→ hahuang65 joined01:07
← ket1v left01:08
← hkj left01:08
→ hkj joined01:09
← mikepack left01:09
→ reaverb joined01:10
← reaverb left01:10
← robustus left01:11
→ jrbalsano joined01:11
cads hey guys, are there any known man in the middle attacks for git, where, for example, a person is making external contributions that have content that he cannot become aware of easily?01:11
→ GuestO1102 joined01:11
GuestO1102 → schnickschnack01:12
→ robustus joined01:12
← yaw left01:13
← invinceable left01:13
cads in this scenario a third party can intercept and rewrite any and all communications with other git repositories, so that the code the author is working on seems consistent. But if they push contributions, the third party can make arbitrary changes to what the author really sends to the remote repo.01:14
jon-mac cads: no but you should sign commits if thats what youre worried about01:14
← dagnachew left01:15
→ Gavrisimo joined01:15
← Kayra left01:15
→ dagnachew joined01:15
→ mikepack joined01:15
→ paulweb515 joined01:15
← Xiti left01:15
← kepta left01:15
→ Kayra joined01:15
← ArcTanSusan left01:16
→ Xiti joined01:16
cads I'd like to presume the attacker already has your private keyring and is trying to puppet you for as long as possible before detection.01:16
jon-mac this is a stupid scenario01:17
← dreiss left01:17
← lynzt left01:18
→ petey joined01:18
→ HelloComputer15 joined01:19
cads yeah I'll give you that01:19
it's pretty contrived01:19
← Gavrisimo left01:19
bremner if the attacker has my private keyring, he effectively is me01:19
← Kayra left01:20
demifuror hi guys. i am trying to clone a git repo stored on my webhosting, to my local machine. i am running "git clone ssh://user@mysite.com/home/user/git/myrepo", but after counting and compressing, it fails with mmap out of memory, cannot allocate memory. i am running version 1.8.3.4 on osx mavericks. any ideas?01:21
→ mrfrozone joined01:21
← mrfrozone left01:21
→ watabou joined01:22
← sdouglas left01:22
← petey left01:22
→ sdouglas joined01:23
cads bremner: the idea is what degree can a rootkitted attacker impersonate your output or mislead you with false input, without you suspecting it's happening.01:23
← lethjakman left01:23
bremner cads: and the answer, if they have my unencrypted private key, is that they can impersonate me completely.01:24
← bwreilly left01:24
← dagnachew left01:24
bremner I think I don't understand the question.01:24
→ dagnachew joined01:25
← Adam_Cameron_ left01:25
← polyzen left01:25
→ bwreilly joined01:26
sysvalve demifuror: I found that once on some of my repos. They were corrupted. You should fsck and gc them first thing01:26
and then, google for git + mmap error :)01:26
cads bremner: they can impersonate you, but unless they hide their tracks you're going to quickly find yourself on the record comitting a block of code you never wrote, and you're going to start blasting your circle with queries explaining you've been hacked.01:26
Which will at least raise suspicion about your commits.01:27
← sdouglas left01:27
→ ilmgb joined01:27
← mdhopkins left01:27
cads I'm wondering if there are scenarios where you could be committing happily, while all along a corporate spy or other hacker is in fact injecting hard to find bugs into your code, for example.01:28
→ ArcTanSusan joined01:28
→ bwreilly_ joined01:28
sysvalve by definition you are comiting to your local repo01:29
*commiting01:29
→ ket1v joined01:29
→ polyzen joined01:29
→ lynzt joined01:30
← bwreilly left01:30
cads right, so the attacker would have to trick your local repo into interfacing with a remote-repo that has different content.01:30
← ehmatthes left01:31
← ilmgb left01:31
→ mizu_no_oto joined01:32
cbreak cads: that is impossible with current computer technology01:32
cads: do you know what a cryptographic hashing function is?01:32
← nb_bez_ left01:32
cads sure, but this is a rootkitted kernel and so hashing could be bugged. Is that not true?01:33
cbreak no.01:34
← bwreilly_ left01:34
cbreak cads: every repository will validate the hashes01:34
→ bwreilly joined01:35
cbreak the one you commit to, the one you push to, every repository that fetches the history01:35
jon-mac why are you bothering01:35
next he is going to say what if they have magic super powers01:35
cbreak if you make a history and then commit with with a signature, or tag with a signature, then changing any of the preceding history is impractical01:35
jon-mac cbreak: but what if magic01:36
cbreak jon-mac: I counter with the hand of god. It neutralizes magic and ESP01:36
jon-mac but what if the attacker was jesus01:37
cbreak then he's a zombie. They are so slow even an old guy in a wheelchair could outrun him.01:37
cads jon-mac: I'm not saying the attacker is magic, just really determined to skew every view of any piece of data that runs through that machine.01:37
cbreak it took him fucking 30 days or so to get out of a grave01:37
cads: you can't change views without changing hashes01:37
cads: and if you change the hash of something, then the signatures won't match01:38
→ kevinold joined01:38
cbreak cads: and if the signature doesn't match, you know something is wrong.01:38
→ lethjakman joined01:38
→ bartman`` joined01:38
← akim left01:40
← jaequery left01:40
← jbarker left01:40
cbreak if you want to fake that, you either have to: 1. Break sha1, 2. Break gpg (i.e. RSA), 3. Compromise every single repository's user's computer in an extremely detailed manner01:40
none of which is practical for blindingly obvious reasons01:40
→ jbarker joined01:40
← ket1v left01:40
bremner well, I thought the assumption was the attacker already had the gpg private key. Which makes there nothing to talk about, afaict01:41
cads cbreak: I agree that if you compare the infected machine's signature readouts with an uninfected machine's view on it. But I imagine the infected machine could should you nothing other than a self-consistent fantasy repository, no matter which repository you queried, local or remote.01:41
cbreak bremner: he can't have the private key.01:41
bremner: it's a mitm attack01:41
bremner shrugs01:41
cbreak cads: irrelevant01:41
cads it's stronger than that, we're assuming the man in the middle also has rootkit access01:41
cbreak cads: also irrelevant01:42
cads: honestly, read what I wrote01:42
and once you understand it, you'll probably facepalm yourself to next week.01:42
→ yhager joined01:42
← kevinold left01:43
cads I don't see why I have to break sha1 when I can just tell him whatever hash I need him to see whenever he runs the hash function?01:43
← m0viefreak left01:43
cbreak because that's not how computers work... duh...01:43
→ simesy joined01:44
cbreak cads: if you give access to the data, then you can't prevent anything from being done with said data. Ask the RIAA.01:44
cads but a rootkitted kernel can easily implement a hash function that collides whenever a third party wants to...01:44
cbreak they tried.01:44
cads: nope.01:44
← demifuror left01:44
cbreak the hashing function is not in the kernel01:44
cads: what matters is the data.01:45
You have to give the data to the user01:45
← jbarker left01:45
cbreak the user can take it and do what ever the user wants01:45
the user can calculate the hash, or compile the code.01:45
← unknwn-- left01:45
rudi_s cbreak: However the security of SHA-1 is not as good as it's used to be. Not broken, yet, but shouldn't be used anymore for important data. - So you could argue (not what cads does), that Git's security model is getting weaker.01:45
cbreak rudi_s: it hasn't gotten worse.01:45
it's just as weak as it always was01:46
which is strong enough for now :/01:46
rudi_s cbreak: True. But the attacks against SHA-1 get better.01:46
← bwreilly left01:46
→ ket1v joined01:46
← ErKa left01:47
→ rjhunter joined01:47
cads cbreak: it seems like you're saying only that rootkits are not responsive or advanced enough, they just can't detect the data context of function calls in high enough detail to allow a pervasive level of user misdirection.01:48
cbreak I was asking for sha3 support in git back when it was standardized, but it wasn't a popular suggestion in this channel01:48
→ codeman joined01:48
cbreak cads: no.01:48
← jrbalsano left01:48
cbreak cads: once you give the data to the user, it is out of your hands01:48
you can't install rootkits into the user01:48
→ Zaknefain joined01:49
→ felipewm joined01:50
← pnkbst left01:50
← blackmesa left01:50
→ pnkbst joined01:51
← rjhunter left01:52
← pweaver_ left01:52
← mizu_no_oto left01:52
← _iron left01:53
rohieb cbreak: I thought the commit hash is not a security feature, according to linus?01:53
← Zaknefain left01:54
cads I mean, suppose the only thing the attacker is hiding from you is that in the public repository, every line of code you work on is punctuated with a comment character '#'. The attacker also maintains a hidden repository for your code, where he maintains the '#'-free version that you see. When you commit to remote you're really committing to your attacker's repository, wherupon the attacker sends the equivalent, #-terminated lines to the real r01:55
emote server.01:55
← ArcTanSusan left01:55
← polyzen left01:55
cads I don't see why the attacker can't have patched your kernel so that most reasonable attempts to spec your respository results in the console simply spitting out the correct answer by fiat.01:56
← rgr left01:56
→ hholtmann joined01:56
cads even if the that means the attacker has to have a really smart team of people computing what the correct hashes are.01:56
← felipewm left01:57
← vurma left01:57
→ akim joined01:58
cbreak rohieb: they are, otherwise git would not have signed tags/commits01:58
← ket1v left01:58
rohieb hmm, I remember someone say otherwise, but maybe I'm wrong01:59
anyways, sha1 is too weak :P01:59
cbreak cads: think a bit please01:59
→ mizu_no_oto joined01:59
cbreak cads: you look at your code. You calculate the hash. It doesn't match with git's hash. Isn't that suspicious?01:59
you can't tell me that you wouldn't notice that01:59
rohieb: signed tags are completely worthless without secure commit hashes02:00
rohieb of course02:00
← jagob left02:01
rudi_s rohieb: A possible solution would be to change how tags are signed. Sign the complete tree and not just the commit id.02:01
← dort left02:01
cbreak rohieb: and look back to the recent compromise of kernel.org, to which the linux guys still have not given a coherent explanation / autopsy02:01
rohieb: it was said that the kernel is safe because of git's distributed nature and the ability to compare the hashes/signatures with the baseline02:01
rohieb oh right02:01
← Caretaker left02:01
← mani2399 left02:02
cads cbreak: I'm proposing that the attacker has patched the OS of your local machine such that the hashes you see will match by default.02:02
cbreak cads: so?02:02
cads: I am proposing that you calculate the hash yourself, on paper.02:02
← mikecmpbll left02:02
bremner stupid threat model, meet impractical response.02:02
→ mishunika joined02:02
rudi_s cads: If you don't have control over your computer it's over. No matter what protocol you use.02:03
← pfFredd left02:03
cads I mean tell that to the 10,000 rootkitted linux websites out there.02:04
← lynzt left02:04
sysvalve cads: none of them will patch your kernel so it makes up your git commit hashes to predictable values from your attacker02:04
rudi_s cads: So what?02:04
sysvalve if that's what you are proposing02:04
cbreak cads: they are irrelevant02:04
cads: no one commits on a web server02:04
bremner well. webdevs do. ;)02:04
cbreak only the stupid ones...02:05
bremner must not take straight line.... ;)02:05
cbreak most will probably develop locally.02:05
sysvalve webdevs don't commit. They just upload via ftp02:05
jon-mac sysvalve: you mean edit in place?02:05
cads yup.02:05
rudi_s Well, I'd say client systems are easier to attack than servers. All the nice exploits in our browsers ...02:05
cads sometimes they'll copy everything into a versioned directory.02:05
← wethu left02:06
sysvalve jon-mac: well, working on a remote system looks unlikely to me to be actually 'on-place' but yes, that's the idea (disclaimer, I was just trolling)02:06
jon-mac sysvalve: I meant using vi or such :P02:06
cads I've seen things like /project/profile_thurs11-12-1102:07
sysvalve ah yes02:07
← mishunika left02:07
cads with 10 other creatively named versions of the profile directory as well02:07
sysvalve I've seen a whole bunch of them actually02:07
logging in to a server and seeing "vi /var/www/whatever/whatever/stuff.php"02:07
yeah02:07
cbreak php? That's a sign for an insecure server02:08
sysvalve cbreak: tell me about it :(02:09
← zz_chamunks left02:09
→ chamunks joined02:09
→ tanath joined02:11
→ Nizumzen joined02:14
← schnickschnack left02:15
← toomanysecrets left02:15
→ Gavrisimo joined02:15
→ Dougie187 joined02:17
Havvy Today .php. Tomorrow .hack02:17
← mellernoia left02:18
→ glebm joined02:18
→ sgen joined02:19
← Mocramis left02:19
← pfg left02:19
→ Mocramis joined02:19
← Gavrisimo left02:20
→ karpoff joined02:20
cads sysvalve: I just can't see that it would be very hard to write a rootkit module that detects when a user is hashing a particular piece of data, and alters the output according to the rootkit owner's requirements.02:20
→ Dougie2187 joined02:22
→ bwreilly joined02:23
→ dougsland joined02:24
→ ArcTanSusan joined02:25
← jaimef left02:26
→ jaimef joined02:26
← SilverBln left02:26
→ fragamus joined02:28
← laserbeam left02:28
← jrahmy left02:29
→ laserbeam joined02:29
→ raj__ joined02:29
← lethjakman left02:30
→ jrahmy joined02:30
→ pr0ton_ joined02:31
→ jbarker joined02:33
← Nizumzen left02:33
← laserbeam left02:33
→ Havvy[Hex] joined02:33
→ dreiss joined02:33
dalias i want to maintain a stable (basically bugfixes and possibly non-invasive feature backports) branch while continuing to develop in master branch02:33
← Havvy left02:34
Havvy[Hex] → Havvy02:34
dalias i haven't really used branches a lot before; is there anything i should know/read to get started and make sure i do it "right" ?02:34
← simesy left02:35
→ macmartine joined02:35
← hholtmann left02:36
← macmartine left02:37
→ Spyro joined02:38
→ vijay13 joined02:38
→ kevinold joined02:38
→ Jabberish joined02:39
→ yacks joined02:40
← raj__ left02:42
→ zajn joined02:42
← yhager left02:43
→ therealGent joined02:43
→ Zaknefain joined02:43
← kevinold left02:43
→ hholtmann joined02:43
← Zaknefain left02:44
→ sohail joined02:44
← l0x3py left02:47
rudi_s dalias: !doc02:47
gitinfo dalias: A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.02:47
← dreiss left02:47
rudi_s I guess !book is the best guide, it introduces all the necessary concepts including branches and merging.02:48
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable02:48
rudi_s The important part is, don't be afraid of many branches and commit often.02:48
← mizu_no_oto left02:48
→ rchavik joined02:49
→ charco joined02:49
rudi_s You can always rewrite the history later if you don't like it, but by committing it you create a "permanent" copy of your data which won't get lost (unless you tell git so).02:49
← jaimef left02:51
← joki left02:51
→ jaimef joined02:52
→ mizu_no_oto joined02:56
→ raj__ joined02:56
→ Vampire0_ joined02:57
→ joki joined02:58
← sysvalve left02:59
← Vampire0 left03:00
← raj__ left03:01
← bwreilly left03:01
← Mocramis left03:02
→ oskarkv joined03:02
→ sysvalve joined03:02
→ Mocramis joined03:02
← tyll left03:04
→ kevinold joined03:04
← kotk1 left03:05
→ shingshang joined03:05
→ tyll joined03:06
→ kotk joined03:06
← gandalfcome left03:08
← makubi left03:08
dalias rudi_s, our workflow so far is that there are no long-lived branches and all real development takes place in master03:08
rudi_s dalias: Well, if it works for you, there's no real need for branches. - But when you're working on larger "projects" (like introducing a new feature) using branches has some advantages. You can see exactly which commits belong to this feature because they are integrated into master in one operation and you can continue to work on your feature while other features are developed on master.03:10
← mikepack left03:10
→ mikepack joined03:11
← alvaro_o left03:11
→ Sabbath joined03:11
dalias rudi_s, what i'm interested in using branches for is a basically bugfix-only stable branch03:12
rudi_s dalias: Sure, that works fine too. You can cherry-pick the commits fixing bugs into the stable branches or develop them on the stable branch and merge it into master.03:13
dalias for the most part we won't touch it, but if there are security fixes or other non-invasive bugfixes we could backport then and cut a release03:13
now you're getting at the things i wanted to know03:13
the right way to do it is cherry-pick from master into stable03:13
→ makubi joined03:13
rudi_s dalias: Depends on your work-flow, both work. Either you fix the bug in the "oldest" supported version and merge that fix to newer branches (e.g. master) or you backport the fix.03:14
backport = cherry-pick03:14
→ raj__ joined03:15
dalias yes i can see how either or even a mix would work03:15
but the other direction (develop bugfix in stable) doesn't work well with our workflow03:15
rudi_s dalias: It doesn't have to, cherry-picking works fine too ;-)03:15
dalias *nod*03:15
← mikepack left03:15
dalias cherry-picking sounds perfect for what we need03:15
→ simesy joined03:16
→ BadProphet joined03:16
→ Gavrisimo joined03:16
← Sabbath left03:16
rudi_s dalias: Also have a look at man git-cherry-pick, it describes some useful options for your workflow (like -x).03:17
gitinfo dalias: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html03:17
← hkj left03:17
→ hkj joined03:17
→ petey joined03:19
→ lynzt joined03:19
← hahuang65 left03:19
← sgen left03:19
dalias yes -x looks nice03:20
← jbranchaud left03:20
← Gavrisimo left03:20
→ ojacobson joined03:21
← hkj left03:22
← akiress left03:22
→ ket1v joined03:22
→ akiress joined03:23
← petey left03:24
← akiress left03:25
← maroloccio left03:26
→ Sleepy63 joined03:26
→ joelrobichaud joined03:26
→ jaequery joined03:27
← jaequery left03:27
→ jaequery joined03:27
→ mikepack joined03:29
← mikepack left03:29
→ laserbeam joined03:30
→ mikepack joined03:30
← kevinold left03:31
← BuSerD left03:31
← Noldorin left03:32
→ bwreilly joined03:33
← mikepack left03:34
← laserbeam left03:34
← simesy left03:34
→ BbT0n joined03:34
← mribeirodantas left03:35
→ karadoc joined03:38
→ mribeirodantas joined03:38
→ Zaknefain joined03:38
→ TheMadMechanic joined03:39
← ezekielnoob left03:42
← lithiumjake left03:42
← Zaknefain left03:43
→ gancl joined03:44
← Wulf left03:45
← nnyk left03:46
← TheMadMechanic left03:46
→ Wulf joined03:46
← Mitchbones left03:49
← akiva left03:49
→ rjhunter joined03:50
← mribeirodantas left03:51
→ oojacoboo joined03:53
← pr0ton_ left03:54
← rjhunter left03:54
← oojacoboo left03:56
→ bluesm joined03:59
← yacks left04:00
→ thiago joined04:00
→ mishunika joined04:03
→ nnyk joined04:04
→ kevinold joined04:04
→ maroloccio joined04:05
→ pweaver_ joined04:06
← maroloccio left04:06
← jbarker left04:06
← zumba_addict left04:07
→ maroloccio joined04:07
aartist How I can run git on windows 8?04:07
→ zumba_addict joined04:07
→ RaptorJesus joined04:08
← mishunika left04:08
← kevinold left04:11
← kukks left04:12
← ket1v left04:13
← watabou left04:13
→ ket1v joined04:14
→ AruL_ joined04:16
← wongon left04:16
→ wongon joined04:16
→ hahuang65 joined04:17
→ Gavrisimo joined04:17
→ sgen joined04:19
← therealGent left04:20
→ codeman_ joined04:21
← Gavrisimo left04:22
← wongon left04:23
← codeman left04:25
← chris_thomson left04:25
thiago aartist: type: git04:25
→ yacks joined04:27
→ tomengland joined04:28
→ beautifulmind joined04:28
→ yhager joined04:29
← bwreilly left04:30
→ laserbeam joined04:30
← RaptorJesus left04:31
→ sirchopsalot joined04:31
kadoban anyone have advice on if using a pre-commit hook to check style is actually a good idea? do you end up just bypassing it, or does it help? maybe depends on language?04:31
(i mean code style, if that wasn't clear)04:31
→ Zaknefain joined04:33
thiago it's a good idea04:33
← vijay13 left04:33
thiago as long as you don't bypass it for no good reason04:33
what use is it having a hook that you ignore?04:33
kadoban well, yeah i suppose. i guess if anything else i can just kill it if i end up annoyed by it04:34
← laserbeam left04:34
← raj__ left04:34
← BadProphet left04:35
← maroloccio left04:35
→ BadProphet joined04:35
← HeN left04:37
← Zaknefain left04:37
→ jrbalsano joined04:39
← jrbalsano left04:39
← BadProphet left04:40
← ArcTanSusan left04:40
← chamunks left04:40
→ maroloccio joined04:43
→ chamunks joined04:43
← jcvfen left04:44
→ simesy joined04:45
← cruig left04:45
→ Zifre joined04:46
← Dougie2187 left04:47
→ raj__ joined04:48
← joelrobichaud left04:48
← ojacobson left04:48
← AruL_ left04:49
← simesy left04:49
← Zifre_ left04:49
→ AruL_ joined04:49
→ rjhunter joined04:51
→ Naeblis joined04:52
→ robbyoconnor joined04:52
Naeblis This is strange. I have a lib/ directory inside my .gitignore, yet when I updated a few files in it, they are showing up as "changes to be committed". Of course, can't stage them, because then I get a warning telling me it's in the gitignore.04:53
:o04:53
← lindenle left04:53
← rjhunter left04:55
kadoban Naeblis: .gitignore doesn't do anything anymore once git is already tracking the files...so you should make sure you don't track them if you don't mean to04:56
Naeblis kadoban: I never was tracking them04:56
← mizu_no_oto left04:56
← catdawg left04:56
kadoban Naeblis: well, "changes to be commited" means you added them, which is one step away04:56
← robbyoconnor left04:57
→ rjhunter joined04:58
← rjhunter left04:59
Naeblis ah, I had commented out the lib/ from gitignore to see what was going on04:59
anyway kadoban. Unstaged, and added lib/ back04:59
→ devians_ joined05:00
← w0ng left05:00
→ rjhunter joined05:00
← hahuang65 left05:00
← rjhunter left05:01
→ Cork joined05:01
← sysvalve left05:01
← codeman_ left05:02
→ rjhunter joined05:02
← rjhunter left05:03
← Havvy left05:04
→ koell joined05:05
← Bass10 left05:05
→ zack6849 joined05:06
→ rjhunter joined05:06
← karadoc left05:06
← rjhunter left05:06
→ kevinold joined05:07
→ rjhunter joined05:09
← rjhunter left05:09
← Dougie187 left05:10
→ rjhunter joined05:10
← sohail left05:10
← dagnachew left05:10
← rjhunter left05:10
← Freeman42 left05:11
← koda left05:11
→ rjhunter joined05:11
← rjhunter left05:11
→ rjhunter joined05:12
← rjhunter left05:12
← kevinold left05:13
→ ArcTanSusan joined05:13
→ rjhunter joined05:13
← CKyle left05:14
← kotk left05:14
← rjhunter left05:14
→ rjhunter joined05:15
← rjhunter left05:16
→ mikepack joined05:17
→ rjhunter joined05:17
← rjhunter left05:18
→ Gavrisimo joined05:19
→ SidWu joined05:19
← SidWu left05:19
→ jrahmy_ joined05:19
→ SidWu joined05:19
← jrahmy left05:19
← SidWu left05:19
→ torchie joined05:19
→ zz_karupanerura joined05:19
→ jrahmy joined05:19
zz_karupanerura → karupanerura05:19
→ petey joined05:20
← Lemony left05:20
→ mikeyjk joined05:21
→ rjhunter joined05:21
← rjhunter left05:22
← Gavrisimo left05:22
← mikepack left05:22
← raj__ left05:22
→ w0ng joined05:22
← jrahmy_ left05:22
← AruL_ left05:23
← charco left05:23
← petey left05:24
→ rjhunter joined05:26
← rjhunter left05:26
→ rjhunter joined05:27
→ Zaknefain joined05:27
← rjhunter left05:27
→ rjhunter joined05:28
← rjhunter left05:29
→ unknwn- joined05:29
→ rjhunter joined05:31
← Zaknefain left05:31
→ laserbeam joined05:31
← rjhunter left05:32
→ rjhunter joined05:33
→ RaptorJesus joined05:33
← rjhunter left05:34
→ raj__ joined05:35
→ rjhunter joined05:35
← laserbeam left05:36
← rjhunter left05:36
→ rjhunter joined05:36
← rjhunter left05:36
→ mikecmpbll joined05:37
→ rjhunter joined05:38
→ simesy joined05:38
← rjhunter left05:38
← rchavik left05:39
← simesy left05:39
→ rchavik joined05:39
→ wethu joined05:39
→ rjhunter joined05:40
← rjhunter left05:40
→ simesy joined05:40
→ rjhunter joined05:41
← rjhunter left05:41
← akim left05:42
→ rjhunter joined05:42
→ Tommy[D] joined05:42
← rjhunter left05:42
→ rjhunter joined05:44
← rjhunter left05:44
→ pikaren joined05:44
← Tommy[D]_ left05:44
→ Kicer86 joined05:45
→ lindenle joined05:45
→ rjhunter joined05:45
← rjhunter left05:46
→ rjhunter joined05:47
← mikecmpbll left05:48
gitinfo set mode: +v05:48
sgen So I accidentally merged without --no-ff , how can I undo the merge so that I can redo the merge with --no-ff?05:48
← rjhunter left05:48
← ArcTanSusan left05:48
→ rjhunter joined05:49
← rjhunter left05:49
kadoban sgen: have you published the merge anywhere yet? if not, (Note: make a backup first, and make sure you know what this does!) git reset --hard HEAD^ in the branch you merged into is enough05:50
sgen kadoban: and this will destroy the fast forward merge?05:51
→ rjhunter joined05:51
kadoban sgen: it will set the position of the branch back one, discarding the current commit (the merge)05:51
i'm assuming you've done nothing since you did the merge05:51
sgen I havnt05:52
thank you!05:52
kadoban you're welcome :)05:52
sgen which branch do I do this on? master which ive merged to or the new-feature branch I merged with master?05:53
← unknwn- left05:53
→ ArcTanSusan joined05:53
← ArcTanSusan left05:53
→ Freeman42 joined05:55
← armyriad left05:55
kadoban sgen: the one you merged to, master05:56
← jaequery left05:56
kadoban whichever one you want to rewind one step, but master should be it05:56
→ pr0ton_ joined05:59
RaptorJesus → PirateJesus06:01
→ arvind_k joined06:02
PirateJesus → RaptorJesus06:02
← sirchopsalot left06:02
→ mishunika joined06:04
→ toomanysecrets joined06:05
→ pr0ton__ joined06:05
← pr0ton_ left06:06
→ khmarbaise joined06:07
→ LtCrData joined06:07
mattcen isn't convinced this will work with a fast-forward.06:08
← mishunika left06:09
→ kevinold joined06:09
mattcen kadoban, sgen: Nope, that doesn't work as you're expecting06:10
← nnyk left06:11
mattcen sgen: Easiest option is to have a look a git reflog, find the commit before the one you did the merge on, and then 'git reset --hard HEAD@{N}' where N is the number of the commit06:11
kadoban sgen: oh crap, i totally misread your question :/ mattcen, thanks...woops06:13
← pr0ton__ left06:14
← kevinold left06:14
mattcen There are probably other ways than reflog to do it, but that's as good as any IMO06:14
kadoban i thought he said he accidentally used --no-ff, not the other way around...that should have raised some questions06:14
→ oojacoboo joined06:14
← tanath left06:15
→ johnkevinmbasco joined06:15
→ pr0ton_ joined06:15
→ fatalhalt joined06:19
→ Gavrisimo joined06:19
← beautifulmind left06:19
→ Zaknefain joined06:21
← w0ng left06:21
← torchie left06:21
← karupanerura left06:21
← texasmynsted left06:22
← Gavrisimo left06:23
→ zumba_ad_ joined06:25
← raj__ left06:25
← Zaknefain left06:26
← Gamecubic left06:26
→ ilmgb joined06:28
← cads left06:28
← ilmgb left06:29
← zumba_addict left06:29
→ ilmgb joined06:29
← zumba_ad_ left06:29
→ beautifulmind joined06:30
→ AccessibleWeb joined06:30
→ luminous joined06:31
← luminous left06:32
→ luminous joined06:32
→ armyriad joined06:32
→ laserbeam joined06:32
← ilmgb left06:33
← pr0ton_ left06:34
← snuffeluffegus left06:34
← Goplat left06:35
← laserbeam left06:36
→ JOAC joined06:37
→ hobodave joined06:39
→ raj__ joined06:39
→ JPeterson joined06:44
← lindenle left06:46
← wethu left06:48
→ paolooo joined06:48
→ lite_ joined06:48
← Rastus_Vernon left06:49
← jaimef left06:50
→ jaimef joined06:50
← oojacoboo left06:51
→ wethu joined06:51
← AccessibleWeb left06:52
→ igli joined06:52
igli how do i see the "embedded date" inside a git tag? i've just finished importing a historical codebase, and i can't remember if i used GIT_COMMITTER_DATE= to earlier git tag06:54
→ jluc joined06:54
→ Not_Whatever joined06:54
→ phanimahesh joined06:55
gitinfo set mode: +v06:55
← ket1v left06:57
→ txt23 joined06:57
← pweaver_ left06:57
txt23 I'm fairly new user of git. I use Windows for work and have linux running our dev site. How do I import my current commits directly from site like BitBuket to the server? Currently I do this manually and its getting annoying06:58
→ robbyoconnor joined06:59
igli hmm rev-parse to get tag object06:59
check !deploy txt23 - it might give you some idea07:00
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html07:00
igli -s07:00
← dougsland left07:00
txt23 igli: Okay I will read it. Thanks07:01
→ ezekielnoob joined07:02
→ dc5ala joined07:02
igli hmm that shows me the commit07:04
yw07:04
← raj__ left07:04
igli fsck it07:04
← txt23 left07:04
← bgerber left07:05
→ tvw joined07:05
→ mikepack joined07:05
← khmarbaise left07:06
← raven-au left07:08
→ mishok13 joined07:08
→ kriks joined07:09
← lite_ left07:09
→ raven-au joined07:09
→ JeremyWei joined07:09
→ kevinold joined07:10
← mikepack left07:10
→ Devastatr joined07:10
← salamanderrake left07:10
→ lite_ joined07:10
→ iamntz joined07:11
← Devastator left07:11
← root828 left07:13
← kevinold left07:14
→ salamanderrake joined07:15
→ alaing joined07:15
→ Zaknefain joined07:15
← fatalhalt left07:16
alaing right so I've got my head wrapped around commits etc but now has come the time when i need to rollback to a particular commit. how do i do this?07:17
→ dieter joined07:19
alaing Basically I would like to rollback a particular folder in my project07:19
→ steverandy joined07:19
→ Gavrisimo joined07:19
← Zaknefain left07:20
→ anry joined07:20
→ petey joined07:20
← thiago left07:20
← lite_ left07:21
→ raj__ joined07:21
→ lite_ joined07:21
← pnkbst left07:21
← aartist left07:23
← Gavrisimo left07:24
→ snuffeluffegus joined07:24
→ saorge_ joined07:24
← petey left07:25
nullie alindeman, git checkout <commit> <folder>07:26
alaing, ^07:26
→ jizanthapus joined07:26
← lite_ left07:26
← beautifulmind left07:27
alaing will the checkout output the <folder> contents into the current directory that I'm in07:27
← JOAC left07:27
← BbT0n left07:27
← yhager left07:28
← saorge left07:28
alaing nullie: ^07:29
← maqr left07:29
← johnkevinmbasco left07:31
← jizanthapus left07:32
→ szx joined07:33
→ jizanthapus joined07:33
← JeremyWei left07:33
← jizanthapus left07:35
→ nfroidure joined07:36
alaing dont worry I found the answer07:36
→ dreiss joined07:37
→ yhager joined07:38
→ hide joined07:39
← hide left07:39
→ hide joined07:40
← hide left07:40
→ hide joined07:40
← hide left07:40
→ hide joined07:41
← hide left07:41
→ y_nk joined07:41
← y_nk left07:41
→ y_nk joined07:41
→ Nazca__ joined07:42
→ hide joined07:42
← kriks left07:43
→ yaw joined07:43
alaing i ran this git checkout 17a58c107:43
← Nazzy left07:43
alaing but it doesn't seem to have rollback the state of the files07:44
and folders for that commit07:44
→ lite_ joined07:44
← lite_ left07:44
← robbyoconnor left07:45
→ robbyoconnor joined07:45
← y_nk left07:45
moritz that should reset both the files and the branch07:45
so that a 'git diff' afterwards comes out empty07:45
→ watermel0n joined07:47
→ pnkbst joined07:48
→ Macaveli joined07:50
← pnkbst left07:53
→ moberberger joined07:55
→ laserbeam joined07:56
← dreiss left07:56
→ pweaver_ joined07:57
→ hiredman joined07:57
→ ignas joined07:58
→ BbT0n joined08:00
→ pantsman joined08:00
→ xucheng joined08:02
→ upene joined08:03
← xucheng left08:03
← yaw left08:03
→ tonythomas joined08:04
← pweaver_ left08:04
→ mishunika joined08:05
→ CodeShar_ joined08:06
igli what about the history of the branch, moritz? i mean if you commit, it won't lose the work will it?08:07
commit from there*08:07
← CodeShark left08:08
→ Leucomelas joined08:08
Leucomelas Hello World08:08
gitinfo Leucomelas: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.08:08
← szx left08:08
igli ah: If no paths are given, git checkout will also update HEAD to set the specified branch as current08:08
→ nick108 joined08:09
→ doev joined08:09
→ a-l-e joined08:09
Leucomelas I've a problem, a friend edit the website of a client, but directly on the prod serveur. I want to get this edit on my desktop. How to make08:09
← rjhunter left08:09
→ Zaknefain joined08:09
← mishunika left08:10
← Zaknefain left08:10
→ kevinold joined08:10
← freestyl3r left08:13
← mikeyjk left08:13
← kevinold left08:15
→ Gavrisimo joined08:17
← ezekielnoob left08:19
← timewa1ker left08:21
← pantsman left08:23
← simesy left08:25
→ fluter joined08:27
fluter hi08:27
→ _lynX joined08:27
fluter how can I copy all files from a repo to another empty repo, and init the empty repo with that?08:27
the empty repo has been git inited,08:28
and I'm doing the initial import of source tree08:28
← HelloComputer15 left08:30
→ cruig joined08:30
→ bharateeyudu joined08:30
← bharateeyudu left08:31
→ bytefire joined08:31
→ bgerber joined08:34
→ herdingcat joined08:34
fluter hi08:35
← cruig left08:36
igli Leucomelas: download the site into another directory and run diff, against your worktree or a fresh clone, perhaps --reference|--shared if you prefer08:36
→ rjhunter joined08:37
← _lynX left08:38
→ _lynX joined08:38
→ jackneill joined08:39
← jackneill left08:39
→ jackneill joined08:39
← Leoneof left08:40
→ blackmesa joined08:43
← Macaveli left08:43
→ pweaver_ joined08:43
→ IVplay joined08:47
← jrahmy left08:48
← ciampix left08:48
→ dort joined08:48
→ darnir_ joined08:48
→ pnkbst joined08:49
→ Leoneof joined08:49
← yhager left08:53
← john2x left08:53
→ mikepack joined08:53
← upene left08:54
→ upene joined08:54
← pnkbst left08:54
→ john2x joined08:54
→ el3ctron_ joined08:55
→ simesy joined08:55
← watermel0n left08:55
← rjhunter left08:57
← paolooo left08:57
→ ket1v joined08:57
← mikepack left08:58
→ sq-one joined09:00
← pweaver_ left09:00
→ mishunika joined09:01
← ket1v left09:02
← jaimef left09:02
← simesy left09:03
→ longbeach joined09:04
→ Lemony joined09:04
← wethu left09:05
→ Zaknefain joined09:05
→ harobed_ joined09:05
→ jaimef joined09:05
→ dcpc007 joined09:06
→ Tabmow joined09:06
→ torchie joined09:06
→ zz_karupanerura joined09:06
→ leeN joined09:07
zz_karupanerura → karupanerura09:07
← blackmesa left09:08
→ w0ng joined09:08
← Leoneof left09:08
← Zaknefain left09:09
← el3ctron_ left09:09
→ supermat joined09:10
← ignas left09:10
→ khmarbaise joined09:11
→ kevinold joined09:11
→ pantsman joined09:12
→ jagob joined09:14
→ hamster joined09:14
→ cff joined09:14
← kevinold left09:16
→ PeterBooker joined09:17
→ szx joined09:18
← Octalot left09:19
→ ayaz joined09:19
← ayaz left09:19
→ ayaz joined09:20
← ayaz left09:20
→ ferreum joined09:20
→ petey joined09:21
→ Yena joined09:21
← Yena left09:23
→ Yena joined09:23
← petey left09:25
← szx left09:26
→ nnyk joined09:27
→ kriks joined09:27
← tomengland left09:29
→ tomengland joined09:30
sgen !backup09:31
gitinfo Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups09:31
→ rgr joined09:32
← harobed_ left09:33
← tomengland left09:34
→ Mode-M joined09:35
← kriks left09:36
→ matheus23 joined09:36
→ Leoneof joined09:40
← mishunika left09:44
→ Silmarilion joined09:45
→ Kayra joined09:45
→ AndreasLutro joined09:46
→ pnkbst joined09:50
→ carbon joined09:51
← fragamus left09:51
← carbon left09:51
→ HelloShitty joined09:53
→ watermel0n joined09:54
← pnkbst left09:55
← khmarbaise left09:55
→ asQuirreL joined09:57
← nnyk left09:59
→ Zaknefain joined09:59
← chamunks left09:59
→ simesy joined10:00
→ Gizburdt joined10:02
→ Zaknefai_ joined10:02
← Zaknefain left10:03
→ chamunks joined10:03
← Gizburdt left10:03
igli heh10:03
→ wethu joined10:04
← simesy left10:05
→ ghostlines joined10:06
← ghostlines left10:06
→ ghostlines joined10:06
→ aep joined10:08
→ siprbaum joined10:09
→ CheckDavid joined10:09
← herdingcat left10:09
→ mikecmpbll joined10:09
← kcj left10:11
→ SilverBln joined10:11
→ kevinold joined10:12
→ _iron joined10:13
→ nfk joined10:13
→ m0viefreak joined10:15
→ ignas joined10:16
← kevinold left10:17
← conan_ left10:17
→ DoniRS joined10:19
→ conan joined10:19
→ ngladitz joined10:20
← ignas left10:21
← WormDr1nk left10:21
← ctp left10:23
→ moonglow joined10:24
→ kriks joined10:24
→ SorenHolm joined10:24
← bytefire left10:25
← armyriad left10:25
→ howlymowly joined10:26
→ szx joined10:29
→ WormDrink joined10:29
→ khmarbaise joined10:29
← raj__ left10:29
← tvw left10:31
→ prutz joined10:32
← snuffeluffegus left10:33
→ yaw joined10:34
← Lemony left10:34
← Kayra left10:35
→ beautifulmind joined10:36
← tonythomas left10:37
→ crystal77 joined10:37
→ mikepack joined10:41
→ Fullma joined10:41
← Silmarilion left10:42
→ raj__ joined10:43
→ Macaveli joined10:43
→ fr33 joined10:43
← mikepack left10:46
→ psoo joined10:46
← raniere left10:47
→ SHyx0rmZ joined10:48
→ AbiBuccaneer joined10:49
→ pnkbst joined10:51
AbiBuccaneer Hi all. I have an SVN repository that I want to convert to a git repository using git-svn. Unfortunately, the line endings in the svn repository are kind of a mess, and I'd like to normalize them. Whilst I can use git-svn, then add .gitattributes and then do a commit which normalizes all the line endings, is it possible to normalize them as they are fetched from SVN?10:51
cbreak AbiBuccaneer: you can use git filter-branch to do it after the fact10:52
(tree filter, using a tool that can convert text files)10:53
→ oodavid joined10:54
→ yast0804 joined10:54
← yast0804 left10:55
AbiBuccaneer thanks cbreak, i'll look into that10:55
← watermel0n left10:55
canton7 agreed. the converting from svn -> git is the painful bit, never mind debugging line ending issues. get it into git first, then you can edit history as much as you like10:56
→ watermel0n joined10:56
← watermel0n left10:56
→ watermel0n joined10:56
→ yast0804 joined10:57
→ ket1v joined10:58
← pnkbst left10:59
← psoo left10:59
→ rjhunter joined11:00
← yast0804 left11:00
← watermel0n left11:01
→ watermel0n joined11:01
→ psoo joined11:01
→ robert45 joined11:02
← watermel0n left11:02
→ watermel0n joined11:02
robert45 hi guys, can someone tell me why Im getting this error: unracked working tree file 'public/cases/cas/big/afr10.png' would be overwritten by me merge. Aborting.11:02
→ raniere joined11:02
bremner robert45: pretty much what it says. What part is unclear for you?11:03
← ket1v left11:03
bremner merge wants to create that file, but it already exists11:03
← psoo left11:03
→ psoo joined11:04
robert45 bremner tx for replying, but why it doesnt overwrite it?11:04
→ terabit joined11:04
bremner robert45: because that could cause data loss11:04
← rjhunter left11:05
terabit so I deleted some changes in github now the local git won't let me commit/push ,why does git care if I have files I didn't "git add" ?11:05
→ ayaz joined11:05
→ m8 joined11:06
robert45 bremner thanks, so how can I merge this successfully ?11:06
→ noxd joined11:06
← Gavrisimo left11:06
bremner robert45: move or remove the file in question11:06
rawtaz terabit: i dont thikn it's about some local file that is not tracked, but rather about the fact that upstream/origin is ahead of you, so you need to get the latest changes before you can push yours to it11:08
terabit yeah but I can'g git pull now it's telling me to merge let me try and see if that works *sigh*11:08
comps git pull --rebase11:09
terabit Please, commit your changes before you can merge.11:09
rawtaz terabit: it's doing this for your own safety11:09
terabit do tried a commit right? fatal: cannot do a partial commit during a merge.11:09
robert45 tx bremner11:10
terabit so... I'm at a loss here lol11:10
comps at least you're laughing11:10
bremner terabit: you seem to be trying to start a merge in the middle of a merge?11:10
yo dawg?11:11
terabit how is that possible?11:11
j416 lol11:11
bremner it isn't possible.11:11
canton7 hence the error11:11
terabit lol, I just want my files here uploaded to the other repo11:11
comps: yeah,lols FTW :D11:11
bremner terabit: how about pastbinning the exact error message.11:11
canton7 'git merge --abort' will abort whatever merge is currently going on, for future reference11:11
terabit of which command11:12
canton7 maybe we need to add that to the 'you're already in a merge' error message...11:12
terabit fatal: There is no merge to abort (MERGE_HEAD missing).11:12
canton7 are you in the middle of a rebase? /confused11:13
→ kevinold joined11:13
bremner !repro11:13
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.11:13
bremner I see no hope without ^11:13
comps ls .git11:13
→ Sound joined11:13
canton7 yeah, I agree11:13
← prutz left11:13
terabit if I clone,copy all my source files to the clone dir and copy the clone on top the old dir,will that solve it lol? let me type all the commands that have been suggested so far and paste them11:14
← robert45 left11:14
→ yast0804 joined11:15
comps to me, it looks like a typical "local modifications while trying to rebase", but that 'during a merge' thing is weird11:15
git stash to the rescue, if it's the former11:16
terabit I never done a rebase before, I always just commit and push,except today I deleted some files in github,did some local updates and tried to push...11:16
comps in which case you need to do a rebase (or a merge with merge commit)11:17
← kevinold left11:17
Freeman42 → freeman4211:18
terabit http://pastebin.com/U5HbPB4911:19
→ prutz joined11:19
terabit never done a merge either fyi on this repo11:19
until now that is11:20
bremner so, uh, the 20 line message from commit was a hint it didn't work.11:20
→ zequence joined11:20
terabit can I just delete the github repo and push all my files again?11:21
bremner well, if you can't make commit work, you're relationship with git will be painful.11:22
← freeman42 left11:22
← hamster left11:22
→ petey joined11:22
cbreak terabit: don't give commit names11:22
→ freeman42 joined11:22
cbreak terabit: just type git commit11:22
that's it11:22
no names!11:22
comps the workarounds people use around git when they just don't get it are the most ugly things I've seen in my life ... and I've seen early html code as well!11:22
cbreak if you want to stage new state for committing, use git add before11:22
← fr33 left11:23
→ hamster joined11:23
← psoo left11:24
cbreak terabit: also, your decision seems to have been to remove compile.sh11:24
you have to tell git about that11:24
so git add compile.sh11:24
terabit yes I've removed many files11:24
cbreak then commit11:24
this will commit the removal11:24
igli yeah give filenames to git add, and then review what you're going to commit with: git diff --staged11:24
cbreak and it will resolve the conflict11:24
comps wouldn't that be git add -u ?11:24
igli git add -p is nice.11:25
cbreak you can use that too11:25
← bluesm left11:25
→ blackmesa joined11:25
igli much better than rebasing11:25
← watermel0n left11:26
igli hmm -u looks handy11:26
← petey left11:26
→ Hounddog joined11:27
igli removes files as well to match tree. more of a sync. if the file is modified, it'll bail?11:27
terabit You are not currently on a branch. Please specify which11:27
when I do git pull11:27
← yast0804 left11:28
→ yast0804 joined11:28
← yast0804 left11:29
cbreak terabit: yeah11:29
terabit: stop doing stupid things11:29
terabit someone should add git --sync lol,seriously would be nice if git just took care of it11:29
cbreak terabit: finish what you started first11:29
terabit: git rebase --abort11:30
terabit cbreak: nah,fuck you . you don't get to call people stupid because you know something they don't ok.11:31
→ bytefire joined11:31
terabit *shrugs*11:31
← terabit left11:31
cbreak terabit: if you do stupid things, you do stupid things11:31
don't try to pretend they are not stupid because you don't know they are stupid11:31
some people really are unfriendly11:32
← sq-one left11:32
→ dobalina joined11:32
cbreak you'll have to learn how git works or you'll not be able to use it.11:32
bremner s/he left....11:33
cbreak hmm. alright. Too bad for ... not us :D11:33
→ pfFredd joined11:34
← SorenHolm left11:36
← zequence left11:37
→ Gavrisimo joined11:37
→ harobed_ joined11:38
→ Gavrisimooo joined11:39
→ afuentes joined11:40
← Gavrisimo left11:42
→ sq-one joined11:42
igli hehe11:43
← Gavrisimooo left11:43
→ RofricTheBearded joined11:44
← khmarbaise left11:44
→ khmarbaise joined11:45
← rchavik left11:45
→ makara joined11:49
← bytefire left11:50
→ mrpink joined11:51
bremner git needs a clippy: "Hi there, you seemed to be blinded by rage at the moment. Ignoring all input for a while, I suggest you go for a walk"11:55
← unsignedint left11:55
→ pnkbst joined11:55
→ unsignedint joined11:55
→ shruggar joined11:55
← Leoneof left11:56
→ freestyl3r joined11:56
← khmarbaise left11:57
← harobed_ left11:58
→ zequence joined11:59
→ juliohm joined11:59
← juliohm left11:59
→ juliohm joined11:59
← albioner left12:00
← pnkbst left12:00
→ zumba_addict joined12:01
→ simesy joined12:01
→ khmarbaise joined12:01
→ endiruna joined12:02
← khmarbaise left12:03
← simesy left12:06
← ghostlines left12:06
→ Leoneof joined12:08
← jagob left12:10
← cbreak left12:10
← shinnya left12:10
→ jagob joined12:11
CareBear\ I think that will help12:11
it reminds me of the animated gif with the person banging his hands against the keyboard12:12
and the keyboard wins12:12
→ SorenHolm joined12:12
→ kevinold joined12:13
← jagob left12:15
→ cbreak joined12:15
→ tonythomas joined12:15
→ jagob joined12:16
→ amcsi joined12:16
→ shinnya joined12:16
nullie heh12:18
← Macaveli left12:18
← RagBal left12:18
← pfFredd left12:18
← kevinold left12:18
→ pfFred joined12:18
← yaw left12:18
← SorenHolm left12:19
→ SorenHolm joined12:20
← cbreak left12:21
→ suffice joined12:23
→ edvard_ joined12:24
→ RagBal joined12:25
← koell left12:27
← dieter left12:28
→ cbreak joined12:28
→ ghostlines joined12:28
← ghostlines left12:28
→ ghostlines joined12:28
← robbyoconnor left12:29
→ Macaveli joined12:29
← ghostlines left12:29
→ ghostlines joined12:29
→ mikepack joined12:30
→ robbyoconnor joined12:31
→ mribeirodantas joined12:32
← hholtmann left12:34
← mikepack left12:34
→ Dudi joined12:35
← lynzt left12:37
← sq-one left12:38
← blackmesa left12:38
← anry left12:39
→ Gavrisimo joined12:39
→ rjhunter joined12:40
← JerryT left12:40
← wethu left12:42
← Gavrisimo left12:44
← rjhunter left12:44
← shruggar left12:45
→ Kayra joined12:46
→ kotopies joined12:46
→ nnyk joined12:47
← kotopies left12:48
← Dudi left12:48
← juliohm left12:50
← Macaveli left12:50
← kriks left12:52
← Kayra left12:52
← dobalina left12:52
→ Kayra joined12:52
← Leucomelas left12:55
→ ignas joined12:55
← beautifulmind left12:55
→ mizu_no_oto joined12:56
→ pnkbst joined12:56
← Kayra left12:57
← ClarusCogitatio left12:57
→ Leucomelas joined12:58
← moberberger left12:59
→ ket1v joined12:59
→ koell joined13:00
← nick108 left13:00
→ ClarusCogitatio joined13:01
→ sohail joined13:01
← jgoss left13:02
← pnkbst left13:02
← ket1v left13:03
← crystal77 left13:06
← ClarusCogitatio left13:06
Nevik bremner: that's a pretty good idea13:06
← noxd left13:06
→ y_nk joined13:06
← y_nk left13:06
→ ClarusCogitatio joined13:07
→ Gamecubic joined13:08
→ kriks joined13:09
← ghostlines left13:09
→ Kayra joined13:09
→ aboudreault joined13:12
← nnyk left13:14
→ kevinold joined13:14
→ johnkevinmbasco joined13:15
→ Balliad joined13:16
← Balliad left13:16
→ jgoss joined13:16
→ Balliad joined13:16
← EClaesson left13:17
→ p8952 joined13:17
→ johnkevi_ joined13:18
→ AccessibleWeb joined13:18
← kevinold left13:19
← sohail left13:20
← conan left13:20
← AccessibleWeb left13:20
← Devastatr left13:20
→ Devastatr joined13:20
Devastatr → Devastator13:20
→ korbelz joined13:21
← johnkevinmbasco left13:21
→ conan joined13:21
← konadr left13:21
→ petey joined13:23
→ highball joined13:23
→ Accessib_ joined13:23
→ netcarver joined13:24
← raj__ left13:26
← Accessib_ left13:26
← petey left13:27
→ pantsman- joined13:27
← pantsman left13:28
← ignas left13:28
← johnkevi_ left13:28
→ johnkevinmbasco joined13:29
→ bluesm joined13:29
← robbyoconnor left13:30
→ tomengland joined13:32
← w0ng left13:32
→ w0ng joined13:32
→ CKyle joined13:34
← chamunks left13:34
→ simesy joined13:34
← jluc left13:34
← DoniRS left13:36
← danillonunes left13:36
← tomengland left13:36
→ crystal77 joined13:36
→ chamunks joined13:38
← SorenHolm left13:38
← simesy left13:39
→ hkj joined13:39
→ SorenHolm joined13:39
→ AccessibleWeb joined13:39
← AccessibleWeb left13:40
→ Gavrisimo joined13:40
→ rjhunter joined13:41
→ marcjs joined13:41
← SorenHolm left13:41
→ raj__ joined13:42
← AbiBuccaneer left13:43
→ sohail joined13:44
← Gavrisimo left13:45
← koell left13:45
← rjhunter left13:45
→ khmarbaise joined13:47
→ carbon joined13:48
← mizu_no_oto left13:48
→ JerryT joined13:49
→ lithiumjake joined13:50
← gry left13:53
→ noxd joined13:57
→ prophile joined13:57
→ chadi joined13:58
← johnkevinmbasco left13:59
→ CodeShark joined13:59
← doev left13:59
← Orbitrix left14:00
← vadviktor left14:03
← Tuna-Fish left14:03
← ndim left14:03
← noneo left14:03
← rawtaz left14:03
← blast_hardcheese left14:03
← mf_ left14:03
← rj11 left14:03
← Spamoi left14:03
← bbloom left14:03
← konr_ left14:03
← skelterjohn left14:03
← mattcen left14:03
← iron_houzi left14:03
← awx left14:03
← Rhonda left14:03
← wizonesolutions left14:03
← esto left14:03
← Foxhoundz left14:03
← jpalmer left14:04
← ilteris left14:04
← sae left14:04
← Garen left14:05
→ JonasF joined14:05
→ wizonesolutions joined14:05
← wizonesolutions left14:05
→ wizonesolutions joined14:05
→ apanek joined14:05
→ GyrosGeier joined14:05
→ igalic joined14:05
← igalic left14:05
→ igalic joined14:05
→ jpalmer joined14:06
→ neurodamage joined14:06
→ Rh0nda joined14:06
→ przemkovv joined14:06
→ BaNzounet joined14:06
→ noneo joined14:06
→ boz_v1 joined14:06
→ PerlJam joined14:06
→ totokaka joined14:06
→ Phlogistique joined14:06
→ Diziet joined14:06
→ Sajbar joined14:06
→ Remram joined14:06
→ Foxhound1 joined14:06
→ guardian joined14:06
→ Spockz joined14:06
→ meatmanek joined14:06
→ surfsue joined14:06
→ d1b joined14:06
→ synfin joined14:07
→ leptonix joined14:07
→ max_weller joined14:07
→ mattp joined14:07
→ Orginator joined14:07
→ Samual joined14:07
→ syst3mw0rm joined14:07
← Samual left14:07
→ Samual joined14:07
→ aca20031 joined14:07
→ esto joined14:07
→ FUZxxl joined14:07
→ qkaiser joined14:07
→ rawtaz joined14:07
→ ballock joined14:07
→ murosai joined14:07
→ abec0 joined14:07
→ lu_zero joined14:07
→ rj11 joined14:07
← lu_zero left14:07
→ lu_zero joined14:07
→ flexo_ joined14:07
→ imMute joined14:07
→ dalias joined14:07
→ mf_ joined14:07
→ masak joined14:07
→ benbergman joined14:08
→ potteratt joined14:08
→ AivarasK joined14:08
→ edude03 joined14:08
→ icarus joined14:08
→ RTG` joined14:08
→ titusjose_______ joined14:08
→ mancha joined14:08
→ causasui joined14:08
→ mattp_ joined14:08
→ Corey joined14:08
→ graphitemaster joined14:08
→ skelterjohn joined14:08
→ helgikrs joined14:08
→ napcae joined14:08
→ jojva joined14:08
→ juri_ joined14:08
→ ToothlessGear joined14:08
→ milian joined14:08
→ ndim joined14:08
→ ska-fan joined14:08
→ place joined14:09
→ Tuna-Fish joined14:09
→ leafwiz joined14:09
→ Spamoi joined14:09
→ da5id joined14:09
→ iron_houzi joined14:09
→ monty joined14:09
← skelterjohn left14:09
→ skelterjohn joined14:09
→ ghoti joined14:09
→ cian1500ww joined14:09
surfsue → surfdue14:09
→ dsockwell joined14:09
→ soren joined14:09
→ jtoy joined14:09
→ mitz joined14:09
→ floppyears joined14:09
→ pasky joined14:09
→ Hamled joined14:09
→ GodEater joined14:09
→ bhek joined14:09
→ jeffhung joined14:09
→ jlewis joined14:09
→ WACCCRL joined14:09
← titusjose_______ left14:09
→ titusjose_______ joined14:09
→ OnkelTem joined14:09
→ s0beit joined14:09
→ awx joined14:09
← floppyears left14:09
→ floppyears joined14:09
→ Evanlec joined14:09
→ Chaser joined14:09
→ loglaunch joined14:09
← GodEater left14:09
→ GodEater joined14:09
→ Will| joined14:09
→ brisbin joined14:09
→ Gizmokid2005 joined14:09
→ chrisward joined14:09
→ myme joined14:09
→ synfinatic joined14:09
→ thelamest joined14:09
→ rnea joined14:10
→ Atlantic777 joined14:10
→ phantomcircuit joined14:10
→ GameGamer43 joined14:10
mf_ → Guest5732614:10
← CodeShar_ left14:10
← GameGamer43 left14:10
→ GameGamer43 joined14:10
→ jtrucksclone joined14:10
→ jtrucks joined14:10
→ knittl joined14:10
← knittl left14:10
→ knittl joined14:10
→ vpl joined14:10
→ EvanDotPro joined14:10
→ ivan joined14:10
→ RichiH joined14:10
→ jokajak joined14:10
→ Nugget joined14:10
→ lb joined14:10
→ Davey joined14:10
→ __class__ joined14:10
Gizmokid2005 → Guest9085414:10
← lb left14:10
→ lb joined14:10
→ spaceone joined14:11
→ ivan` joined14:11
→ __main__ joined14:11
→ philp joined14:11
→ sae joined14:11
→ konr_ joined14:11
→ Zariel joined14:11
→ hagabaka joined14:11
→ deavid joined14:11
→ vadviktor joined14:11
→ eregon joined14:11
→ AndreSomers joined14:11
→ roger_raymond joined14:11
→ Silex^^ joined14:11
→ Kabaka_ joined14:11
gitinfo set mode: +v14:11
→ coopsh joined14:11
← korbelz left14:11
→ Derega joined14:11
→ flexd joined14:12
→ ItSANgo joined14:12
→ ItSANgo_ joined14:12
→ nicksloan joined14:12
→ ThomasKaufmann joined14:12
→ jcarouth joined14:12
→ ilteris joined14:12
← ItSANgo_ left14:12
→ Orbitrix joined14:12
← Orbitrix left14:12
→ akheron joined14:12
→ knuth joined14:12
→ savid joined14:12
→ Garen_ joined14:12
→ zivester joined14:12
→ chiromante joined14:12
→ harv joined14:12
→ foo__ joined14:12
→ esc joined14:12
← esc left14:12
→ esc joined14:12
→ rs0 joined14:12
→ Kuukunen joined14:13
foo__ → Guest5266014:13
→ xxtjaxx joined14:13
← xxtjaxx left14:13
→ xxtjaxx joined14:13
→ Orbitrix joined14:13
← Orbitrix left14:13
→ Orbitrix joined14:13
→ jonmasters joined14:13
← darnir_ left14:13
→ ubuntu__ joined14:13
→ howlymowly_ joined14:13
← zivester left14:13
→ nnyk_ joined14:13
→ mattcen joined14:13
← szx left14:13
→ aard_ joined14:13
→ blast_hardcheese joined14:14
→ Favorett1 joined14:14
← kirin` left14:14
→ bremner` joined14:14
← bremner` left14:14
→ bremner` joined14:14
← john2x left14:14
→ suffice_ joined14:14
→ kirin` joined14:14
→ e^0 joined14:14
→ ehmatthes joined14:14
← suffice_ left14:14
→ weltall2 joined14:14
→ cworth joined14:14
→ bartek_ joined14:14
← Fullma left14:14
← Khisanth left14:15
← howlymowly left14:15
← suffice left14:15
← Guest43374 left14:15
← LotR left14:15
← hesco left14:16
→ Fullma joined14:16
→ dilfridge joined14:16
→ kevinold joined14:16
→ Khisanth joined14:16
← freeman42 left14:16
← asedeno left14:16
← wolog left14:16
← dc5ala left14:16
← Hounddog left14:16
← dcpc007 left14:16
← HicksD_ left14:16
← aboudreault left14:16
→ hesco joined14:16
← bremner left14:16
← weltall left14:16
→ suffice joined14:16
weltall2 → weltall14:17
→ dc5ala joined14:17
→ aboudreault_ joined14:17
→ freeman42 joined14:17
→ dcpc007 joined14:17
→ Hounddog joined14:17
→ HicksD joined14:17
→ chronos joined14:17
← dc5ala left14:18
→ mikepack joined14:18
→ LotR joined14:18
→ asedeno joined14:18
→ wolog joined14:18
→ camt joined14:18
→ kcj joined14:19
← kevinold left14:20
← uidzer0 left14:20
← makara left14:22
← mikepack left14:23
← bgerber left14:23
→ uidzer0 joined14:23
→ lisak joined14:24
lisak hey, how come that I can't do interactive rebase on first 2 initial commits ?14:25
git rebase -i HEAD~214:25
fatal: Needed a single revision14:25
comps you can't do rebase on the first (initial) commit14:25
← fluter left14:26
← Mode-M left14:26
→ EClaesson joined14:26
lisak https://gist.github.com/l15k4/970795514:26
comps that's why I always do something like git commit --allow-empty -m 'init commit' right after initializing a branch/repository14:26
lisak ok, thanks14:26
comps perhaps it's now somehow possible, a lot of my ways is based on v1.4 / v1.5 of git14:27
igli how do i get gitolite to allow me to --force a push on master? (the repo hasn't been pulled, just setting it up.)14:27
→ Goplat joined14:27
igli i don't want to do stuff as root on the server if it'll mess permissions up14:28
hmm guess i can do a chown -R after14:28
comps just make sure to include a "RW+ = youradminacc" line and you won't get "locked out"14:29
the `+' means force push access, IIRC14:29
igli yeah that's in there, but if i push (rebased last 2 commits) i get a hook error14:29
← netcarver left14:29
igli hmm we have that at the top14:30
ahhh14:30
thanks :)14:30
it's only on the gitolite repo14:30
→ frobware joined14:31
← frobware left14:31
→ frobware joined14:31
→ johnkevinmbasco joined14:31
→ tmcmahon joined14:32
← uidzer0 left14:33
→ simesy joined14:35
← tmcmahon left14:38
← simesy left14:39
→ Gavrisimo joined14:41
← crystal77 left14:42
← lithiumjake left14:44
← Gavrisimo left14:45
→ bbloom joined14:46
→ tavl joined14:47
← Hounddog left14:49
→ lithiumjake joined14:49
→ Hounddog joined14:50
← Vampire0_ left14:50
osse lisak, comps: git rebase --root14:52
lisak osse, there are still those 2 first commits14:54
it did something, but I don't see any difference14:54
→ linduxed joined14:55
→ yhager joined14:56
osse lisak: the number of commits won't change unless you squash or delete some14:57
lisak well I wanted to squash the second commit into the first one14:57
the initial one14:57
→ Dudi joined14:57
flazz_gone → flazz14:58
← Sonderblade left14:58
cbreak lisak: no point using rebase for that14:59
→ ferreum158 joined14:59
cbreak lisak: just git reset --soft firstcommit14:59
git commit --amend14:59
done14:59
← ClarusCogitatio left15:00
→ ClarusCogitatio joined15:00
→ ket1v joined15:00
← m0viefreak left15:00
→ jave joined15:01
← Dudi left15:01
← ferreum left15:02
← Kayra left15:03
← tavl left15:03
→ Kayra joined15:03
→ toomanysecrets_ joined15:04
← kcj left15:04
→ printForever joined15:05
← ket1v left15:05
gitinfo set mode: +v15:05
printForever hello guys, I'm looking for twitter bootstrap channel15:05
or anything related to jQuery15:06
→ daedeloth joined15:06
cbreak why?15:06
jon-mac so you look in #git?15:06
← toomanysecrets left15:07
printForever @jon-mac, good place as any15:07
anyway, found it15:07
cbreak printForever: have you heard of alis?15:07
← aberrant left15:07
cbreak printForever: /msg alis help15:08
printForever @cbreak alis?15:08
@cbreak, yeah, found it15:08
took some time to list15:08
← Kayra left15:08
cbreak there are many channels on this network15:09
→ godgodgodgo joined15:09
← ayaz left15:10
← printForever left15:10
← ehmatthes left15:10
→ watermel0n joined15:12
→ dagnachew joined15:12
→ MagneticDuck joined15:13
arvind_k → zoso15:13
MagneticDuck uhm, quick question: how do I tell git to scan a directory structure and add everything except what the .gitignore forbids adding?15:13
→ teran joined15:13
jon-mac MagneticDuck: git add -a i think15:15
canton7 `git add directory`15:15
→ GT4066 joined15:15
canton7 also learn what add -A and add -u do15:15
← Leoneof left15:16
→ kevinold joined15:16
← aboudreault_ left15:17
→ aboudreault joined15:17
→ Dougie187 joined15:18
← pikaren left15:18
← igli left15:18
→ cads joined15:19
→ jeffreylevesque_ joined15:19
← yhager left15:19
← lisak left15:20
← kevinold left15:20
→ crystal77 joined15:21
→ Rastus_Vernon joined15:22
→ I547B547 joined15:22
← watermel0n left15:22
→ User458764 joined15:23
← LtCrData left15:23
→ Leoneof joined15:23
→ ErKa joined15:23
→ petey joined15:23
→ NaStYdoG joined15:23
→ abrkn joined15:25
← I547B547 left15:25
→ Sonderblade joined15:25
→ jrahmy joined15:26
→ patricknegri joined15:27
← patricknegri left15:27
← linduxed left15:27
← petey left15:28
→ ehmatthes joined15:30
bremner` → bremner15:30
← kpreid left15:30
→ kpreid joined15:31
→ bgerber joined15:32
→ sysvalve joined15:32
sysvalve hi15:32
→ AbiBuccaneer joined15:32
→ Kayra joined15:34
→ Noldorin joined15:34
→ LtCrData joined15:34
→ simesy joined15:35
← jrahmy left15:36
← Kayra left15:38
→ jnavila joined15:38
→ rento joined15:40
→ dobalina joined15:40
← chiromante left15:40
→ petey joined15:42
→ ghostlin_ joined15:42
→ rjhunter joined15:43
→ Gavrisimooo joined15:43
← simesy left15:43
← flaguy48 left15:47
← makubi left15:47
← Gavrisimooo left15:48
← rjhunter left15:48
→ kukks joined15:48
← kukks left15:48
→ kukks joined15:48
→ pfg joined15:48
→ darnir_ joined15:49
→ makubi joined15:49
→ nick108 joined15:49
→ digifiv5e joined15:50
→ Kayra joined15:50
digifiv5e → Guest9308515:50
→ chiromante joined15:53
→ nilg joined15:53
← Kayra left15:55
← jeffreylevesque_ left15:57
→ SorenHolm joined15:57
→ ayaz joined15:57
← ayaz left15:58
→ flaguy48 joined15:58
← xsbeats left15:59
→ arietis joined15:59
→ mizu_no_oto joined15:59
← NaStYdoG left16:00
→ jaequery joined16:00
← jaequery left16:00
← EClaesson left16:00
← eletuchy left16:00
→ jaequery joined16:00
← cagedwisdom left16:00
→ eletuchy joined16:00
→ m0viefreak joined16:01
← sohail left16:02
→ Dudi joined16:02
← mizu_no_oto left16:03
← shinnya left16:04
← maroloccio left16:04
← eletuchy left16:05
→ watermel0n joined16:05
→ mikepack joined16:06
← ehmatthes left16:06
→ mikemar10 joined16:07
← mikemar10 left16:07
→ sohail joined16:09
← cads left16:09
← sohail left16:09
→ sohail joined16:09
→ jceb joined16:09
→ AccessibleWeb joined16:10
← jnavila left16:10
← petey left16:10
← mikepack left16:10
→ sgambino joined16:10
→ petey joined16:11
→ bmouad joined16:11
← dagnachew left16:13
→ Lemony joined16:13
← mribeirodantas left16:13
→ mribeirodantas joined16:15
→ dagnachew joined16:15
← hobodave left16:15
← jaequery left16:15
→ einonm joined16:15
← petey left16:15
→ hobodave joined16:16
→ kevinold joined16:17
← hobodave left16:17
→ hobodave joined16:18
← hobodave left16:18
→ hobodave joined16:18
← hobodave left16:18
→ Gavrisimo joined16:18
→ hobodave joined16:19
← nick108 left16:19
→ herdingcat joined16:20
← kevinold left16:21
→ maroloccio joined16:21
← sohail left16:22
→ n-st joined16:22
← hobodave left16:24
→ doev joined16:24
→ jnavila joined16:24
→ chris_thomson joined16:25
→ jnavila_ joined16:27
← jnavila left16:27
→ eaj joined16:27
← jnavila_ left16:30
→ jnavila__ joined16:31
← johnkevinmbasco left16:31
← Leoneof left16:31
→ cads joined16:32
← dagnachew left16:32
→ Leoneof joined16:32
→ dagnachew joined16:33
← Leoneof left16:33
→ tomengland joined16:34
← arietis left16:35
← Gavrisimo left16:35
→ montyboy joined16:36
→ Leoneof joined16:36
← Leoneof left16:37
→ acharlieh joined16:37
← tomengland left16:39
→ Leoneof joined16:39
← shingshang left16:39
→ simesy joined16:40
← AccessibleWeb left16:40
→ ezekielnoob joined16:41
← kukks left16:41
→ lisak joined16:41
← sgambino left16:42
→ blackmesa joined16:42
→ jcvfen joined16:42
→ saad_ joined16:42
User458764 → User458764_NotHe16:42
← cads left16:42
← saad_ left16:43
← Hounddog left16:43
← User458764_NotHe left16:43
← Leoneof left16:44
← simesy left16:44
→ rjhunter joined16:45
← CKyle left16:45
← MagneticDuck left16:45
← carbon left16:45
← jceb left16:47
→ seemeplay joined16:47
← hkj left16:48
← jnavila__ left16:49
← montyboy left16:49
→ jnavila__ joined16:49
→ Kayra joined16:49
← rjhunter left16:49
→ CKyle joined16:49
→ hahuang65 joined16:50
→ oojacoboo joined16:50
← Kayra left16:50
→ Kayra joined16:51
→ Silmarilion joined16:52
← jnavila__ left16:53
→ AccessibleWeb joined16:53
→ jnavila__ joined16:53
→ fr33 joined16:54
← chamunks left16:54
← hahuang65 left16:54
← Kayra left16:54
← herdingcat left16:55
← nnyk_ left16:56
flazz → flazz_gone16:57
→ nnyk_ joined16:57
→ cads joined16:57
→ greyfox joined16:58
greyfox → Guest3598516:58
→ chamunks joined16:58
gitinfo set mode: +v16:59
jnavila__ → jnavila16:59
← jnavila left16:59
→ jnavila joined16:59
← teran left17:00
→ Adam_Cameron_ joined17:00
→ kukks joined17:00
→ eletuchy joined17:01
← fr33 left17:01
→ ket1v joined17:01
→ MagneticDuck joined17:01
→ maqr joined17:02
← nnyk_ left17:02
→ therealGent joined17:03
→ fr33 joined17:03
→ blackmes1 joined17:03
← acharlieh left17:04
← chamunks left17:04
← oojacoboo left17:04
→ vurma joined17:04
← ket1v left17:06
← eletuchy left17:06
← raj__ left17:06
← blackmesa left17:06
→ Gavrisimo joined17:06
← AccessibleWeb left17:06
→ bobkosse_ joined17:07
← maqr left17:07
→ Gavrisimooo joined17:08
→ chamunks joined17:08
→ AccessibleWeb joined17:08
→ bobkosse joined17:09
← vurma left17:10
← Gavrisimo left17:11
← khmarbaise left17:11
→ khmarbaise joined17:11
← bobkosse_ left17:11
→ Leoneof joined17:12
← Gavrisimooo left17:12
→ jstimm joined17:13
← Leoneof left17:13
→ Leoneof joined17:13
→ Cornelio joined17:14
← darnir_ left17:14
→ ArcTanSusan joined17:15
← Leoneof left17:15
→ tanaro joined17:16
→ Leoneof joined17:16
→ koda joined17:16
→ sdfdfgfh joined17:17
← Leoneof left17:17
← bobkosse left17:17
→ kevinold joined17:17
← tanaro left17:18
← bbloom left17:18
← eaj left17:18
→ raj__ joined17:18
← watermel0n left17:19
→ eaj joined17:19
← sdfdfgfh left17:19
→ bwreilly joined17:20
← ghostlin_ left17:20
→ Leoneof joined17:22
← kevinold left17:22
Keridos_off → Keridos17:22
→ philipd joined17:23
← Leoneof left17:23
← eaj left17:23
→ Leoneof joined17:24
← Leoneof left17:25
→ yhager joined17:25
→ Leoneof joined17:26
← Leoneof left17:27
→ goTAN joined17:27
→ hahuang65 joined17:27
→ eletuchy joined17:27
→ Leoneof joined17:28
← crystal77 left17:31
← eletuchy left17:32
← bwreilly left17:32
→ danillonunes joined17:32
← cads left17:33
← hahuang65 left17:35
← m8 left17:35
→ hkj joined17:35
← AccessibleWeb left17:37
→ cads joined17:37
← Foxhound1 left17:39
→ mika joined17:39
→ simesy joined17:41
→ darnir_ joined17:41
← CKyle left17:41
→ wongon joined17:41
→ bobkosse joined17:41
← highball left17:41
← jnavila left17:42
← noxd left17:42
← deuti left17:43
→ starkhalo joined17:44
→ codezomb joined17:44
← bluesm left17:45
← simesy left17:45
→ ojacobson joined17:45
← freestyl3r left17:45
→ sambae joined17:46
← MagneticDuck left17:47
→ tfnico joined17:48
← starkhalo left17:48
→ Kayra joined17:50
→ koell joined17:51
→ system64 joined17:53
→ ni291187 joined17:54
← doev left17:54
→ mikepack joined17:54
→ rath joined17:54
← Kayra left17:55
← ni291187 left17:55
← lithiumjake left17:57
→ dc5ala joined17:58
← daedeloth left17:59
← mikepack left17:59
→ daito joined18:01
→ chiemseesurfer joined18:02
→ crystal77 joined18:02
→ thiago joined18:02
← Dudi left18:02
→ User458764 joined18:03
→ el3ctron_ joined18:03
→ Mode-M joined18:04
→ yecril71pl joined18:04
→ highball joined18:05
→ CKyle joined18:07
→ Gavrisimo joined18:09
→ ningu joined18:09
→ cllamas joined18:09
← kermit left18:09
← daito left18:09
ningu say someone just pushed 2-3 commits to remote master making problematic changes, and these conflict with changes I've made in my local master. I'd like to have my local master win out over the remote version and not merge in *any* of those changes.18:10
how do I do that?18:10
← graphitemaster left18:10
→ graphitemaster joined18:10
ningu i.e. even changes that can be merged.18:10
← Goplat left18:11
milki you need to do all that locally18:11
→ felipewm joined18:11
ningu sure18:11
but how?18:11
Guest57326 → mf_18:11
milki uh18:11
|Zz| ningu: so what do you want to happen with those remote changes?18:11
milki pull in those changes and !fixup18:12
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!18:12
→ petey joined18:12
ningu |Zz|: they can either be deleted or overwritten by new commits18:12
that restore to how it was18:12
|Zz| you want to overwrite the remote master with your own? or only to "ignore" locally its changes18:12
milki or force push18:12
ningu no, I want to overwrite the remote master18:12
it's fine if the commits stay in the history18:13
as long as my push results in them being rewritten back to how things were18:13
← Gavrisimo left18:13
|Zz| Hmm.. not sure but I guess that some kind of rebase --onto would do it...18:13
lemme check18:13
← crystal77 left18:14
→ crystal77 joined18:15
→ albioner joined18:15
ningu alternatively, maybe I can stash my changes and then do git revert a couple times18:15
← crystal77 left18:15
← petey left18:16
→ fragamus joined18:17
→ tomengland joined18:17
→ kevinold joined18:18
→ glitter joined18:18
→ eaj joined18:19
gitinfo set mode: +v18:19
glitter how to clone an existing project from github using git gui?18:20
→ shruggar joined18:20
→ jnavila joined18:20
HedgeMage glitter: This is not the github channel, hon, it's the git channel.18:20
← rath left18:21
glitter HedgeMage: I know. I just want to know how to use git gui..18:21
HedgeMage glitter: There are a bazillion git guis, you haven't even told us which one you are referring to.18:21
kadoban glitter: you clone from github pretty much exactly how to clone from anything else...i dont particularly know how you'd do that in whatever GUI, but it shouldn't be too hard to find18:21
osse HedgeMage: probably the one that starts when you type 'git gui' in the terminal18:21
← glitter left18:22
HedgeMage kadoban++18:22
osse: 'git gui' is not a core git command, and there are many git guis out there...how am I supposed to know WTF he was talking about?18:22
← kevinold left18:23
osse HedgeMage: https://github.com/git/git/tree/master/git-gui18:23
← eaj left18:23
→ Voyage joined18:24
← marcjs left18:24
rento Custom view com/sj/mazerace/game/LevelView is missing constructor used by tools: (Context) or (Context,AttributeSet) or (Context,AttributeSet,int) // is that something to care about?18:24
only my own class should ever call this constructor18:24
kadoban wrong channel?18:25
rento yes sorry18:25
← e^0 left18:26
→ Rolybrau joined18:27
→ eletuchy joined18:28
← Leoneof left18:28
← raj__ left18:29
← therealGent left18:30
← lisak left18:30
← ningu left18:31
→ Leoneof joined18:32
← eletuchy left18:32
→ maqr joined18:33
← Leoneof left18:33
→ nick108 joined18:33
→ Leoneof joined18:33
← Leoneof left18:35
→ dccc joined18:35
← iamntz left18:36
→ Leoneof joined18:36
← bartman`` left18:38
→ sdouglas joined18:38
← kukks left18:39
← cllamas left18:39
→ jceb joined18:40
→ simesy joined18:41
→ sohail joined18:42
← sohail left18:42
→ sohail joined18:42
→ Gizburdt joined18:42
→ kermit joined18:42
← wongon left18:42
→ robert45 joined18:43
← bmouad left18:43
→ invinceable joined18:43
→ lisak joined18:43
← albioner left18:43
→ petey joined18:43
robert45 bremner still here?18:44
→ lithiumjake joined18:45
← prophile left18:45
→ wabash joined18:45
→ doev joined18:45
← simesy left18:46
wabash Crap! I just did something careless, and I need help fixing it:18:46
I had a bunch of changes stashed so I could fix something underlying. I made the change and added it, but *forgot* to commit it before git stash pop!!!! And there's a merge conflict between the index and the WD!18:46
So, how do I fix this without loosing what I just unstashed?18:46
← User458764 left18:47
← _iron left18:47
→ anry joined18:47
← jceb left18:47
cbreak wabash: the stash is still there18:47
it is not dropped in case of conflicts18:47
wabash: see git stash list18:47
(or git stash show)18:47
→ rjhunter joined18:48
offby1 let loose the hounds18:48
wabash: have you tried !gka ?18:48
gitinfo wabash: For a better way to view the reflog, try: gka() { gitk --all $(git log -g --format="%h" -50) "$@"; }; gka18:48
offby1 that _might_ show you your old stash18:48
cbreak you can resolve the merge by either discarding or keeping the stash changes18:48
wabash offby1 is this like gitk?18:48
→ jceb joined18:48
wabash cbreak: Ok, thakns. Looking now.18:48
robert45 hi guys, can someone tell me why Im getting this error: "unracked working tree file public/cases/cas/big/Cas3.png" would be overwritten by me merge. Aborting" I already removed the file and tried again, still the same error18:49
cbreak robert45: you sure you removed it?18:50
wabash cbreak: How do I see what the state of the index is compared to the repo? git diff --cached is the only way?18:50
offby1 wabash: yes. I just tried it, and it doesn't seem to resurrect the stash :-(18:50
→ mueslo joined18:50
cbreak wabash: sure.18:50
→ Kayra joined18:50
cbreak offby1: it's not dropped in the first place18:50
← yhager left18:50
offby1 cbreak: I thought it was -- wabash said he "popped", and when I did "git stash pop", I saw a message about it being dropped18:51
ah, but there's a conflict18:51
robert45 cbreak I think so yeah, git status shows # deleted: public/cases/cas/big/Cas3.png18:52
← rjhunter left18:52
cbreak robert45: that'd not be an untracked file18:52
it's a tracked file18:52
wabash offby1: Ok, got that problem solved. Thanks too, cbreak18:53
cbreak it just means that you stop tracking it18:53
robert45 cbreak not sure if I understood, could you please explain? Im kind of new here18:53
cbreak wabash: great :)18:53
robert45: you have a file.18:53
it is called Cas3.png18:53
git was tracking it18:53
you removed it from tracking, so it shows up as deleted in status18:53
but it is still in the file system18:53
wabash offby1: cbreak: so now there's an additional merge conflict. I stash popped, and it looks like it's got a plain old merge conflict. Is the right way to handle this with "git merge-tool"?18:53
cbreak robert45: that's my hypothesis based on your witness statements so far18:54
robert45 cbreak so what should I do?18:54
cbreak robert45: delete the file18:54
robert45: or rename it if you want to keep it18:54
← howlymowly_ left18:54
cbreak robert45: do you want to delete the file in the history going on from now?18:55
← Kayra left18:55
→ mueslo_ joined18:55
← mueslo left18:55
← jceb left18:55
robert45 cbreak I think I deleted it already. I have deleted manualy from localhost directory18:55
← invinceable left18:56
sysvalve robert45: I think that you need to git rm it18:56
not just rm it18:56
cbreak robert45: localhost is not relevant18:56
robert45: the public/cases/cas/big directory is18:56
robert45: look at that directory's contents18:56
robert45 ok, hold on18:56
cbreak with ls for example18:56
sysvalve either you need to commit the deletion or delete it from the index18:57
→ AccessibleWeb joined18:57
→ akim_ joined18:58
→ ctp joined18:59
→ snuffeluffegus joined19:00
← yacks left19:00
→ ket1v joined19:02
→ stack joined19:03
← khmarbaise left19:03
wabash offby1 cbreak: is this right?19:04
← goTAN left19:04
← bgerber left19:04
cbreak wabash: is what right?19:05
a merge conflict is what one would expect19:05
stack hello, I'm in a moment of git wtf, I have a remote repo where I only push, only fast forward, now I tried to push again and it told me that "Updates were rejected because the tip of your current branch is behind ..." , I pulled and the diff is empty, also in magit I saw the unpulled commit and I recognised the commit message of the one before the local HEAD, what happened?19:05
← Voyage left19:05
milki uh19:05
← Leoneof left19:06
osse stack: you "pulled and the diff is empty". How did you verify that? git show? That won't show diffs for merges19:06
cbreak stack: !lol19:06
gitinfo stack: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all19:06
milki can you paste a !lol HEAD @{u}19:06
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all19:06
← ket1v left19:06
cbreak please pastebin it.19:06
stack git diff HEAD^19:06
or » git diff e68cccb363ccbc2e6b2a53f8da4a63abeae37e56 80ac8964da4090c1d9099e2d67936b5b229e0677 | wc -l19:06
wabash cbreak: Right. so git mergetool should fix it?19:06
stack 019:06
cbreak stack: diffs are pointless19:06
→ bgerber joined19:06
cbreak stack: git doesn't care about them here19:07
→ Leoneof joined19:07
cbreak wabash: you should fix it :)19:07
→ freestyl3r joined19:07
cbreak your choice how to do it19:07
wabash cbreak: Right. So mergetool is good. Launches the mergetool. all fixed now.19:07
stack cbreak: so how should I verify that? I mean, It was a push, a local commit, another push(failed because non fast forward complained) , and then i tried pulling, seeing an empty diff19:08
← Leoneof left19:08
cbreak stack: read what we wrote, do what we told you :)19:08
← lithiumjake left19:08
highball → highball-it19:08
→ Leoneof joined19:08
← Noldorin left19:08
stack cbreak: right :)19:09
← snuffeluffegus left19:09
→ Gavrisimo joined19:09
← Leoneof left19:09
offby1 wabash: as you've found, git mergetool is indeed one way to fix merge conflicts19:09
stack cbreak: http://pastebin.com/1jDsTuZV19:10
offby1 wabash: but you can also edit the file by hand, then "git add" it.19:10
→ Leoneof joined19:10
offby1 wabash: I generally use git mergetool for all but the very simplest conflicts; I can't explain why, but it seems to make it easier to understand the conflict19:10
cbreak stack: so you merged two separate lines of history19:10
← ferreum158 left19:10
cbreak stack: now you can git push prod19:10
stack cbreak: how that happened ?19:10
cbreak stack: pull is fetch + merge19:11
← causasui left19:11
cbreak stack: you had a local commit not on the remote19:11
and the remote had a commit you had not19:11
stack I mean, the remote repo is only update by pushing from here19:11
→ bedahr joined19:11
← Leoneof left19:11
cbreak stack: you seem to have done something to rewrite history then19:11
stack and it was 2 min from one push to the other19:11
osse stack: did you commit --amend or rebaase -i ?19:11
stack no19:11
cbreak something like git reset, git commit --amend or git rebase19:11
← ArcTanSusan left19:11
→ Leoneof joined19:11
stack oh wait19:11
cbreak stack: but take a look at the two commits19:11
← AccessibleWeb left19:12
cbreak stack: if you want to know what you did, also do a pastebin of git reflog19:12
stack probably I amended, and I need a dinner to get the brain working again19:12
I'll try with the dinner, thanks for everithing :)19:13
← thiago left19:13
→ neo1691 joined19:13
← Leoneof left19:13
→ Leoneof joined19:14
← Gavrisimo left19:14
← Sound left19:15
→ thiago joined19:15
← Leoneof left19:15
robert45 cbreak and sysvalve, I ran "git rm public/cases/cas/big/Cas3.png" but Im still having the same error19:15
dumb qustion, do I need to git commit after git rm?19:15
→ Leoneof joined19:15
cbreak robert45: as I told you19:15
→ mtk joined19:16
cbreak robert45: you need to remove the file19:16
→ AccessibleWeb joined19:16
cbreak robert45: if you want to commit the deletion, then you should commit19:16
wabash offby1 I agree. Especially if you can see side by side.19:16
robert45 cbreak yeah I removed it with git rm instead of removing locally19:16
cbreak robert45: so, have you checked if the file is there?19:16
← Leoneof left19:17
robert45 cbreak how do I do that?19:17
cbreak robert45: go to that directory and LOOK AT IT19:17
robert45: how do you know if a file is there?19:17
→ sgambino joined19:17
← SorenHolm left19:17
cbreak you can use ls19:17
you can use Finder on OS X19:17
robert45 cbreak git ls you mean'19:17
cbreak git ls you mean?19:17
cbreak you can use that Explorer thing on WIndows19:17
robert45: NO19:17
robert45 aah19:17
cbreak robert45: git says the file is untracked19:18
← neo1691 left19:18
→ kevinold joined19:19
robert45 checking19:19
← IVplay left19:20
← AccessibleWeb left19:20
→ Leoneof joined19:22
→ AccessibleWeb joined19:22
← AccessibleWeb left19:22
→ AccessibleWeb joined19:22
→ ArcTanSusan joined19:22
→ SocalNick joined19:22
← Leoneof left19:23
robert45 cbreak no, it doesnt exist, I already removed it locally few hours ago before trying again19:23
← kevinold left19:23
cbreak robert45: then git won't complain about it being untracked and overwritten.19:24
so the error you quoted makes no sense19:24
← oodavid left19:24
← milesmatt left19:24
→ ferreum158 joined19:24
robert45 cbreak Im completely lost, I removed the file with git rm and commit and Im now getting the same error but with another file19:25
cbreak please try it again and pastebin everything, the output and the command you typed19:25
robert45: then that other file exists19:25
robert45 the other file does exist on my system19:25
cbreak then delete it.19:25
robert45: git will not overwrite untracked files19:25
so you have to do that yourself19:25
(because deleting untracked files would be unrecoverable)19:26
you can use git clean of course, but that'd delete every untracked file :)19:26
← yecril71pl left19:26
→ JOAC joined19:27
← Mode-M left19:27
robert45 cbreak wouldnt that be the same if I keep removing them one by one?19:28
cbreak only if all are tracked by the branch you try to merge19:28
well, you can just do a git clean -n19:28
it'll list the files it wants to delete19:28
← blackmes1 left19:28
→ doener joined19:29
← AccessibleWeb left19:29
→ eletuchy joined19:29
→ lithiumjake joined19:29
→ dik_dak joined19:29
→ jdav_gone joined19:30
← ferreum158 left19:31
→ linduxed joined19:31
robert45 cbreak what would you suggest? I removed another one and a new one came out with the same error19:31
cbreak robert45: depends on what you want to do19:32
it's your choice19:32
you evidently have untracked files the other side also seems to have19:32
robert45 cbreak how can I get a new clone of the repo, I think that will help me19:33
cbreak with git clone19:33
← eletuchy left19:34
cbreak you can clone your local repository and then git remote add your current remote too19:34
if you want to save time19:34
← lisak left19:35
→ kukks joined19:35
← sohail left19:36
← felipewm left19:37
→ watermel0n joined19:38
→ rjhunter joined19:38
← ArcTanSusan left19:38
→ sohail joined19:39
← sohail left19:39
→ sohail joined19:39
→ LeMike1 joined19:39
→ crystal77 joined19:39
← sysvalve left19:40
← raven-au left19:40
← snql|bad_interne left19:41
← cads left19:41
→ PierrickB joined19:41
→ simesy joined19:42
→ mikepack joined19:42
← SocalNick left19:42
→ ArcTanSusan joined19:43
← nick108 left19:43
← rjhunter left19:43
→ ferreum158 joined19:44
→ raven-au joined19:45
← simesy left19:46
← mikepack left19:47
→ neo1691 joined19:49
→ AccessibleWeb joined19:50
→ _iron joined19:50
← neo1691 left19:50
→ neo1691 joined19:52
← Praise left19:53
← dagnachew left19:54
← neo1691 left19:57
← AccessibleWeb left19:58
→ TheCleanGame joined19:59
→ neo1691 joined19:59
← Silmarilion left19:59
← SilverBln left20:00
← n-st left20:00
→ hholtmann joined20:02
→ smoke2 joined20:02
→ Silmarilion joined20:03
← hholtmann left20:03
← JOAC left20:03
→ Kayra joined20:04
← TheCleanGame left20:04
→ gnugnu9_ joined20:04
← gnugnu9 left20:04
← watermel0n left20:05
→ bwreilly joined20:06
→ Praise joined20:07
→ fluter joined20:07
→ kotopies joined20:07
fluter hi, how can I set submodule to only a specific revision?20:08
← steverandy left20:08
fluter I don't wanna be head of a submodule20:08
grawity pinning to a specific revision is already how submodules work by default20:08
gnugnu9_ → gnugnu920:08
← sohail left20:09
fluter grawity, with what command, now each time I run git submodule update, it pulls to the head of upstream20:09
→ Gavrisimo joined20:10
cbreak fluter: no20:11
fluter: it gets you the commit that is recorded in your outer repositorie's commit20:11
fluter: if you go into the submodule, you can check out any commit you want20:11
then in the parent, git add submodule20:11
git status should show you that you recorded a new commit (or nothing if it is already recorded)20:11
gitinfo set mode: +v20:12
← Rolybrau left20:12
→ shruggar_ joined20:12
smoke2 hi20:12
gitinfo smoke2: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.20:12
offby1 hi20:12
hey, why don't the bot greet _me_ ?!20:12
_ikke_ offby1: because you're not new20:12
offby1 _ikke_: I was wondering.20:12
smoke2 hi !! i need configure difftool20:12
i use vim like my default editor20:13
← shruggar left20:13
smoke2 and confugure the difftool of git difftool=vimdiff20:13
and works !!20:13
but i use a --servername and --remote-silent for open new buffers on vim20:14
← gancl left20:14
smoke2 so when i run git difftool open's the diff's in a new vim instance20:14
← Gavrisimo left20:14
smoke2 exist a way of use --remote-silent for on my difftool command ?20:15
→ sohail joined20:16
← koell left20:16
→ hobodave joined20:16
arand__ smoke2: I'm not sure about that, but you might want to look into !fugitive if you do want to handle Git a lot from within vim...20:17
gitinfo smoke2: fugitive is a vim plugin that does magic with git, and can be downloaded from https://github.com/tpope/vim-fugitive20:17
smoke2 yea yea20:17
i use it20:17
is really nice20:17
_ikke_ smoke2: yes, set git config difftool.vimdiff.cmd to include the parameters20:18
smoke2: But you also have to include the diff arguments20:18
smoke2 __ikke__: thx !!20:19
← robert45 left20:19
smoke2 _ikke_: will search about that20:19
→ kevinold joined20:20
→ jluc joined20:20
← petey left20:20
→ petey joined20:20
→ cads joined20:21
fluter cbreak, ah, yes, it worked, thanks :)20:22
cbreak good :)20:22
→ Generator_ joined20:24
← kevinold left20:24
Generator_ hi getting this erron on git pull http://paste.fedoraproject.org/87719/51987013 please help to resolve20:24
flazz_gone → flazz20:25
← petey left20:25
HedgeMage Generator_: Please double-check your paste...that line by itself doesn't indicate an error.20:25
milki that doesnt looke like an error o.O20:25
Generator_ Pull is not possible because you have unmerged files.20:26
i am getting this20:26
cbreak Generator_: git status20:26
Generator_: read it20:26
follow it.20:26
resolve the conflicts then commit20:26
← endiruna left20:26
cbreak (or abort your merge attempt)20:26
→ Macacity joined20:27
_ikke_ Generator_: You are still in a merge20:27
Generator_ cbreak: git status gives me this http://paste.fedoraproject.org/87720/5520017120:27
cbreak Generator_: yes. Resolve the conflicts20:27
Generator_ I am new with git cannot follow very properly20:27
_ikke_ !conflict20:27
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=zz7NuSCH6II20:27
→ teran joined20:28
→ starkhalo joined20:28
Generator_ ok20:28
← hkj left20:28
→ AccessibleWeb joined20:28
→ eletuchy joined20:30
← lithiumjake left20:31
milki lol20:31
→ lithiumjake joined20:31
← chiromante left20:32
→ blackmes1 joined20:33
→ quiznilo joined20:33
← AccessibleWeb left20:33
quiznilo I'm trying again, but this is still incomprehensible... what is a 'remote tracking branch'?20:33
→ yhager joined20:33
← jnavila left20:33
_ikke_ quiznilo: It's basically a local branch, but used to track what you have fetched from a remote20:34
quiznilo excellent, thanks _ikke_20:34
← eletuchy left20:35
_ikke_ You're welcome20:35
dalias is it problematic to rename git branches after they're created?20:36
→ h12o joined20:36
→ chernjie joined20:36
_ikke_ Nope20:37
rudi_s dalias: No. If you have pushed them somewhere, you might to remove them there too, though.20:37
*you might have to rename20:37
s/remove/rename20:37
← upene left20:37
→ sgambino_ joined20:38
dalias does push --mirror do that automatically?20:38
← bobkosse left20:38
rudi_s dalias: It should, but I haven't tested it.20:38
dalias ok, not a big deal20:39
rudi_s According to the man page it does.20:39
Generator_ _ikke_: i marged the conflicts and commited the changes, now on master I changes that file and pushed, when trying to pull on server I get same error http://fpaste.org/87724/52071113/20:39
→ rjhunter joined20:39
← JerryT left20:39
← sgambino left20:39
sgambino_ → sgambino20:39
→ Walex joined20:40
→ dagnachew joined20:41
← shruggar_ left20:41
← jackneill left20:42
← rjhunter left20:43
← kukks left20:45
→ MissionCritical joined20:46
← wabash left20:47
← yhager left20:48
← mribeirodantas left20:50
→ paradoq joined20:50
← pfFred left20:50
→ SorenHolm joined20:51
→ mribeirodantas joined20:51
← paradoq left20:53
← Droolio left20:53
← ctp left20:54
← chiemseesurfer left20:54
← mribeirodantas left20:55
← neo1691 left20:55
flazz → flazz_gone20:56
← sambae left20:57
← doev left20:59
← iron_houzi left21:00
→ ignas joined21:01
← sdouglas left21:02
→ yosito joined21:02
→ sdouglas joined21:02
→ oodavid joined21:02
→ ket1v joined21:03
← lithiumjake left21:04
← ket1v left21:07
→ lynzt joined21:07
← sdouglas left21:07
→ trewe joined21:07
← zoso left21:07
← xSmurf left21:08
→ Accessib_ joined21:08
← alaing left21:10
← maqr left21:10
← RaptorJesus left21:10
→ Leoneof joined21:10
→ Gavrisimo joined21:11
→ chiromante joined21:11
→ jrahmy joined21:12
→ wrouesnel joined21:12
→ iron_houzi joined21:12
← Gavrisimo left21:15
→ oojacoboo joined21:15
→ chiromante_ joined21:16
← OnkelTem left21:18
→ chiromante__ joined21:18
Keridos → Keridos_off21:18
← chiromante left21:19
← lynzt left21:20
→ kevinold joined21:20
→ montyboy joined21:20
→ xSmurf joined21:21
→ lynzt joined21:21
← chiromante_ left21:21
→ JerryT joined21:22
→ yhager joined21:22
← prutz left21:23
← chiromante__ left21:23
← kevinold left21:25
← ErKa left21:25
→ HelloComputer15 joined21:25
← cff left21:25
← smoke2 left21:27
← oojacoboo left21:28
← lynzt left21:28
→ Goplat joined21:29
← trewe left21:30
← laserbeam left21:30
→ eletuchy joined21:30
→ mikepack joined21:31
← Kayra left21:31
→ chiemseesurfer joined21:31
← jgoss left21:32
→ jgoss joined21:32
→ xender joined21:32
→ mellernoia joined21:33
→ spintok joined21:33
xender Is there a command to rebase N branch on top of each other?21:34
* N branches21:34
← spintok left21:34
→ kcj joined21:34
→ Noldorin joined21:34
→ RaptorJesus joined21:34
← mtk left21:35
→ neo1691 joined21:35
← neo1691 left21:35
← eletuchy left21:35
← mikepack left21:35
milki perpetual rebasing?21:36
flazz_gone → flazz21:36
→ codeman joined21:36
→ madewokherd joined21:36
← ignas left21:37
akim_ → akim21:38
← codeman left21:38
← jdhawke left21:38
← hobodave left21:38
← dobalina left21:38
→ Vampire0 joined21:38
← RaptorJesus left21:39
→ mtk joined21:40
← longbeach left21:40
→ rjhunter joined21:40
xender Rather something like interactively rebasing master on commit 123456 and then dev on master21:40
(where dev was originally master's descendant)21:41
→ Freso joined21:41
Freso Hello people.21:41
Is it possible to set compression per-remote?21:41
AFAICT from docs etc., it isn't, but I'm hoping someone will show me I'm wrong. :)21:41
→ khmarbaise joined21:42
→ upene joined21:42
Freso (Or if I'm not, point me to a feature request before I go and make one myself.)21:42
← Kicer86 left21:43
→ RaptorJesus joined21:43
milki xender: theres no git tool for that, but you can script it21:43
← kcj left21:43
← edvard_ left21:44
xender milki: I have done that in simple shell loop in the past, but that's not very reliable21:44
← rjhunter left21:45
xender What are corner cases to watch for when scripting this?21:45
← jagob left21:45
← upene left21:46
→ snuffeluffegus joined21:47
← moonglow left21:47
← JanC left21:47
→ JanC_ joined21:48
→ watabou joined21:48
JanC_ → JanC21:49
milki failures due to conflicts i suppose?21:50
→ IVplay joined21:50
← unreal left21:51
→ lithiumjake joined21:51
← mishok13 left21:51
xender Yeah, all kinds of stops and failures21:53
Also, BTW, is there a way to undo one rebase stes?21:53
milki !undo21:53
gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!21:53
← phanimahesh left21:53
← montyboy left21:54
← yosito left21:54
→ yosito joined21:55
← kotopies left21:55
→ montyboy joined21:56
xender That's a bit too long list ;)21:56
I'm thinking specifically about situation, in which I would do a rebase21:56
But I'm *already* in the middle of rebase21:56
→ kcj joined21:57
→ mikemar10 joined21:57
xender e.g. selected 2 commits for edit in interactive rebase, edited first, ammended&continued, edited second and whoops, I forgot some small thing in first again21:58
← yosito left21:59
← RofricTheBearded left22:00
→ sekhmet joined22:00
→ harobed_ joined22:01
← harobed_ left22:01
→ kadoban_ joined22:01
→ laserbeam joined22:01
→ harobed_ joined22:02
→ hkj joined22:02
← hkj left22:02
← pantsman- left22:02
→ cagedwisdom joined22:02
→ sdouglas joined22:03
← oodavid left22:05
← ezekielnoob left22:05
← laserbeam left22:05
→ jaequery joined22:06
→ jnavila joined22:06
→ yosito joined22:06
← jnavila left22:06
→ Kayra joined22:06
← tonythomas left22:07
← sdouglas left22:08
→ k4r1m joined22:09
→ neo1691 joined22:09
→ blah__ joined22:10
← Kayra left22:13
→ hobodave joined22:13
→ simesy joined22:13
→ Kayra joined22:13
→ cruig joined22:14
← cruig left22:14
→ WaReZ joined22:14
← aboudreault left22:15
← dc5ala left22:15
→ mikepack joined22:17
← simesy left22:17
← Kayra left22:17
→ Zarthus joined22:18
← Zarthus left22:18
→ Zarthus joined22:18
← ferreum158 left22:18
→ Kayra joined22:18
→ petey joined22:19
flazz → flazz_gone22:19
→ Gavrisimo joined22:21
← kriks left22:21
→ kevinold joined22:21
→ aboudreault joined22:22
← crystal77 left22:23
→ n-st joined22:25
← kevinold left22:26
← aboudreault left22:28
→ sdouglas joined22:28
← fr33 left22:28
→ yosito_ joined22:28
→ Mendenba_ joined22:29
← Gavrisimo left22:29
→ yosito__ joined22:29
← yosito_ left22:29
→ mh` joined22:30
← yosito left22:30
← jaimef left22:30
← souther left22:30
← incade left22:31
→ incade_ joined22:31
← adamm left22:31
← Mendenbarr left22:31
→ adamm joined22:31
→ eletuchy joined22:31
← zack6849 left22:31
← Leoneof left22:31
→ Leoneof joined22:32
→ aboudreault joined22:32
→ souther joined22:32
→ EdGruberman joined22:33
→ yosito_ joined22:33
→ zack6849 joined22:33
← yosito__ left22:33
← chiemseesurfer left22:33
← doener left22:34
← jaequery left22:34
→ jaimef joined22:35
→ kotopies joined22:35
← eletuchy left22:36
→ TheFuzzball joined22:36
← neo1691 left22:36
← Zarthus left22:37
← Zifre left22:37
→ Zarthus joined22:37
← Zarthus left22:37
← Gizburdt left22:37
→ Gizburdt joined22:38
← mikepack left22:38
→ mikepack joined22:39
← meatmanek left22:39
→ Zarthus joined22:40
← sdouglas left22:40
→ yosito joined22:41
→ whitby joined22:41
→ rjhunter joined22:41
→ RofricTheBearded joined22:42
← whitby left22:42
→ jbranchaud joined22:42
← n-st left22:43
← mikepack left22:43
← Gizburdt left22:43
← yosito_ left22:44
→ meatmanek joined22:45
← rjhunter left22:45
← kadoban_ left22:46
← lithiumjake left22:46
← sgen left22:47
flazz_gone → flazz22:47
← jrahmy left22:47
→ yosito_ joined22:48
← yosito left22:48
→ whitby joined22:49
← Zarthus left22:49
→ mizu_no_oto joined22:49
→ unreal joined22:49
→ Zarthus joined22:49
← Zarthus left22:49
→ shinnya joined22:49
← montyboy left22:51
← mizu_no_oto left22:51
→ Zarthus joined22:52
← Zarthus left22:52
→ Zarthus joined22:52
→ kadoban_ joined22:53
→ lithiumjake joined22:55
← petey left22:55
→ petey joined22:55
→ meatmanek_ joined22:56
← anry left22:57
→ valgrind joined22:57
← meatmanek left22:59
meatmanek_ → meatmanek22:59
→ wongon joined22:59
← Leucomelas left23:00
← petey left23:00
→ charco joined23:01
→ saggim joined23:01
→ laserbeam joined23:02
← saggim left23:03
← kotopies left23:03
→ saggim joined23:03
→ ket1v joined23:03
← sohail left23:04
← jluc left23:04
← meatmanek left23:04
flazz → flazz_gone23:05
← Zarthus left23:05
→ Zarthus joined23:05
← Zarthus left23:05
→ Zarthus joined23:05
← Zarthus left23:05
fluter hi,23:06
how can I merge 3 commits into one?23:06
→ Zarthus joined23:06
← Zarthus left23:06
→ Zarthus joined23:06
← laserbeam left23:06
cbreak fluter: do you want a merge commit?23:07
→ montyboy joined23:07
→ upene joined23:07
fluter cbreak, no, I just wanna combine 3 commits into one23:07
cbreak are they on the same branch, after each other?23:07
fluter like A-B-C-D-E, I wanna A-B-E23:08
cbreak, yes23:08
cbreak are they the newest three?23:08
← saggim left23:08
cbreak then just git reset --soft HEAD~323:08
and commit them anew23:08
← ket1v left23:08
cbreak (if you have uncommitted changes, make sure they aren't staged or they will also be committed)23:08
→ saggim joined23:08
← saggim left23:09
→ saggim joined23:09
fluter let me try23:09
→ meatmanek joined23:10
← rgr left23:10
fluter cbreak, hmm, can I not change the HEAD, E?23:10
I mean to combine B-C-D to B, but the head remains E23:10
cbreak ah.23:10
fluter: that's a bit more involved23:11
fluter: git rebase -i HEAD~523:11
fluter: then change pick to squash for the two commits that you want to squash into the parent23:11
then save and exit23:11
fluter: you are aware that this is history rewriting, right?23:11
(You should really not do it with public history)23:11
→ kotopies joined23:12
→ vurma joined23:12
fluter cbreak, this is local repo, I made 3 commits for a fix, I wanna combine them because I wanna each history to be build ok,23:13
the 3 should really be a single fix :)23:13
→ simesy joined23:13
fluter hmm, rebase says fatal: Needed a single revision, invalid upstream23:14
← Dougie187 left23:15
→ rgr joined23:15
← Freso left23:16
cbreak what did you type?23:17
HEAD~5 assumes there are at least 6 commits in history23:17
if you have less, you need a smaller number :)23:17
← simesy left23:18
fluter ah, sorry, I should type HEAD~4, as there 5 in histrory :(23:18
← mikemar10 left23:19
fluter it works!23:20
rebase -i is awesome tools!!23:20
thanks cbreak23:20
cbreak np. Yes, rebase -i is dangerous... :)23:20
← jbranchaud left23:21
fluter ok :)23:21
pekster So is my mechanical pencil, but I won't lose sleep over it :D23:22
← Silmarilion left23:22
→ kevinold joined23:22
← GT4066 left23:22
← ezrafree left23:24
← kevinold left23:26
← bwreilly left23:27
→ GradientVector joined23:28
← GradientVector left23:29
← kotopies left23:29
→ robbyoconnor joined23:30
→ sgmac_ joined23:30
← sgmac_ left23:31
← aard_ left23:31
→ eletuchy joined23:32
→ sgmac_ joined23:32
→ bandroidx joined23:33
→ petey joined23:35
← Leoneof left23:35
→ ErKa joined23:35
← Noldorin left23:36
→ Dudi joined23:36
← matheus23 left23:36
← eletuchy left23:37
← IVplay left23:38
← sgmac_ left23:38
← asQuirreL left23:38
→ IVplay joined23:38
→ Coded1 joined23:39
→ sgmac_ joined23:39
← sgmac_ left23:39
→ sgmac_ joined23:39
← nfk left23:39
← sgmac_ left23:39
← lithiumjake left23:39
← robbyoconnor left23:40
→ sgmac_ joined23:40
→ nisseni joined23:41
← Not_Whatever left23:41
→ rjhunter joined23:42
← IVplay left23:43
→ jbranchaud joined23:44
← Cornelio left23:45
← kadoban_ left23:45
← khmarbaise left23:46
→ jaequery joined23:46
← jaequery left23:46
← rjhunter left23:47
→ robbyoconnor joined23:47
→ jaequery joined23:47
← yosito_ left23:47
→ Leoneof joined23:47
→ yosito joined23:48
← yosito left23:49
← jaequery left23:49
→ yosito_ joined23:49
→ tmcmahon joined23:50
→ yosito joined23:51
← yosito_ left23:51
← nisseni left23:52
→ aberrant joined23:54
← tmcmahon left23:54
← SorenHolm left23:55
→ kalypso joined23:55
→ jbarker joined23:57
← RofricTheBearded left23:57
← hobodave left23:57
← harobed_ left23:57
→ john2x joined23:58
→ hobodave joined23:59
← yosito left23:59
← Adam_Cameron_ left23:59

Logs Search ←Prev date Next date→ Channels Documentation