Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-21

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

All times shown according to UTC.

Time Nick Message
00:00 ril joined #git
00:04 tgunr joined #git
00:07 ceaucari joined #git
00:08 EvilPeng1 joined #git
00:09 ahmed_elgabri joined #git
00:09 Mobutils joined #git
00:10 csd_ joined #git
00:16 ajf- joined #git
00:16 Forkk joined #git
00:18 stantonk joined #git
00:20 sdothum joined #git
00:22 csd_ joined #git
00:23 andyhoang1 joined #git
00:26 thiago joined #git
00:27 fuchstronaut joined #git
00:28 Sleepy63 joined #git
00:30 Orbitrix joined #git
00:31 tomog999 joined #git
00:31 axl_ joined #git
00:33 netj joined #git
00:37 mizu_no_oto joined #git
00:38 italoacasas joined #git
00:39 pwnz0r joined #git
00:39 nwkj86 joined #git
00:40 UTAN_dev joined #git
00:45 d4rklit3 joined #git
00:50 lfam joined #git
00:51 lfam What is the best way to PGP sign a commit besides HEAD? For HEAD, I can do `git commit --no-edit --amend --gpg-sign`, but that doesn't work for old commits.
00:52 lfam Ideally, I'd be able to sign any arbitrary commit or range of commits
00:53 pwnz0r joined #git
00:53 osse lfam: I think signing a commit means rewriting it.
00:53 osse So rebase -i and so on.
00:54 osse But in a cryptographic (?)sense signing a commit also vouches for all commits preceeding it
00:54 bjpenn_ joined #git
00:56 lfam osse: rebase has the --gpg-sign option, but it seems that it doesn't happen during `git rebase -i HEAD~n --gpg-sign` when I don't make any other changes.
00:57 fracting joined #git
00:58 osse try adding -i
00:58 EvilPeng1 joined #git
00:58 osse Eh I'm blind
00:58 osse I don't know then.
00:59 lfam osse: I'm not sure this use case is covered by git. I'll keep experimenting
01:01 Arahael lfam: Checkout the specific commit. Sign it. Merge it back in.
01:01 Arahael lfam: Be very careful how you do the merge.
01:02 pwnz0r joined #git
01:02 pks joined #git
01:02 lfam Arahael: That's what I had in mind for single commits, but could it be used efficiently for a range of commits? Also, what do I need to worry about when merging?
01:03 Arahael lfam: Well, normally when you're merging, you want to integrate the changes.
01:03 Arahael lfam: But in this case, you quite specifically don't want to re-integrate the changes.
01:04 dreiss joined #git
01:04 jaguarmagenta joined #git
01:08 kus joined #git
01:11 netj joined #git
01:12 mizu_no_oto joined #git
01:13 nettoweb joined #git
01:13 eletuchy joined #git
01:14 CROOKED^HILLARY^ joined #git
01:15 rgrinberg joined #git
01:18 harish joined #git
01:26 lfam joined #git
01:29 nerium joined #git
01:30 fuchstronaut joined #git
01:30 nerium What does the A stand for in ”Alib/gash.rb” when running ”git log --pretty=format: --name-status”?
01:32 al-damiri joined #git
01:33 lfam left #git
01:34 arescorpio joined #git
01:36 netj joined #git
01:38 sssilver joined #git
01:38 mizu_no_oto joined #git
01:41 ochorocho__ joined #git
01:53 SimonNaa joined #git
01:55 sssilver joined #git
01:56 fscala joined #git
01:57 clemf joined #git
01:57 slappymcfry joined #git
01:58 arooni is it legit to have a line like "!~/bin/tmux_attach_or_new" in my .gitignore file ? or must all paths be relative to project directory ?
02:00 pks joined #git
02:01 nerium How do I include the email AND author name when using git blame?
02:03 mozzarella joined #git
02:07 aghalarp joined #git
02:07 fish3485 joined #git
02:07 chachasmooth joined #git
02:07 joki joined #git
02:07 rchavik joined #git
02:09 m_antis joined #git
02:10 CROOKED^HILLARY^ joined #git
02:11 sdothum joined #git
02:13 _3by8 joined #git
02:14 _3by8 So I found something I thought was interesting! Git clone doesn't work if you try cloning in a folder that's mounted via HGFS! Does anyone know of any workarounds?
02:17 Guest68433 joined #git
02:17 jonmorehouse joined #git
02:27 _3by8 Any ideas? I can use git push but git clone just won't budge. Has to be something with the filesystem, right? How can I help you guys figure this out?
02:29 t2mkn joined #git
02:30 fuchstronaut joined #git
02:32 acetakwas joined #git
02:33 ivan_on_trac joined #git
02:34 ivan_on_trac How to force a merge again?
02:38 noyb joined #git
02:40 Shentino joined #git
02:40 hexagoxel joined #git
02:42 thiago ivan_on_trac: what do you mean?
02:42 nilsi joined #git
02:42 thiago merges don't need to be forced
02:42 ochorocho__ joined #git
02:43 ivan_on_trac thiago: git merge mybranch -> Already up-to-date.
02:43 andyhoang1 joined #git
02:44 ivan_on_trac thiago: but, git diff jean-003 -> @@ -1091,6 +1091,13 @@ While
02:44 ivan_on_trac thiago: That is, I differences between the branches.
02:45 thiago but it's up-to-date
02:45 thiago don't argue with the evidence
02:45 ivan_on_trac thiago: sorry, replace: jean-004 by mybranch
02:45 thiago you don't need to merge that particular branch
02:45 thiago either you're trying the wrong branch, from the wrong branch, or just accept the job is done
02:46 Goplat joined #git
02:46 ivan_on_trac thiago: I know there's differences. the "git-diff" proves it.
02:46 thiago that doesn't mean anything
02:46 thiago merges don't remove differences
02:47 thiago when you merge A-B-C to A-D-E, you end up with A-B-C-D-E-F in one branch, but the other remains A-D-E
02:47 ivan_on_trac thiago: I did reversal today. something broke.
02:47 thiago so yes, there will be differences
02:47 thiago merges can't be reversed
02:48 ivan_on_trac thiago: edit the file my file, there are my changes.
02:49 thiago have you committed those changes?
02:50 ivan_on_trac thiago: of course.
02:50 ivan_on_trac thiago: I will do a checkout on each file that is different and then add in my main branch. I think it's the only solution.
02:51 thiago that's not a merge
02:52 thiago that is effectively discarding your changes in the current branch
02:52 thiago are you sure you want to do that?
02:52 ivan_on_trac thiago: yes I have.
02:53 ivan_on_trac thiago: Any idea how to do?
02:54 ril joined #git
02:56 Lyqyd joined #git
02:57 thiago explain what you've done
02:57 Mateon1 joined #git
02:58 Mateon1 joined #git
03:00 ivan_on_trac thiago: I will create a script "git diff --name-only" and from that get each file.
03:01 zalatovo joined #git
03:03 fracting joined #git
03:04 jaguarmagenta joined #git
03:05 akushner joined #git
03:05 fracting joined #git
03:06 ojacobson this is one of the weirder not-a-merges I've seen, I will say
03:07 ojacobson I'm fully prepared to believe you're doing what you believe you need, and if it gets you the results you want, godspeed, but it _sounds_ like a case of going the long way around. unfortunately I don't fully understand your goals, so I can't suggest the shorter way.
03:07 chachasmooth joined #git
03:07 boudiccas joined #git
03:09 akushner joined #git
03:10 adamm joined #git
03:14 thiago I think there was a git revert at some point
03:20 nerium Why isn’t it possible to run git blame on a file with status ”A” (added)?
03:20 theskillwithin joined #git
03:20 adamm joined #git
03:21 nerium git diff --name-status 628ee56843d | grep .gemspec => "A.gemspec"
03:21 nerium git blame 628ee56843d -- '.gemspec' => "fatal: no such path .gemspec in ..."
03:22 w0rms joined #git
03:23 NeverDie_ joined #git
03:26 clemf joined #git
03:31 fuchstronaut joined #git
03:34 Shentino joined #git
03:39 tgunr joined #git
03:43 ochorocho__ joined #git
03:45 bronson joined #git
03:51 xiaok joined #git
03:54 thiago nerium: because all lines are new in that
03:54 nerium thiago: Why does that matter?
03:55 thiago but I can't confirm. I've just tried and it works here.
03:55 thiago the problem is your diff command
03:56 thiago you proved that .gemspec was created at some point on or after 628ee56843d
03:56 thiago that doesn't porve it was created *on* 628ee56843d
03:56 thiago git blame requires the file to exist in that version. Apparently, it didn't.
03:58 thiago actually, the diff command proves it was created *after* 628ee56843d
03:58 thiago that means the file didn't exist on 628ee56843d, which is why you can't blame it
03:59 nerium Okat, makes sense
04:00 nerium thanks
04:00 NeverDie joined #git
04:02 CROOKED^HILLARY^ joined #git
04:02 fracting joined #git
04:16 boombatower joined #git
04:16 harish joined #git
04:18 Limes_ joined #git
04:19 nerium What other frontend exist for git? Not GUI but console tools
04:19 nerium I read somewhere about a new one a while back, can’t rember the name
04:21 nerium aha, gitup
04:24 fahadash joined #git
04:28 noyb joined #git
04:32 fuchstronaut joined #git
04:35 Sleepy63 joined #git
04:36 dmto joined #git
04:39 fracting joined #git
04:41 fracting joined #git
04:42 noyb joined #git
04:42 parv_ joined #git
04:43 clemf joined #git
04:43 phaleth joined #git
04:43 Cabanossi joined #git
04:50 tgunr joined #git
04:57 dopesong joined #git
04:58 NeverDie joined #git
04:58 rgrinberg joined #git
05:00 sesquipedalian joined #git
05:04 dmto joined #git
05:05 jaguarmagenta joined #git
05:10 fracting joined #git
05:12 fracting joined #git
05:15 fracting joined #git
05:16 ajf- joined #git
05:21 bibble sitaram , is it possible to prevent repo creation just by cloning, but still enable "create" feature ?
05:22 bibble (using gitolite)
05:23 mohabaks joined #git
05:27 CJKinni joined #git
05:31 parv joined #git
05:32 sauvin joined #git
05:33 fuchstronaut joined #git
05:34 radsy joined #git
05:35 mehola joined #git
05:37 PaulCape_ joined #git
05:38 mikeric joined #git
05:44 ochorocho__ joined #git
05:46 parv joined #git
05:47 aswen joined #git
05:48 bronson joined #git
05:49 nitin joined #git
05:54 dsdeiz joined #git
05:55 LucaTM joined #git
05:56 david007 joined #git
05:57 Swampelina joined #git
05:58 lindenle joined #git
06:00 andyhoang1 joined #git
06:00 Grievre joined #git
06:01 Grievre How do I get a diff of the currently staged changes to the master?
06:01 eletuchy joined #git
06:03 preaction git diff --staged
06:03 PaulCapestany joined #git
06:04 mehola joined #git
06:07 mohabaks joined #git
06:09 fscala joined #git
06:09 ayr-ton joined #git
06:09 ayr-ton joined #git
06:13 ochorocho__ joined #git
06:16 irqq joined #git
06:19 saedelaere joined #git
06:22 SwiftMatt joined #git
06:23 circ-user-nYr1x joined #git
06:30 PaulCape_ joined #git
06:33 tvw joined #git
06:34 fuchstronaut joined #git
06:37 Psychiatrist joined #git
06:45 raijin joined #git
06:48 ramsub07 joined #git
06:48 Psych joined #git
06:49 sitaram bibble: sure; look for "no-auto-create" in the rc file and uncomment that line
06:50 ruskie joined #git
06:52 csd_ joined #git
06:55 baba_ joined #git
06:55 baba__ joined #git
06:56 mkoskar joined #git
06:56 PaulCapestany joined #git
06:56 FrontPsych joined #git
06:57 LaT0rtue joined #git
06:58 dopesong joined #git
06:59 Psychiatrist joined #git
07:01 nitin_ joined #git
07:01 flavius joined #git
07:06 jaguarmagenta joined #git
07:09 peeps joined #git
07:12 blackwind_123 joined #git
07:14 anu1 joined #git
07:15 cagedwisdom joined #git
07:16 xbob joined #git
07:17 peepsalot joined #git
07:20 DoubleMan joined #git
07:22 mohabaks joined #git
07:22 PaulCape_ joined #git
07:26 mischat joined #git
07:26 dsantiago joined #git
07:28 bjpenn joined #git
07:33 mischat joined #git
07:34 fuchstronaut joined #git
07:34 muthu joined #git
07:36 vmiklos joined #git
07:41 Rikairchy joined #git
07:41 khmarbaise joined #git
07:41 mischat joined #git
07:42 Marny joined #git
07:43 jagob joined #git
07:45 satifant joined #git
07:46 baba_ joined #git
07:48 baba_ joined #git
07:48 SteffanW joined #git
07:49 PaulCapestany joined #git
07:49 bronson joined #git
07:51 Terens joined #git
07:51 xbob_ joined #git
07:52 mikeric joined #git
07:57 ahmedelgabri joined #git
08:00 nivag joined #git
08:00 lindenle joined #git
08:01 Fijit joined #git
08:02 jbitdrop joined #git
08:03 xbob joined #git
08:04 dsdeiz joined #git
08:09 nilsi joined #git
08:12 Maxis joined #git
08:13 Rikairchy joined #git
08:13 sanketdg joined #git
08:14 matiaslanzi joined #git
08:15 PCatinean joined #git
08:16 matiaslanzi joined #git
08:16 PaulCape_ joined #git
08:16 matiaslanzi joined #git
08:17 matiaslanzi left #git
08:20 emPi joined #git
08:20 maxis joined #git
08:22 Guest86878 left #git
08:23 Rikairchy joined #git
08:25 baba_ joined #git
08:27 ahmedelgabri joined #git
08:28 Limes_ joined #git
08:28 maxis joined #git
08:29 maxis joined #git
08:30 mwhooker joined #git
08:31 apotry joined #git
08:32 nnyk_ joined #git
08:33 zeroed joined #git
08:35 fuchstronaut joined #git
08:36 enter_ joined #git
08:37 ahmedelgabri joined #git
08:38 duderonomy joined #git
08:39 Rish joined #git
08:41 gaen joined #git
08:41 grift joined #git
08:42 PaulCapestany joined #git
08:43 eis007 joined #git
08:44 duderonomy joined #git
08:45 paule32 hello
08:45 enter__ joined #git
08:45 csanyipal joined #git
08:46 csanyipal Hi,
08:46 gitinfo csanyipal: 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:46 paule32 is there that can help me to init/setup git by using Qt5.5 Creator ? may a german girl/boy?
08:46 HerrThees joined #git
08:46 Lauven joined #git
08:48 csanyipal I like to set up a local git in a directory. I'm following advices on https://wiki.gentoo.org/wiki/Git .
08:48 paule32 https://paste.fedoraproject.org/369077/37838121/
08:48 lfsfan101 joined #git
08:49 csanyipal I did run these commands so far: 'git init' 'git config user.mail "csp@localhost"' 'git config user.name "Csányi Pál"' 'git add HuOsszerakoToltenye_git_elotti_00001.src' and 'git commit -m "HuOsszerakoToltenye_git_elotti_00001.src hozzá
08:49 csanyipal adva."'
08:49 csanyipal Sorry for three lines above..
08:50 csanyipal At the and I get output: fatal: unable to auto-detect email address (got 'csp@gcsp.(none)') Why?
08:52 csanyipal OK, I find some answers here: http://stackoverflow.com/questions/25671785/git-fatal-unable-to-auto-detect-email-address
08:53 aswen joined #git
08:53 cyan__ joined #git
08:54 chris_wot joined #git
08:56 chachasmooth joined #git
08:59 Terens joined #git
09:00 leeN joined #git
09:01 razieliyo joined #git
09:01 razieliyo joined #git
09:05 maxis joined #git
09:06 hekto joined #git
09:07 jaguarmagenta joined #git
09:08 PaulCape_ joined #git
09:13 jontmorehouse joined #git
09:18 baba_ joined #git
09:19 Gloomy joined #git
09:23 zincrokx joined #git
09:23 fracting joined #git
09:24 parv joined #git
09:25 ntshetty joined #git
09:27 Psychiatrist joined #git
09:30 aswen joined #git
09:34 PaulCapestany joined #git
09:36 MarcWeber joined #git
09:36 fuchstronaut joined #git
09:38 ahmedelgabri joined #git
09:40 cyan__ joined #git
09:41 irqq_ joined #git
09:41 ikmaak joined #git
09:42 jontmorehouse joined #git
09:42 mehola joined #git
09:42 mase-tech joined #git
09:43 parv_ joined #git
09:44 cyan___ joined #git
09:48 m0viefreak joined #git
09:49 troulouliou_div2 joined #git
09:50 nnyk_ joined #git
09:51 faux___ joined #git
09:51 Trieste joined #git
09:52 bronson joined #git
09:53 baba_ joined #git
09:54 davisonio joined #git
09:56 Meow-J joined #git
09:57 dopesong joined #git
09:58 circ-user-nYr1x joined #git
09:59 glauxosdever joined #git
09:59 glauxosdever Hello.
10:00 glauxosdever Finally I think interfacing with a git library is too hard so I decided to return to using subprocess. Is it totally bad?
10:00 PaulCape_ joined #git
10:03 Mikaela joined #git
10:05 lindenle joined #git
10:08 Zarthus glandium: is what totally bad
10:09 glauxosdever Totally bad that I return to using python's subprocess instead of dulwich.
10:11 skunkz joined #git
10:14 bibble sitaram : Awesome! Thanks, working great.
10:14 digidog joined #git
10:15 ahmedelgabri joined #git
10:16 Zarthus glauxosdever: I have no experience with dulwich, but with things like --porcelain and rev-parse it's hard to imagine the git developers didn't account for people using system calls to get things working
10:16 SimonNa joined #git
10:17 Raging_Hog joined #git
10:17 emPi joined #git
10:17 glauxosdever Zarthus: Can you please elaborate?
10:17 Zarthus on what?
10:17 glauxosdever On that sentence. It is hard for me to parse.
10:18 Zarthus git allows you to generate output that is easy (and consistent) for machines to parse.
10:18 glauxosdever Ok, I understand now what you meant.
10:20 Rish_ joined #git
10:20 fuchstronaut joined #git
10:22 sdothum joined #git
10:22 emPi joined #git
10:27 PaulCapestany joined #git
10:29 parv_ joined #git
10:31 ahmed_elgabri joined #git
10:33 xcesariox joined #git
10:36 zarel joined #git
10:36 parv_ joined #git
10:36 ams__ joined #git
10:42 mehola joined #git
10:44 ocbtec joined #git
10:45 fahadash joined #git
10:46 eletuchy joined #git
10:47 adrian_broher joined #git
10:51 Trieste joined #git
10:54 PaulCape_ joined #git
10:56 eletuchy joined #git
11:01 shinnya joined #git
11:02 Rish joined #git
11:07 jaguarmagenta joined #git
11:08 Rish_ joined #git
11:10 AbsurdTech joined #git
11:21 PaulCapestany joined #git
11:22 linuxmint joined #git
11:23 digidog joined #git
11:25 nnyk_ joined #git
11:32 Lunatrius` joined #git
11:37 csd_ joined #git
11:39 filcab joined #git
11:39 zyclonicz joined #git
11:41 baba_ joined #git
11:43 CalimeroTeknik_ joined #git
11:43 fuchstronaut joined #git
11:44 narendraj9 joined #git
11:45 xbob joined #git
11:46 PaulCape_ joined #git
11:48 CROOKED^HILLARY^ joined #git
11:55 cdown joined #git
11:55 irqq joined #git
11:55 ojdo joined #git
11:57 circ-user-nYr1x joined #git
11:58 gregorycu joined #git
11:59 Lauven joined #git
11:59 fstd joined #git
11:59 cyan__ joined #git
12:00 xbob_ joined #git
12:00 parv joined #git
12:01 robotroll joined #git
12:02 xiaok joined #git
12:03 circ-user-nYr1x joined #git
12:04 nwkj86 joined #git
12:05 MadHatter42 joined #git
12:06 Jackneill joined #git
12:07 lindenle joined #git
12:11 PaulCapestany joined #git
12:12 Guest57 joined #git
12:13 MadHatter42 joined #git
12:14 xbob joined #git
12:14 Guest57 joined #git
12:18 bitkiller joined #git
12:18 tjbp joined #git
12:19 JRHaigh joined #git
12:19 jagob joined #git
12:19 tjbp joined #git
12:20 davisonio joined #git
12:21 tjbp joined #git
12:21 cdown joined #git
12:22 gaen joined #git
12:24 irqq joined #git
12:34 xbob joined #git
12:36 SteffanW joined #git
12:36 GT joined #git
12:36 grawity instead of dulwich, there's pygit too, I think?
12:37 aswen joined #git
12:37 PaulCape_ joined #git
12:38 nitin joined #git
12:39 irqq joined #git
12:39 xcesariox joined #git
12:40 Ardethian\\work joined #git
12:40 CROOKED^HILLARY^ joined #git
12:42 fracting joined #git
12:45 fuchstronaut joined #git
12:47 tilpner joined #git
12:51 JRHaigh joined #git
12:51 skunkz_ joined #git
12:51 shaggycat joined #git
12:52 tilpner Hi. git prints a link to a Go package as an error message. Is this expected? Probably not, so what did I do wrong? :/ https://ptpb.pw/r_HP.png
12:52 tilpner [ https://github.com/codegangsta/cli ]
12:55 _ikke_ No that's certainly not git
12:55 Tim-SEM joined #git
12:55 bronson joined #git
12:56 madewokherd joined #git
12:57 maret joined #git
12:59 tilpner How do I determine what external (Go) helpers git invokes here?
13:00 maret hi everyone we have these filter setup on the project http://pastie.org/10846506 and I am curious if using filters has some advantage over git hooks because filters are annoying because it also affect git stash
13:01 grawity tilpner: GIT_TRACE=1, I think
13:01 xbob joined #git
13:01 grawity tilpner: or, strace -fe execve
13:02 scarabx joined #git
13:02 tilpner 15:01:57.336165 git.c:350               trace: built-in: git 'remote' 'show' 'origin'
13:02 tilpner 15:01:57.336259 run-command.c:336       trace: run_command: 'ssh' 'tilpner' 'git-upload-pack '\''ovgu/pgp'\'''
13:03 tilpner GIT_TRACE only outputs that, and git-upload-pack seems to be official.
13:04 PaulCapestany joined #git
13:04 JRHaigh joined #git
13:04 tilpner strace doesn't yield much more. This is weird.
13:05 grawity hmm, do you get the same from `git ls-remote origin`?
13:05 grawity might be a message from the server.
13:05 tilpner Oh, it prints messages from the server? :o
13:05 tilpner Yeah, that might be it.
13:05 tilpner Yes, same message.
13:06 tilpner Thanks grawity, I would never have guessed this! :)
13:06 faux___ joined #git
13:07 rgrinberg joined #git
13:08 circ-user-nYr1x joined #git
13:08 jaguarmagenta joined #git
13:09 wrouesnel joined #git
13:11 astrofog joined #git
13:12 m_antis joined #git
13:15 raijin joined #git
13:17 faux___ joined #git
13:19 mjuszczak joined #git
13:24 ahmed_elgabri joined #git
13:30 xbob joined #git
13:30 PaulCape_ joined #git
13:33 |2701 joined #git
13:34 SwiftMatt joined #git
13:38 ncd|leeN joined #git
13:44 liquidjamm joined #git
13:44 rbern joined #git
13:45 fuchstronaut joined #git
13:46 abec0_ left #git
13:51 Terens joined #git
13:52 eletuchy joined #git
13:54 bollullera joined #git
13:57 PaulCapestany joined #git
13:57 bollullera left #git
13:58 xbob joined #git
14:04 SteffanW joined #git
14:04 jason237 joined #git
14:04 glauxosdever grawity: You are right. I didn't look at pygit yet.
14:05 glauxosdever But I have to make something I know (in this case subprocess), because of lack of time this period.
14:05 glauxosdever I'll consider using it, though.
14:05 sd512 joined #git
14:07 mehola joined #git
14:07 Grievre is github being problematic for anyone else
14:07 Grievre the website works fine but when I try to clone things it gets stuck
14:08 mda1 joined #git
14:08 m1dnight_ joined #git
14:09 lindenle joined #git
14:09 diogenese joined #git
14:10 GavinMagnus joined #git
14:11 Gamecubic joined #git
14:12 griffindy joined #git
14:14 troulouliou_dev joined #git
14:14 JRHaigh joined #git
14:14 dangerousdave joined #git
14:14 dangerousdave joined #git
14:15 MarcWeber left #git
14:22 faux___ joined #git
14:22 nettoweb joined #git
14:22 heroux joined #git
14:23 ahmed_elgabri joined #git
14:23 xbob joined #git
14:24 cdown joined #git
14:25 PaulCape_ joined #git
14:34 ochorocho__ joined #git
14:34 ntshetty joined #git
14:35 raininja joined #git
14:38 abec0 joined #git
14:38 jaafar joined #git
14:39 aswen joined #git
14:39 nnyk_ joined #git
14:40 eletuchy joined #git
14:42 xbob joined #git
14:44 SwiftMatt joined #git
14:47 gnoel joined #git
14:47 ntshetty joined #git
14:47 cdg joined #git
14:48 todd_dsm joined #git
14:49 nettoweb joined #git
14:49 Psychiatrist joined #git
14:51 PaulCapestany joined #git
14:52 mda1 joined #git
14:52 Jeroen joined #git
14:54 csd_ joined #git
14:54 xbob_ joined #git
14:55 mda1 joined #git
14:57 bronson joined #git
14:59 fahadash joined #git
15:06 italoacasas joined #git
15:06 bjpenn joined #git
15:07 xbob joined #git
15:09 jaguarmagenta joined #git
15:12 eletuchy joined #git
15:15 troulouliou_dev joined #git
15:15 anu0 joined #git
15:17 PaulCape_ joined #git
15:18 davisonio joined #git
15:18 xbob joined #git
15:20 eletuchy joined #git
15:21 sangy joined #git
15:26 dangerousdave joined #git
15:27 rath_ joined #git
15:28 Goplat joined #git
15:29 xbob joined #git
15:31 rahtgaz joined #git
15:34 slappymcfry joined #git
15:35 ochorocho__ joined #git
15:37 CROOKED^HILLARY^ joined #git
15:38 brandonw joined #git
15:39 xbob joined #git
15:39 nettoweb joined #git
15:41 lowfps11 joined #git
15:43 duderonomy joined #git
15:45 PaulCapestany joined #git
15:46 sandroqz joined #git
15:48 mda1 joined #git
15:48 fuchstronaut joined #git
15:50 jagob joined #git
15:50 cdown joined #git
15:50 xbob joined #git
15:52 LucaTM joined #git
15:56 spinningarrow joined #git
16:01 CheckDavid joined #git
16:02 sandroqz joined #git
16:02 xbob joined #git
16:04 scarabx joined #git
16:06 nidr0x joined #git
16:08 mehola joined #git
16:10 PaulCape_ joined #git
16:10 lindenle joined #git
16:14 xbob joined #git
16:14 sandroqz joined #git
16:14 sandroqz joined #git
16:15 invisbl joined #git
16:15 CROOKED^HILLARY^ joined #git
16:16 sandroqz joined #git
16:18 LaT0rtue joined #git
16:21 thiago joined #git
16:21 sweatsuit joined #git
16:22 dangerousdave joined #git
16:22 dromedary512 joined #git
16:23 cdown joined #git
16:23 mmlb joined #git
16:24 xbob joined #git
16:29 corebits joined #git
16:31 Noldorin joined #git
16:31 Neomex joined #git
16:31 digidog joined #git
16:32 Neomex i just cloned a repo, how do i push it back to site with new changes?
16:32 Neomex just remote add and push?
16:33 acetakwas joined #git
16:34 xbob joined #git
16:35 tristanp joined #git
16:36 mischat joined #git
16:37 fakenullie Neomex: if you cloned it, remote should be there already
16:37 ochorocho__ joined #git
16:38 Neomex how is it called? origin? can i change that? fakenullie
16:38 toogley joined #git
16:38 fakenullie Yes you can
16:38 PaulCapestany joined #git
16:40 fuchstronaut joined #git
16:41 digidog joined #git
16:43 NeverDie joined #git
16:43 mizu_no_oto joined #git
16:44 bjpenn joined #git
16:45 davisonio joined #git
16:49 mikeric joined #git
16:50 emPi joined #git
16:50 m_antis joined #git
16:54 xbob joined #git
16:55 elastix joined #git
16:57 saedelaere joined #git
16:58 mohabaks joined #git
17:01 kadoban joined #git
17:03 PaulCape_ joined #git
17:04 Sendoushi joined #git
17:05 spinningarrow joined #git
17:08 netj joined #git
17:10 MDRXB95AP joined #git
17:10 jaguarmagenta joined #git
17:10 nnyk_ joined #git
17:10 ayr-ton joined #git
17:10 ayr-ton joined #git
17:18 lindenle joined #git
17:21 xbob joined #git
17:22 gfixler joined #git
17:23 PCatinean joined #git
17:24 damirm joined #git
17:24 digidog joined #git
17:25 damirm joined #git
17:26 jaguarmagenta joined #git
17:26 damirm joined #git
17:27 paule32 left #git
17:28 watabou joined #git
17:29 cdown joined #git
17:31 PaulCapestany joined #git
17:32 todd_dsm joined #git
17:32 surfnturf_ joined #git
17:36 mehola joined #git
17:37 baba_ joined #git
17:37 ploop joined #git
17:38 Neomex_ joined #git
17:41 surfnturf_ hi
17:41 surfnturf_ i'm trying to push to a forked repo
17:41 surfnturf_ my remote shows my forked repo location
17:41 surfnturf_ but it wont accept my password
17:45 xbob joined #git
17:47 faux___ joined #git
17:49 LeMike joined #git
17:51 PryMar56 joined #git
17:56 PaulCape_ joined #git
17:57 razieliyo joined #git
17:57 clemf joined #git
17:58 ramsub07 joined #git
17:59 ploop joined #git
18:00 spinningarrow joined #git
18:00 zarel joined #git
18:00 choki joined #git
18:02 rkazak joined #git
18:04 davisonio joined #git
18:06 albel727 joined #git
18:07 NeverDie joined #git
18:07 boudicca joined #git
18:08 mizu_no_oto joined #git
18:09 xbob joined #git
18:10 cdown joined #git
18:10 mellernoia joined #git
18:11 MattMaker joined #git
18:12 cdown joined #git
18:14 aswen joined #git
18:14 eletuchy joined #git
18:16 osse !transcr
18:16 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
18:16 osse surfnturf_:
18:19 surfnturf_ +osse: ?
18:20 fuchstronaut joined #git
18:20 surfnturf_ https://gist.github.com/anonymous/52b71cf70f4fb84105957713c2d26636
18:20 eijk joined #git
18:21 osse surfnturf_: did you give a password when you created the ssh key?
18:21 surfnturf_ I tried to add it to my repo but said key alrreday exists
18:22 surfnturf_ but its same problem with my password
18:22 osse answer my quesiton
18:22 surfnturf_ i guess no
18:22 osse that's weird ,because it's that password you're asked for
18:22 surfnturf_ actually yes i did
18:22 osse not your github password or whatever
18:22 surfnturf_ i gave the passphrase
18:23 surfnturf_ i'll try to add a new key following steps from beginnign
18:23 surfnturf_ instead of an existin key
18:25 PaulCapestany joined #git
18:26 Rish joined #git
18:26 ochorocho__ joined #git
18:28 Rish_ joined #git
18:30 cdg joined #git
18:33 Rish joined #git
18:34 xbob joined #git
18:36 mehola joined #git
18:37 diegoaguilar joined #git
18:37 Saylen joined #git
18:37 jontmorehouse joined #git
18:38 livingstn joined #git
18:38 |ifei5good joined #git
18:39 Saylen joined #git
18:39 zarel joined #git
18:39 dsdeiz joined #git
18:39 Saylen joined #git
18:39 choki joined #git
18:46 nnyk_ joined #git
18:52 PaulCape_ joined #git
18:52 tinajohnson___ joined #git
18:53 sgen joined #git
18:54 fuchstronaut joined #git
18:54 spinningarrow joined #git
18:55 Spacew00t joined #git
18:57 d4rklit3 joined #git
18:57 AK-47 joined #git
18:57 boudiccas joined #git
18:57 AK-47 hi all , ##securify is open for public with Our OS -= SU FEDORA OS =- ##SU.OS , just come in ... . is for public ... .
19:00 xbob joined #git
19:01 bronson joined #git
19:02 aswen joined #git
19:03 Spacew00t joined #git
19:03 ramsub07 joined #git
19:03 Ardethian\work joined #git
19:05 stonerfish joined #git
19:07 GavinMagnus joined #git
19:07 damirm joined #git
19:08 raijin joined #git
19:08 idxz joined #git
19:09 jaguarmagenta joined #git
19:14 davisonio joined #git
19:16 multi_io joined #git
19:16 nnl joined #git
19:16 ToBeCloud joined #git
19:16 jagob joined #git
19:17 boudicca joined #git
19:18 AbsurdTech joined #git
19:19 PaulCapestany joined #git
19:19 catuca joined #git
19:20 catuca Anybody here use git mergetool with vim? I am seeing the MERGED window. It only shows me LOCAL, BASE and REMOTE. How do I fix that?
19:20 catuca I meant to say that I am not seeing the MERGED window
19:20 vrs_ joined #git
19:21 mehola joined #git
19:22 vrs_ left #git
19:22 d4rklit3 joined #git
19:25 ramsub07 joined #git
19:25 todd_dsm joined #git
19:26 xbob joined #git
19:29 fracting joined #git
19:29 boudiccas joined #git
19:32 fracting joined #git
19:37 catuca I got it
19:37 eletuchy joined #git
19:37 catuca CTRL W, J
19:37 catuca the merged window then pops up
19:37 krabat joined #git
19:38 Sendoushi joined #git
19:38 GavinMagnus joined #git
19:40 dopesong joined #git
19:42 arooni joined #git
19:42 sctskw joined #git
19:43 todd_dsm joined #git
19:44 PaulCape_ joined #git
19:44 Goobbue joined #git
19:47 mohabaks joined #git
19:48 spinningarrow joined #git
19:51 aswen joined #git
19:52 acetakwas joined #git
19:53 dopesong joined #git
19:53 xbob_ joined #git
19:54 Sadeukko joined #git
19:54 GavinMagnus joined #git
19:56 thebwt joined #git
19:58 dopesong joined #git
19:58 mikeric joined #git
19:59 zarel joined #git
20:00 skylite joined #git
20:02 circ-user-nYr1x joined #git
20:03 skylite joined #git
20:04 cdown joined #git
20:05 |2701 joined #git
20:06 xbob joined #git
20:06 toogley joined #git
20:11 PaulCapestany joined #git
20:12 ochorocho__ joined #git
20:14 xbob joined #git
20:19 toothe joined #git
20:19 xanadu joined #git
20:19 toothe is there a way to revert a specific historic commit, but not what came after it?
20:20 troglotit joined #git
20:20 fuchstronaut joined #git
20:20 troglotit joined #git
20:23 Sleepy63 joined #git
20:24 xbob joined #git
20:24 _ikke_ git revert <commit>
20:24 toothe ahh...
20:24 _ikke_ which will create a new commit undoing the specified commit
20:24 toothe im trying to delete a recent accidental commit.
20:25 _ikke_ Have you pushed it already?
20:25 toothe yes...well, the commit took place on gitlab itself.
20:25 arand joined #git
20:26 _ikke_ And do you know if others have fetched it?
20:26 toothe im the only user, so no one else did.
20:26 toothe its okay, i'll just do the revert and push it back up.
20:28 mohabaks joined #git
20:28 toothe odd....i think i might have screwed up gitlab (again)
20:29 rom1504 unscrew it
20:30 toothe heh.
20:30 toothe gitlab is a little on the buggy side.
20:30 ramsub07 joined #git
20:30 rom1504 I didn't have any bug since I'm using it
20:30 rom1504 (a few years)
20:30 toothe i think I messed it up very early on...
20:30 rom1504 only installation problems but there are fixed since about 7.x
20:30 toothe I kept getting 404 errors.
20:31 rom1504 > yes...well, the commit took place on gitlab itself.
20:31 rom1504 ah ok you're trying to make it bug
20:31 toothe no...
20:31 toothe yes, the commit took place on gitlab.
20:31 rom1504 on the web interface ?
20:32 toothe yes.
20:32 rom1504 or directly in the repo dir
20:32 rom1504 ah ok
20:32 rom1504 well that should be ok then
20:32 ZenWalker joined #git
20:32 rom1504 so what's your bug
20:32 flopsec joined #git
20:32 rom1504 ?
20:32 amdi_ joined #git
20:32 ZenWalker hello, how to put the char ' on the description of a commit?
20:33 toothe its okay. i think I 'fixed' it.
20:33 fscala joined #git
20:33 _ikke_ ZenWalker: Are you passing the message with -m?
20:33 PaulCape_ joined #git
20:34 brandonw joined #git
20:34 rom1504 using the key ' on your keyboard
20:35 Lunatrius` joined #git
20:35 LeBlaaanc joined #git
20:37 Puffball joined #git
20:41 ZenWalker _ikke_: yes, with -am
20:41 faux___ joined #git
20:41 diegoaguilar joined #git
20:41 ZenWalker rom1504: dont  works
20:41 ZenWalker with two lines or more
20:41 _ikke_ ZenWalker: You can escape the quote with \, or use the editor
20:42 anberg joined #git
20:42 ZenWalker _ikke_: ok thanks
20:43 _ikke_ Note that this is more of a shell question than a git question
20:44 xbob joined #git
20:44 elastix joined #git
20:46 Puffball_ joined #git
20:49 Lunatrius` joined #git
20:50 troglotit joined #git
20:51 ZenWalker _ikke_: dont works \'
20:51 ZenWalker and dont works \\'
20:52 eletuchy joined #git
20:52 _ikke_ What shell are you using?
20:53 ZenWalker bash
20:53 ZenWalker git commit -am 'blablabla '@'
20:53 ZenWalker > more text'
20:54 ZenWalker two lines
20:54 _ikke_ Why aren't you using an editor if I may ask?
20:56 _ikke_ ZenWalker: git commit -F - <<EOF
20:56 _ikke_ 'test'
20:56 _ikke_ line 2
20:57 _ikke_ EOF
20:57 _ikke_ (heredoc)
20:57 imdsm_ joined #git
21:00 dsdeiz joined #git
21:00 dsdeiz joined #git
21:03 bronson joined #git
21:03 Puffball joined #git
21:04 PaulCapestany joined #git
21:05 acetakwas joined #git
21:05 xbob joined #git
21:06 Lunatrius joined #git
21:07 stevendonahue joined #git
21:08 mmlb joined #git
21:09 josuebrunel joined #git
21:11 astrofog joined #git
21:13 ochorocho__ joined #git
21:16 davisonio joined #git
21:16 acetakwas I'd like to host the constitution document for a User Group. Should I use Github Gist or just create an entire repo for docs from the organization
21:18 d4rklit3 joined #git
21:18 jaguarmagenta joined #git
21:21 fuchstronaut joined #git
21:26 fracting joined #git
21:28 tref joined #git
21:28 Lyqyd joined #git
21:28 Sleepy63 joined #git
21:30 xbob joined #git
21:31 PaulCape_ joined #git
21:31 cgundersson joined #git
21:34 satbyy joined #git
21:36 spinningarrow joined #git
21:43 interne7y joined #git
21:47 den2204 joined #git
21:48 rgrinberg joined #git
21:49 Linkandzelda joined #git
21:49 Linkandzelda joined #git
21:51 |ifei5g00d joined #git
21:54 xbob joined #git
21:55 mkoskar joined #git
21:57 PaulCapestany joined #git
22:00 choki joined #git
22:00 evan_yeyeye joined #git
22:05 gaen joined #git
22:07 tristanp joined #git
22:08 tristanp joined #git
22:09 nnyk_ joined #git
22:12 dopesong joined #git
22:13 dsantiago joined #git
22:14 ToBeCloud joined #git
22:17 PaulCape_ joined #git
22:20 raijin joined #git
22:20 mwhooker joined #git
22:21 mwhooker joined #git
22:22 fuchstronaut joined #git
22:22 prsn joined #git
22:22 xbob joined #git
22:23 Urbany joined #git
22:24 nnyk joined #git
22:24 WizJin joined #git
22:24 adrian_broher joined #git
22:25 tlaxkit joined #git
22:25 mehola joined #git
22:26 boombatower joined #git
22:28 PaulCapestany joined #git
22:33 sangy joined #git
22:37 adrian_broher joined #git
22:38 adrian_broher joined #git
22:43 NeverDie joined #git
22:43 mehola joined #git
22:45 xbob joined #git
22:46 PaulCape_ joined #git
22:48 elastix joined #git
22:48 clemf joined #git
22:50 boudicca joined #git
22:50 JanC_ joined #git
22:51 boombatower joined #git
22:53 cdown joined #git
22:53 eletuchy joined #git
22:54 xbob joined #git
22:54 jontmorehouse joined #git
22:56 Eugene I would advise using a full repository if you want it to be long-lasting
22:59 elastix joined #git
23:00 Arahael i'm not sure i'd recommend git for docs organisation-wide.
23:00 Arahael a wiki server would be better.
23:00 Arahael with backups.
23:00 Eugene Github has a Wiki feature
23:01 Arahael Eugene: ah, yeah - but not git :)
23:06 bronson joined #git
23:09 moobee joined #git
23:11 NeverDie joined #git
23:11 maxis joined #git
23:12 PaulCapestany joined #git
23:14 ochorocho__ joined #git
23:14 dopesong joined #git
23:14 anu1 joined #git
23:15 boudiccas joined #git
23:18 eletuchy joined #git
23:20 netj joined #git
23:20 cdg joined #git
23:20 sctskw joined #git
23:21 ffabi joined #git
23:23 fuchstronaut joined #git
23:24 AbsurdTech joined #git
23:24 scarabx joined #git
23:24 spinningarrow joined #git
23:27 ffabi joined #git
23:27 m_antis joined #git
23:35 kenansulayman joined #git
23:35 boudicca joined #git
23:36 shaggycat joined #git
23:37 tristanp joined #git
23:38 mablae__ joined #git
23:41 PaulCape_ joined #git
23:42 csd_ joined #git
23:43 DirtyCajun joined #git
23:45 zmachine joined #git
23:57 mattfoo joined #git
23:59 fstd joined #git

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