Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-14

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

All times shown according to UTC.

Time Nick Message
00:01 sammyo joined #git
00:01 samtheknife joined #git
00:02 dendazen joined #git
00:02 sammyo joined #git
00:02 samtheknife joined #git
00:03 unreal joined #git
00:03 shgysk8zer0 joined #git
00:04 CEnnis91 joined #git
00:04 Vivekananda joined #git
00:04 txdv joined #git
00:06 tyreld joined #git
00:07 Vivekananda joined #git
00:08 linuxmodder joined #git
00:09 canuk joined #git
00:11 SwiftMatt joined #git
00:11 canuk joined #git
00:12 aarobc joined #git
00:12 rominron_ joined #git
00:12 e14 joined #git
00:13 anonymuse joined #git
00:17 nettoweb joined #git
00:19 Derperperd joined #git
00:20 raijin joined #git
00:20 netj joined #git
00:28 jimi_ joined #git
00:30 mizu_no_oto joined #git
00:32 qws-user-1229 joined #git
00:34 mrpackethead joined #git
00:35 mattp_ joined #git
00:37 moritz joined #git
00:37 kaldoran joined #git
00:38 ahf joined #git
00:41 nettoweb joined #git
00:51 diogenese joined #git
00:52 jaafar joined #git
00:52 dodobrain joined #git
00:54 e14 joined #git
00:56 Gsham joined #git
01:02 Rodya_ joined #git
01:05 JamesBaxter joined #git
01:06 a3Dman_ joined #git
01:07 bulletmark joined #git
01:07 quickbrownfox joined #git
01:08 cdg joined #git
01:09 JosephFerano joined #git
01:10 fstd_ joined #git
01:10 einnjo joined #git
01:11 slikts joined #git
01:11 JosephFerano hi, I have a question about git lfs; I noticed that in my fairly large game project repo, my .git/lfs directory is almost as big as my project directory. Is git lfs storing a copy of the binaries here? Does it need to? Are there ways to clean that up? Does it not just point to the binary file of HEAD to the actual file?
01:11 tango_ joined #git
01:11 JosephFerano I assume that the binaries kept there are just does in the HEAD, and not the entire history of the binaries
01:12 JosephFerano s/does/those
01:12 jaguarmagenta joined #git
01:12 hue joined #git
01:12 cdg joined #git
01:13 sunri5e joined #git
01:13 mizu_no_oto joined #git
01:13 finalbeta joined #git
01:13 todd_dsm joined #git
01:15 pks joined #git
01:16 tango_ joined #git
01:17 aidalgol joined #git
01:18 malcon joined #git
01:18 d^sh joined #git
01:19 rbern joined #git
01:20 sangy joined #git
01:22 boombatower joined #git
01:25 eindoofus_ joined #git
01:25 Wulf4 joined #git
01:27 GandalfTheWizard joined #git
01:30 einnjo joined #git
01:32 rchavik joined #git
01:35 kylo_ joined #git
01:37 DolpheenDream joined #git
01:38 fedepad joined #git
01:41 mizu_no_oto joined #git
01:41 Ardethian\work joined #git
01:46 danimal2 joined #git
01:46 rominron_ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:49 ekinmur joined #git
01:49 montj2 joined #git
01:50 skunkz joined #git
01:51 HoierM joined #git
01:53 montj2 joined #git
01:53 Vampire0_ joined #git
01:53 montyboy joined #git
01:55 danimal2 joined #git
01:57 montyboy joined #git
01:59 brokensyntax joined #git
02:01 Jameser joined #git
02:02 Rodya_ joined #git
02:03 dreiss joined #git
02:05 einnjo joined #git
02:10 thiefg hey, I have a fairly large git repo with large assets; I would like to setup git lfs, is there a way to make this change apply to the hisory of the repo or will it just be any new changes?
02:10 mizu_no_oto joined #git
02:10 Jellyg00se joined #git
02:11 ahmedelgabri joined #git
02:11 JamesBaxter joined #git
02:15 Goplat joined #git
02:17 e14 joined #git
02:17 chachasmooth joined #git
02:18 Rodya_ joined #git
02:19 lagothrix joined #git
02:19 Lyqyd joined #git
02:22 rbern joined #git
02:23 svm_invictvs joined #git
02:26 liuzhen joined #git
02:32 snthsnth joined #git
02:37 hexagoxel joined #git
02:39 liuzhen joined #git
02:39 raijin joined #git
02:41 samtheknife joined #git
02:41 CEnnis91 joined #git
02:42 netj joined #git
02:48 Rodya_ joined #git
02:49 TSS_ joined #git
02:50 malcon joined #git
02:53 _cyril_ joined #git
02:53 alex1a joined #git
03:01 Zamerick joined #git
03:04 moestevens joined #git
03:07 raijin joined #git
03:07 cagmz joined #git
03:11 Limes_ joined #git
03:13 jaguarmagenta joined #git
03:13 e14 joined #git
03:14 Vortex35 joined #git
03:14 DarkFox__ joined #git
03:15 buzzLightBeer joined #git
03:15 rominron_ joined #git
03:17 maxorator joined #git
03:19 eka joined #git
03:19 evanwang joined #git
03:20 _cyril_ joined #git
03:24 DarkFox_ joined #git
03:24 watabou joined #git
03:24 inflames joined #git
03:24 syg_ joined #git
03:29 nowhereman joined #git
03:34 Fissure joined #git
03:34 danemacmillan joined #git
03:35 inflames joined #git
03:42 Andrew_K joined #git
03:43 einnjo joined #git
03:43 Zamerick joined #git
03:48 phanimahesh joined #git
03:51 sostenuto joined #git
03:51 littleforest joined #git
03:52 netj joined #git
03:53 dsantiago joined #git
03:54 robotroll joined #git
03:56 milki thiefg: i dont know of a convenient way to do it, but you could always walk through history and proactively make it all lfs probably
03:56 phanimahesh joined #git
03:56 milki thiefg: you can script it with git filter-branch
03:58 inflames joined #git
03:59 User458764 joined #git
04:00 einnjo joined #git
04:00 somaReve1 hi, how do submodules manage branches? After I did a "git submodule update --init --recursive ", all my submodules end up with "* (HEAD detached at 587ee94)"
04:00 phroa cd in to the submodule then check out the branch you want
04:01 inflames joined #git
04:01 somaReve1 phroa: can I make this work automatic?
04:02 phroa as in, when you update --init --recursive the submodules are automatically pulled to HEAD on the remote?
04:04 rscata joined #git
04:04 phroa I don't think they're meant to be used automatically like that.  maybe someone else can tell you
04:04 somaReve1 hmm, why does the branch information get lost?
04:10 bocaneri joined #git
04:13 Keridos joined #git
04:22 BinaryBench joined #git
04:23 cqi joined #git
04:23 SwiftMatt joined #git
04:23 danemacmillan joined #git
04:25 Bubbles how do I capitalize the first letter in every commit of my repos? :D
04:26 mattcen Bubbles: Hold down Shift when you type it :)? Do you mean retroacively?
04:26 Bubbles mattcen, yes :p
04:27 mizu_no_oto joined #git
04:27 mattcen Bubbles: Use git-filter-branch
04:27 Bubbles well, yeah
04:28 mehola joined #git
04:28 einnjo joined #git
04:28 nilg joined #git
04:29 buffffal00 joined #git
04:29 Darren_ joined #git
04:30 mattcen There are examples at the bottom that will be useful. You'll probably want --msg-filter, then use a sed on that to uppercase it with something like 's/^\(.\)/\U/'. I've not tested any of this, but it should point you in the right direction
04:33 mattcen Bubbles: sorry, forgot to ping you. ^^
04:34 nd joined #git
04:35 dreiss joined #git
04:39 snthsnth joined #git
04:39 navidr joined #git
04:39 brain_freeze joined #git
04:44 Cabanossi joined #git
04:44 buffal0 joined #git
04:45 subhojit777 joined #git
04:46 rominron_ joined #git
04:49 fscala joined #git
04:50 thiago joined #git
04:51 daey_ joined #git
04:53 User458764 joined #git
04:54 [Brain] joined #git
04:54 ekinmur joined #git
04:56 thomas joined #git
04:58 subhojit777 joined #git
04:59 Bubbles mattcen, thank you :)
05:00 dermoth joined #git
05:00 rbern joined #git
05:02 acetakwas joined #git
05:06 lordjancso joined #git
05:06 Mobutils joined #git
05:08 buffal0 joined #git
05:09 Derperperd joined #git
05:09 eka joined #git
05:11 svm_invictvs joined #git
05:13 ogny joined #git
05:14 jaguarmagenta joined #git
05:16 mangolisk joined #git
05:22 leptone joined #git
05:23 leptone how can i see all branches in my current repo?
05:23 leptone nvm
05:23 leptone thx
05:23 vuoto joined #git
05:24 Andrew_K|2 joined #git
05:26 PCatinean joined #git
05:26 snthsnth joined #git
05:28 qt-x joined #git
05:29 monoxane joined #git
05:30 tom[] joined #git
05:31 overlord_tm joined #git
05:31 monoxane joined #git
05:31 xall joined #git
05:32 OnBrokenWings joined #git
05:33 eka joined #git
05:33 User458764 joined #git
05:33 lordjancso joined #git
05:35 PCatinean joined #git
05:36 satya4ever joined #git
05:38 dan2k3k4 joined #git
05:41 zeroed joined #git
05:41 svm_invictvs joined #git
05:45 bulletmark joined #git
05:45 danemacmillan joined #git
05:50 jknetl joined #git
05:54 monoxane joined #git
05:55 ThomasLocke joined #git
05:55 Raging_Hog joined #git
05:58 ekinmur joined #git
06:06 lordjancso joined #git
06:11 Phylock joined #git
06:11 lb1c joined #git
06:11 lb1d joined #git
06:18 rominron_ joined #git
06:21 roelmonnens joined #git
06:22 liuzhen joined #git
06:22 nidr0x joined #git
06:26 mkoskar joined #git
06:28 LucaTM joined #git
06:33 gtristan joined #git
06:35 eizua joined #git
06:36 eshlox joined #git
06:38 maret joined #git
06:39 tvw joined #git
06:39 jnavila joined #git
06:39 jaguarmagenta joined #git
06:42 gfixler joined #git
06:43 halbomin joined #git
06:44 Sceorem joined #git
06:45 saedelaere joined #git
06:48 _ikke_ rubber ducking ftw :P
06:49 offtopik joined #git
06:49 star_prone joined #git
06:49 dreiss joined #git
06:50 sagerdearia joined #git
06:55 ap0c joined #git
06:55 Nitesh joined #git
06:56 star_prone joined #git
06:56 bruce_lee joined #git
06:58 fedepad joined #git
07:00 rendar joined #git
07:00 corsibu joined #git
07:00 King_Hual joined #git
07:00 King_Hual joined #git
07:02 danemacmillan joined #git
07:04 ekinmur joined #git
07:04 User458764 joined #git
07:04 corsibu joined #git
07:05 watabou joined #git
07:05 cqi joined #git
07:06 TomyWork joined #git
07:06 corsibu joined #git
07:06 corsibu joined #git
07:07 tanuki joined #git
07:07 gweodoo joined #git
07:10 Haliucinas joined #git
07:11 rominron_ joined #git
07:11 eka joined #git
07:12 evanvarvell joined #git
07:13 corsibu joined #git
07:13 tanuki joined #git
07:14 ayogi joined #git
07:14 corsibu joined #git
07:18 gweodoo osse: pink ? seriously ? wait, i test it...
07:20 gweodoo osse: ... nope for me
07:21 xall joined #git
07:21 nilg joined #git
07:22 osse gweodoo: hmm ?
07:22 jmd joined #git
07:24 corsibu joined #git
07:24 nilg` joined #git
07:25 jailbox joined #git
07:26 cyan__ joined #git
07:28 ionelmanolache joined #git
07:30 jmd In a git hook how can I get the subject line of a commit?
07:30 jmd s/subject/commit-log-message/
07:30 osse jmd: git log -1 --pretty=%s $commit
07:31 grawity and --no-show-signature, just in case
07:31 osse maybe %B
07:31 jmd what will $commit be?  this is in a commit hook.
07:32 osse which of them?
07:32 jmd commit-msg I think.
07:32 quetz joined #git
07:33 osse read it from the first parameter given to the hook
07:33 osse that is the file name
07:33 jmd Oh thanks.
07:34 star_prone joined #git
07:35 elect joined #git
07:36 jmd In general, is it possible to test if a commit is  a revert?
07:36 sea-gull joined #git
07:38 djb-irc joined #git
07:38 eduardas_m joined #git
07:38 ^7heo jmd: yes, but the only way I know is to look for an inverted patch in the whole history
07:38 jmd ^7heo: OK.
07:38 gweodoo osse: "09:07:00       osse | gweodoo: i suggest bright pink instead of the default slighli lighter blue"
07:39 User458764 joined #git
07:40 ^7heo jmd: now if the revert had conflicts that were resolved by hand...
07:40 ^7heo jmd: it's gonna be hard to spot
07:40 jmd yep
07:41 danslo joined #git
07:41 ^7heo hence git revert adding a specific message
07:42 Shentino joined #git
07:42 BadSnappa joined #git
07:43 meloc joined #git
07:43 meloc joined #git
07:43 jmd Another question: How can I get a list of files about to be committed?
07:45 encod3 joined #git
07:45 ^7heo git diff --stat?
07:45 brokensyntax joined #git
07:45 SteffanW joined #git
07:47 jmd ^7heo: Looks like it would need a lot of filtering...
07:47 ^7heo ?
07:47 ieee joined #git
07:48 ^7heo how big are your commits? :p
07:48 cdown_ joined #git
07:48 jmd Typically not big.
07:48 ^7heo so why the filtering?
07:49 jmd Because git diff --stat includes lots of crap in addition to changed files
07:51 ^7heo dude, you gonna have to start providing relevant information in your questions if you want relevant answers
07:52 ^7heo don't have me guess that you are writing a frontend for git
07:52 nickthetait joined #git
07:52 jmd Well don't guess then :)
07:52 _ikke_ git diff --name-only
07:52 ^7heo there are bindings for that
07:52 corsibu joined #git
07:52 _ikke_ But use plumbing tools for scripts
07:53 mischat joined #git
07:53 ^7heo jmd: you are extremely arrogant.
07:53 jmd ditto
07:53 _ikke_ git diff-index --name-only HEAD
07:53 ^7heo jmd: dafuq?
07:54 ^7heo jmd: ok, you're a troll
07:54 rendar joined #git
07:54 _ikke_ Both, take it easy
07:54 flaviodesousa joined #git
07:54 mischat joined #git
07:54 ^7heo _ikke_: don't say both when someone is obv bulllying someone else >_<
07:55 _ikke_ I don't see this as an obvious troll
07:56 ^7heo read more
07:56 ^7heo I have not been arrogant, yet jmd answered "ditto"
07:56 danslo some people haven't had their coffee this morning, geez :)
07:56 _ikke_ hehe
07:57 _ikke_ Don't escalate it
07:57 GavinMagnus joined #git
07:57 ^7heo danslo: I'm on a f***ing smartphone, it does not help staying calm when trolled
07:57 kurkale6ka joined #git
07:58 Balliad joined #git
07:58 _ikke_ Calling someone a troll is very easy
07:58 rorro joined #git
07:59 ^7heo _ikke_: overlooking something too
08:00 ^7heo _ikke_: the person literally told me: you help me in my terms or gtfo
08:00 finalbeta joined #git
08:00 tribly joined #git
08:03 mikecmpbll joined #git
08:03 chele joined #git
08:04 jnavila_ joined #git
08:05 pijiu2 joined #git
08:05 scoopfinder joined #git
08:05 brokensyntax joined #git
08:07 LucaTM joined #git
08:07 pikajude joined #git
08:07 maret joined #git
08:08 jmd _ikke_: That command seems to also list files not in the index.
08:08 ekinmur joined #git
08:08 finalbeta joined #git
08:08 Haliucinas joined #git
08:09 lindenle joined #git
08:11 mischat_ joined #git
08:11 ^7heo jmd: git diff --stat --only-files
08:12 ^7heo jmd: git diff --stat --name-only
08:12 ^7heo sorry confused the flag
08:13 jmd Oh I need to add --cached
08:13 jnavila__ joined #git
08:15 ahmedelgabri joined #git
08:17 bongjovi joined #git
08:18 Snugglebash joined #git
08:20 wrouesnel1 joined #git
08:20 NightMonkey joined #git
08:21 Filiphe joined #git
08:21 ncopa joined #git
08:22 PioneerAxon joined #git
08:23 t4nk937 joined #git
08:23 osse gweodoo: Did you determine that fast that it was not effective for you?
08:23 t4nk937 left #git
08:23 Murii joined #git
08:26 jnavila__ joined #git
08:28 cdown_ joined #git
08:31 ToBeCloud joined #git
08:31 chll_ joined #git
08:32 scoopfinder Hello :) I am looking for a way to add gitignore rules in a specific repository, without having this rules to be repercuted to the remote repo.
08:33 scoopfinder Like the global ignore, but only for a specific repository. Is that possible?
08:33 tobiasvl scoopfinder: does the repo already have a .gitignore file?
08:33 tobiasvl if not, you can just make one and not commit it (you can even ignore it)
08:33 scoopfinder Yes it does
08:33 tobiasvl ok you can add files to .git/info/exclude then
08:34 scoopfinder Oh I knew there was a way :) tobiasvl: so this will only stay locally right?
08:34 MrWoohoo joined #git
08:34 tobiasvl yep
08:45 troulouliou_div2 joined #git
08:45 WayToDoor joined #git
08:46 danemacmillan joined #git
08:47 CalimeroTeknik joined #git
08:47 _cyril_ joined #git
08:48 ImNotQ009 joined #git
08:48 CalimeroTeknik hi, I used git bisect and it ended up on a merge commit. but it doesn't identify just one commit!
08:49 CalimeroTeknik if I run `git log --patch hash^..hash` with "hash" being the hash of the "first bad commit is …", I get lots of commits
08:49 ImNotQ009 Hello. git says my local branch is ahead of origin/master. How do I fix it? I tried git reset --hard
08:49 CalimeroTeknik it's normal, it means you made some commits didn't you?
08:49 ImNotQ009 I didn't
08:50 CalimeroTeknik look at the output of `git log origin/master..master`
08:50 ImNotQ009 Oh, right. I forgot. I had cherry-picked 2 commits. And after I pulled it resulted in a merge
08:51 ImNotQ009 How do I restore it, so it's the same as remote?
08:52 osse I think I have maybe potentially achieved bliss
08:52 sea-gull ImNotQ009: git branch saved_branch; git reset --hard origin/master
08:52 ImNotQ009 I figured it out
08:53 aard_ joined #git
08:53 ImNotQ009 I just reset my branch to a state from before the cherry picks
08:53 ImNotQ009 And did a pull again
08:53 ImNotQ009 Thanks though
08:54 brokensyntax joined #git
08:58 quackgyver joined #git
09:05 Lunatrius joined #git
09:05 leptone joined #git
09:07 b100s joined #git
09:08 jaguarmagenta joined #git
09:11 snthsnth joined #git
09:12 ekinmur joined #git
09:13 systemovich joined #git
09:13 ENN13 joined #git
09:13 ENN13 efnet news epsiode 13 https://youtu.be/gvX41zoyBy0 <- give it a listen before it gets removed ! Brought to you by Jason Bandy.
09:13 ENN13 left #git
09:14 mic4ael joined #git
09:16 cdown_ joined #git
09:16 maret joined #git
09:17 roelmonn_ joined #git
09:18 scoopfinder tobiasvl, thank you for this :)
09:22 twoninefive joined #git
09:24 \du joined #git
09:30 xaa joined #git
09:32 geoid joined #git
09:33 spykins joined #git
09:35 cbreak is there a way to make git lfs replace all pointers with real files?
09:35 cbreak it seems git am can't handle it
09:36 jnavila__ joined #git
09:36 acetakwas joined #git
09:37 mischat joined #git
09:39 Impaloo joined #git
09:40 ocbtec joined #git
09:40 corsibu joined #git
09:42 BombStrike joined #git
09:46 durham joined #git
09:52 User458764 joined #git
09:56 fahadash joined #git
09:57 danslo_ joined #git
09:57 jaguarmagenta joined #git
09:59 corsibu joined #git
10:01 ENN13 joined #git
10:01 ENN13 efnet news epsiode 13 https://youtu.be/gvX41zoyBy0 <- give it a listen before it gets removed ! Brought to you by Jason Bandy.
10:01 ENN13 left #git
10:03 heroux joined #git
10:03 Wayne_Shephard joined #git
10:03 liuzhen joined #git
10:03 durham joined #git
10:04 tobiasvl who are the ops here again? _ikke_?
10:05 canton7 ooh, we've gained quite a few ops since I last looked
10:05 canton7 he's left anyway. If he comes back we can consider a ban, but imo it's not worth it for a single post-and-run
10:06 dodobrain joined #git
10:07 rafalcpp joined #git
10:08 tobiasvl (double post-and-run)
10:08 tobiasvl but yeah, no worries
10:08 heroux joined #git
10:08 tobiasvl is there a gitinfo trigger to alert ops or something? I don't like pinging single persons but what are you gonna do
10:09 canton7 ah, didn't spot the first one
10:09 scoopfinder left #git
10:09 canton7 don't think gitinfo supports that at the moment - https://github.com/jast/gitinfo
10:09 canton7 ping jast when he's back, or maybe raise an issue?
10:09 tobiasvl no biggie, but could be useful
10:11 shock_ joined #git
10:11 lindenle joined #git
10:12 rahtgaz joined #git
10:13 Fissure joined #git
10:13 jbitdrop joined #git
10:14 roelmonnens joined #git
10:16 ekinmur joined #git
10:18 aswen joined #git
10:23 brokensyntax joined #git
10:23 fees joined #git
10:23 User458764 joined #git
10:24 corsibu joined #git
10:28 gweodoo osse: I'm not really a "pinky-lover" man
10:30 gweodoo osse: -pinky,+pink
10:32 phillly joined #git
10:34 eb_ joined #git
10:38 eduardas_m joined #git
10:39 grift joined #git
10:43 dsantiago joined #git
10:45 mischat joined #git
10:46 inflames joined #git
10:46 cbreak tobiasvl: what happened?
10:48 Rodya_ joined #git
10:48 Borkr joined #git
10:48 grift joined #git
10:48 tobiasvl just some person who came here and posted a video that seemed to be some kind of internal EFNet mockery, not sure
10:48 _cyril_ joined #git
10:49 osse impossibru. efnet is best net
10:50 bremner no u
10:52 lss8 joined #git
10:52 lss8 joined #git
10:52 star_prone joined #git
10:56 InfoTest joined #git
10:56 a3pq51 joined #git
10:57 prillian5 joined #git
10:58 topcat joined #git
10:58 prillian5 I have a project from git. I add a directory "myModules" and put submodules inside this directory (each module an own submodule)
10:58 djb-irc joined #git
10:59 prillian5 Is it ok to add myModules to gitignore of main-projejct, to prevent to push this to main-git-repositorie?
10:59 netj joined #git
10:59 zulutango joined #git
11:01 ejnahc_ joined #git
11:02 spykins_ joined #git
11:02 heroux joined #git
11:04 rorro joined #git
11:04 SwiftMatt joined #git
11:06 sammyo joined #git
11:06 buzzLightBeer joined #git
11:06 chele joined #git
11:07 star_prone joined #git
11:08 cbreak Hmm... Git merge seems to have a bug.
11:08 cbreak I want to --squash merge, but git merge --squash doesn't create a commit
11:08 _ikke_ THat's by design
11:08 cbreak "Squash commit -- not updating HEAD"
11:08 cbreak hmm...
11:09 _ikke_ You have to do the commit yourself
11:09 _ikke_ MERGE_HEAD should exist
11:09 osse Is it actually by design, or just by accindent and then documented? :P
11:09 cbreak _ikke_: it doesn't exist
11:09 _ikke_ cbreak: Oh no, of course not, it does not create an actual merge
11:10 _ikke_ osse: who knows
11:10 osse _ikke_: satan, maybe
11:10 tobiasvl satan knows all
11:11 osse He is.
11:13 barteks2x joined #git
11:16 cbreak Unity engine is such a pile of garbage
11:19 dan2k3k4 joined #git
11:21 heroux joined #git
11:21 dendazen joined #git
11:21 nettoweb joined #git
11:21 corsibu joined #git
11:23 ekinmur joined #git
11:25 rorro joined #git
11:25 rnsanchez joined #git
11:26 Faylite joined #git
11:30 ojdo joined #git
11:32 User458764 joined #git
11:32 mischat joined #git
11:33 Gloomy joined #git
11:33 mischat_ joined #git
11:34 noidea joined #git
11:37 DieguezZ joined #git
11:37 nuck joined #git
11:40 qsx tobiasvl, canton7: .trigger_add ops ...
11:41 achadwick joined #git
11:42 dede_ joined #git
11:43 canton7 qsx, I think he means something that msgs them, or something
11:43 qsx *shrug*
11:43 canton7 pinging everyone could work, but kinda exposes who the ops are to everyone
11:43 qsx you mean, /msg chanserv flags #git doesn't?
11:44 qsx hm.  it still lists my old account name there
11:44 tobiasvl You are not authorized to perform this operation.
11:44 qsx oh
11:44 qsx well, i am ...
11:44 qsx okay, point taken
11:45 osse canton7: but police officers patrolling the streets only work if they're in uniform!
11:46 canton7 we'd all be oppoed if that worked in irc :P
11:46 qsx OKAY, BEHAVE NOW, OFFICER QSX IS ON DUTY
11:46 tobiasvl can I be an op plz
11:46 Snugglebash joined #git
11:46 qsx here's your gun
11:46 tobiasvl hahaha
11:47 qsx okay, shift is over
11:47 tobiasvl it was enlightening
11:47 tobiasvl I have a newfound respect for your authority now
11:47 canton7 there, have some minor enlightenment
11:48 tobiasvl thanks. this is like in the wild west when a sheriff deputized a random dude because they needed some help with a renegade
11:48 User458764 joined #git
11:51 fuzzmz :)
11:52 Rodya_ joined #git
11:52 GavinMagnus joined #git
11:56 mischat joined #git
11:57 liuzhen joined #git
11:57 osse i found a picture of tobiasvl: https://s-media-cache-ak0.pinimg.com/originals​/c6/71/b4/c671b49b5600ab8829336dc5ab68408a.jpg
11:58 jaguarmagenta joined #git
11:58 johnmilton joined #git
12:00 synthroid joined #git
12:00 tobiasvl I found a picture of osse https://cdn-images-1.medium.com​/max/800/0*KdgnxVHPoUakQW5z.jpg
12:00 johnmilton joined #git
12:00 anonymuse joined #git
12:01 systemovich joined #git
12:06 rbern joined #git
12:07 subhojit_ joined #git
12:08 dan2k3k4 joined #git
12:09 HardlySeen joined #git
12:12 danemacmillan joined #git
12:13 Rhonda Good comeback. :)
12:13 lindenle joined #git
12:14 tobiasvl slow git friday
12:15 brokensyntax joined #git
12:15 osse I don't know what to read from this
12:15 star_prone joined #git
12:15 tobiasvl did you watch the movie your picture was from?
12:16 tobiasvl wild wild west
12:16 ieee joined #git
12:17 osse yeah but why did you pick a crippled character ;_;
12:26 sdothum joined #git
12:29 InfoTest joined #git
12:29 rominron_ joined #git
12:30 rominron_ joined #git
12:30 GavinMagnus joined #git
12:30 jimi_ joined #git
12:32 _ix joined #git
12:34 johnmilton joined #git
12:35 johnmilton joined #git
12:35 johnmilton joined #git
12:36 bejeb left #git
12:37 fuchstronaut joined #git
12:37 JamesBaxter joined #git
12:38 ardian joined #git
12:38 fuchstronaut joined #git
12:38 ardian Hi, is it possible to remove a file from git that is already commited before, I want to remove the file and remove it from the git commit history
12:40 osse ardian: !sensitive
12:40 gitinfo ardian: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
12:40 ardian osse: thanks!
12:42 venmx joined #git
12:47 overlord_tm joined #git
12:47 synthroi_ joined #git
12:48 rgrinberg joined #git
12:49 _cyril_ joined #git
12:51 akanksha_ joined #git
12:52 Rodya_ joined #git
12:53 montyboy joined #git
12:54 JamesBaxter joined #git
12:55 GavinMagnus joined #git
12:55 mehola joined #git
12:56 spykins joined #git
12:58 cdg joined #git
12:59 Remramm joined #git
12:59 Remramm joined #git
13:00 Snugglebash joined #git
13:01 atomicb0mb joined #git
13:02 mischat_ joined #git
13:03 spykins_ joined #git
13:03 chll_ joined #git
13:04 ahmed_elgabri joined #git
13:08 tvw joined #git
13:10 heroux joined #git
13:10 jeffreylevesque joined #git
13:11 fmcgeough joined #git
13:11 irco joined #git
13:11 CEnnis91 joined #git
13:11 gho5t joined #git
13:12 lmatteis joined #git
13:13 EricPoe joined #git
13:14 WayToDoor joined #git
13:15 InfoTest joined #git
13:15 AaronMT joined #git
13:16 heroux joined #git
13:16 jaguarmagenta joined #git
13:18 djb-irc joined #git
13:18 LBV_User joined #git
13:20 tango_ joined #git
13:20 mizu_no_oto joined #git
13:21 ExoUNX joined #git
13:21 aswen joined #git
13:22 nikivi joined #git
13:22 ekinmur joined #git
13:23 malcon joined #git
13:25 spykins_ joined #git
13:27 rorro joined #git
13:28 heroux joined #git
13:30 cdown joined #git
13:31 acetakwas joined #git
13:31 todd_dsm joined #git
13:33 phanimahesh joined #git
13:33 GodGinrai joined #git
13:34 User458764 joined #git
13:36 cdown_ joined #git
13:36 hariel joined #git
13:37 Darcidride joined #git
13:37 seishun joined #git
13:38 sbeller_ joined #git
13:38 seishun I did `git pull` and fixed conflicts, then realized I wanted to rebase instead. Any way to recover while keeping the merge result?
13:38 djb-irc joined #git
13:39 Khisanth joined #git
13:40 e14 joined #git
13:41 buffal0 joined #git
13:41 Darcidride joined #git
13:41 jeffreylevesque is github traffic not working?
13:42 _ikke_ jeffreylevesque: There is #github
13:43 GodGinrai seishun: not really
13:43 spykins_ joined #git
13:44 mischat joined #git
13:44 seishun GodGinrai: I did `git pull --rebase`, worked fine
13:44 GodGinrai seishun: oh wow.  Didn't think that would work
13:44 osse in that case rerere is already enabled
13:44 osse praise gaben
13:44 BSAlb joined #git
13:45 * GodGinrai is confused as to how gaben is related to git
13:46 osse yeah they prolly use perforce
13:46 PioneerAxon joined #git
13:48 rnsanchez_ joined #git
13:48 Snopandan joined #git
13:49 sammyo joined #git
13:50 sorenb joined #git
13:51 DeltaHeavy joined #git
13:52 acetakwas joined #git
13:52 Impaloo joined #git
13:53 e14 joined #git
13:54 Gsham joined #git
13:55 shinnya joined #git
13:56 ash_workz joined #git
13:57 sangy joined #git
13:57 e14 joined #git
13:57 shiriru joined #git
13:58 eivarv joined #git
13:59 e14_ joined #git
14:00 phaleth joined #git
14:01 pijiu joined #git
14:02 matrixa1 joined #git
14:02 star_prone joined #git
14:02 pijiu joined #git
14:02 jnewt joined #git
14:03 star_prone joined #git
14:03 jimi_ joined #git
14:03 e14 joined #git
14:03 pijiu joined #git
14:05 pijiu joined #git
14:06 pijiu joined #git
14:07 eduardas_m joined #git
14:07 pijiu joined #git
14:08 ismithers1 joined #git
14:08 nettoweb joined #git
14:08 canuk joined #git
14:08 pijiu joined #git
14:10 marcogmonteiro joined #git
14:11 Lunatrius joined #git
14:13 Fantomask joined #git
14:15 lindenle joined #git
14:15 raijin joined #git
14:15 piling_ joined #git
14:18 cdg_ joined #git
14:18 patarr joined #git
14:20 ResidentBiscuit joined #git
14:20 Rodya_ joined #git
14:25 User458764 joined #git
14:26 jaguarmagenta joined #git
14:27 Lunatrius` joined #git
14:28 hashpuppy joined #git
14:31 InfoTest joined #git
14:31 serycjon joined #git
14:33 mischat joined #git
14:34 nikivi joined #git
14:35 DeltaHeavy joined #git
14:36 dan2k3k4 joined #git
14:36 al-damiri joined #git
14:37 ardian left #git
14:40 nidr0x joined #git
14:40 mischat joined #git
14:42 Filiphe joined #git
14:42 gtristan joined #git
14:44 acetakwas joined #git
14:45 thebope joined #git
14:45 raijin joined #git
14:45 Ryanar joined #git
14:48 hariel joined #git
14:49 subhojit777 joined #git
14:50 UTAN_dev joined #git
14:50 InfoTest joined #git
14:50 _cyril_ joined #git
14:50 alhariel joined #git
14:50 crose joined #git
14:51 Bubbles can you even pull commits straight from a ML
14:51 Bubbles as an outside user
14:51 _ikke_ sure
14:51 Bubbles an*
14:51 Bubbles okay
14:52 Bubbles thank you
14:52 GodGinrai ML?
14:52 _ikke_ They're patches, and git am can apply those
14:52 Bubbles mailing list
14:52 _ikke_ mailing list
14:52 GodGinrai ahh
14:52 Bubbles I see
14:52 Bubbles thank you, again :)
14:54 fedepad joined #git
14:56 Darren_ joined #git
14:56 robotroll joined #git
14:58 Rodya_ joined #git
14:58 realz__ joined #git
14:59 bluepixel joined #git
14:59 TomyLobo joined #git
14:59 Ryanar joined #git
15:00 e14_ joined #git
15:01 fusionx86 joined #git
15:04 dreiss joined #git
15:04 romerocesar joined #git
15:05 e14_ joined #git
15:08 Noldorin joined #git
15:08 lindenle joined #git
15:09 e14_ joined #git
15:13 e14 joined #git
15:13 e14_ joined #git
15:14 Ryanar joined #git
15:15 SteffanW joined #git
15:15 kpease joined #git
15:17 EmeraldExplorer joined #git
15:19 rendar joined #git
15:19 crayon joined #git
15:20 eizua joined #git
15:23 DarkFox__ joined #git
15:24 manuel_ joined #git
15:27 jbeeze joined #git
15:28 jaafar joined #git
15:28 rgrinberg joined #git
15:29 Spacew00t joined #git
15:29 overlord_tm joined #git
15:29 durham joined #git
15:30 Hanumaan joined #git
15:31 User458764 joined #git
15:31 brokensyntax joined #git
15:31 patarr joined #git
15:32 Hanumaan I have scenario where I want to keep a file(in sublime settings folder) in git sync with multiple computers. But the file is not in the git folder it is a file containing settings of one package which gets used? what is the solution?
15:33 aarobc joined #git
15:34 serycjon Hanumann: not sure if I understand well, but what about to move the file into your git repo and only make a symbolic link to it in the sublime settings folder?
15:34 _ikke_ serycjon: Right, that's what I would do too
15:34 venmx joined #git
15:35 rbr joined #git
15:36 steven Connection to bitbucket.org closed by remote host..00 KiB/s
15:36 steven fatal: The remote end hung up unexpectedly
15:36 steven fatal: early EOF
15:36 steven fatal: index-pack failed
15:36 steven is what I get after trying to pull changes from a server, any idea?
15:36 johnmilton joined #git
15:37 Hanumaan serycjon, it is a good idea but actually that settings file gets used in multiple git repos ..
15:37 serycjon and it is supposed to stay the same in all of them?
15:37 johnmilton joined #git
15:38 Hanumaan serycjon, yes ..
15:38 finalbeta joined #git
15:38 fedepad joined #git
15:38 DieguezZ joined #git
15:40 serycjon Hanumaan: then they probably shouldn't be kept in multiple git repos... Maybe submodules could be used? Like making a submodule with only the config file and using this submodule in all the repos? But I know next to nothing about that.
15:41 crayon joined #git
15:41 zivester joined #git
15:42 nedbat i've developed a habit of typing "git commit -am blah-blah", even after i've already added files, and then I get unwanted changes in the commit. is there a way to make "commit -a" an error, or a warning, or some other way to force me to break this habit?
15:43 _ikke_ nedbat: I guess by making a wrapper that you put in $PATH?
15:44 _ikke_ It would verify if -a has been passed
15:44 nedbat _ikke_: do you have an example of such a wrapper? I use "ci" as an alias, I guess I could make that more sophisticated.
15:45 _ikke_ No, I have not
15:45 e14 joined #git
15:45 mischat_ joined #git
15:46 ochorocho__ joined #git
15:46 satya4ever joined #git
15:48 crose joined #git
15:50 jeffreylevesque sorry i'm asking here.  but, is anyone noticing their github repo graphs/traffic having unusual low traffic today?
15:52 jnewt joined #git
15:52 _ikke_ I have no idea
15:52 User458764 joined #git
15:54 littleforest joined #git
15:54 rendar joined #git
15:55 netj joined #git
15:55 Oebele joined #git
15:58 mischat joined #git
16:00 mehola joined #git
16:00 EvilPeng1 joined #git
16:02 _geoff joined #git
16:03 _geoff git is lying to me.  i am trying to convert a submodule into just a regular directory
16:03 _geoff i removed hte .git folder inside the submodule
16:03 _geoff and tried to git rm the file
16:03 _geoff it says it uses a .git directory but there is no .git directory
16:03 _geoff and i don't hav ea .gitmodules file
16:03 dviola joined #git
16:03 _geoff in the parent / main repo..
16:04 oskarkv joined #git
16:06 _geoff http://lpaste.net/1791929685253292032
16:06 crose joined #git
16:07 shiriru joined #git
16:09 tny_o joined #git
16:09 durham joined #git
16:10 serycjon _geoff: what is inside your .git in the root of the repo?
16:10 madewokherd joined #git
16:11 _cyril_ joined #git
16:14 ieee left #git
16:14 nettoweb joined #git
16:14 tmk joined #git
16:16 mindfart joined #git
16:16 crose joined #git
16:17 Dougie187 joined #git
16:22 fuchstronaut joined #git
16:24 nitric joined #git
16:24 a_thakur joined #git
16:24 nettoweb1 joined #git
16:25 kbdkode joined #git
16:27 jaguarmagenta joined #git
16:29 User458764 joined #git
16:29 kpease joined #git
16:29 raspado joined #git
16:29 gho5t joined #git
16:30 mizu_no_oto joined #git
16:30 cagedwisdom joined #git
16:31 Snugglebash joined #git
16:32 romerocesar joined #git
16:34 EvilPenguin joined #git
16:35 Emperor_Earth joined #git
16:38 ex0r joined #git
16:39 InfoTest joined #git
16:39 kadoban joined #git
16:40 ex0r hello, I was wondering if somebody could help me with some logic with using git. I have been trying to research how to best use it for a long time, and I can't seem to wrap my head around it. If I described our working environment, could somebody help me conclude how to incorporate git into my daily workflow?
16:41 peeps joined #git
16:41 tmk joined #git
16:41 PioneerAxon joined #git
16:41 ex0r I know it's a rather simple concept to understand, but I tend to be a do it by actions type person, not a 'read and understand' person, plus I have a massive habit of overthinking even the simplest stuff.
16:42 peeps joined #git
16:42 dviola joined #git
16:42 _ikke_ Sure, just explain your situation
16:42 eb_ joined #git
16:42 Rodya_ joined #git
16:42 danimal2 joined #git
16:43 einnjo joined #git
16:43 magellanicloud joined #git
16:43 ex0r okay, we are a web development company, small. We work with only a couple of projects. We have this setup right now (local development, staging environment, production environment). We want to incorporate source control into our workflow as currently we just use ftp to go from dev to staging to production. We know going forward, that we want all commits from local development to staging to be reviewed, and merged by an admin or superior
16:46 ex0r the way I am trying to set it up, we have two repos. One for staging, one for production. People clone (or pull) staging down to their local development, branch off, make the changes, and then commit/push them into their local development. The problem with that, is they can then push up to the remote staging repo. I believe we are doing it wrong.
16:46 Mobutils joined #git
16:47 _ikke_ Well, you can use something like gitolite to have control about what users can push to where
16:47 nettoweb joined #git
16:47 ex0r well we use beanstalk, which is like bitbucket right now
16:47 _ikke_ Right, it should also have those kind of options
16:47 ex0r but I think we are struggling trying to figure out how to structure the repos/branches for each project
16:47 _ikke_ right
16:48 ex0r like.. if they merge their local stuff and push up to the remote staging repo, will it automatically allow the changes, or will it create a pull request that can be reviewed and manually merged?
16:49 _ikke_ No, if they merge locally, and they can push it to the upstream branch, the merge has already happened\
16:49 ex0r or.. would the branch be created on remote, then they checkout that remote branch, and when they commit, THATS where the merge happens?
16:50 jnewt joined #git
16:50 _ikke_ ex0r: Users would typically push a feature branch, and then use that feature branch to create a pull request
16:50 _ikke_ They don't merge that branch locally
16:51 ex0r So the branch stays unmerged locally
16:51 _ikke_ yes
16:51 ex0r and they ask to marge it into the upstream repo?
16:51 _ikke_ Because they don't decide that it gets merged
16:51 _ikke_ yes
16:51 ex0r okay, how do they do that? Just by attempting to push to remote?
16:51 _ikke_ And that's usualyl where the review happens
16:52 _ikke_ ex0r: I don't know beanstal, but usually the users get the option to create a pull request on the web interface
16:52 leeN joined #git
16:52 _ikke_ Those webapps detect that a new branch has been pushed and already offer to create the pull request
16:52 ex0r right, I didnt mean app specific, i meant in the form of git. I guess I was assuming that a pull request would allow the reviewer to 'pull' the code into their local repo, do testing etc
16:52 svm_invictvs joined #git
16:53 ex0r and then if it's okay, merge it into the remote repo
16:53 mischat_ joined #git
16:53 _ikke_ ex0r: right, litterally, a pull request is just a signal to someone to ask if a certain branch could be merged
16:53 Zeedox joined #git
16:53 _ikke_ But github, bitbucket, gitlab and probably also beanstalk built a webinterface around that
16:53 metrixx_ joined #git
16:53 _ikke_ With review possibilities, inline comments, etc
16:54 ex0r okay, so since those files are on the 'pushers' local repo, aside from viewing the source of the files, theres no way for a reviewer to pull them to their own local repo/branch and test them in real time?
16:54 cebor joined #git
16:54 _ikke_ ex0r: They need of course make their feature branch available somewhere
16:55 yqt joined #git
16:55 ex0r okay, so hmm..
16:55 _ikke_ either by pushing it somewhere, or telling where someone can fetch their changes from
16:56 ex0r so then does this setup seem like it would work? Staging Repo - pulled down to loca dev environments, feature branch is made, changes are made, pushed to remote staging repo, where a pull request is made
16:56 ex0r reviewer signs off on changes, merges, local dev branch is now deleted
16:57 _ikke_ You can either use separate repositories for that, but you can also use specific branches for that
16:57 ex0r Yeah, I was thinking of doing that. What is the best way? I was doing repos for organization inside the interface
16:57 kpease joined #git
16:58 ex0r as I wasn't sure if making branches of branches was more difficult
16:58 _ikke_ !workflow
16:58 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
16:58 mischat joined #git
16:59 ex0r yeah, that's one of the documents i've been reviewing and having a hard time understanding.
17:00 _ikke_ Ok
17:00 Dougie187 joined #git
17:01 Dougie187 left #git
17:01 ex0r I am going to delve into the permissions available inside beanstalk
17:01 _ikke_ Myself I tend to use a workflow like git-flow
17:02 metrixx_ joined #git
17:02 ex0r So now comes the next question.. is there a git specific permission that allows people to make pull requests, but not actually push changes to a repo/branch? I mean, from my understanding a pull request is the same thing as a push, except there's an approval that needs to be done first.
17:03 e14 joined #git
17:03 ex0r hmm nevermind, it looks like beanstalk does pull requests for every push
17:04 Bubbles having the darndest time applying a patch
17:05 Bubbles copy-and-pasted it from email to vim.. try to apply file.. not applicable
17:06 Bubbles the repo https://git.archlinux.org/pacman-contrib.git/log/
17:06 Electrometro joined #git
17:06 Bubbles the file and email https://ptpb.pw/CO09 https://lists.archlinux.org/pipermail/p​acman-contrib/2016-October/000017.html
17:07 rbr joined #git
17:08 Bubbles first time attempting this
17:08 ex0r erm.. that didnt appear to work
17:08 bluepixel joined #git
17:10 _ikke_ Bubbles: Let me test
17:11 ex0r made a local feature branch and pushed it to remote master repository and it went straight to it and automatically merged it
17:11 geoid joined #git
17:12 publio joined #git
17:13 _ikke_ Bubbles: And how are you applying
17:13 _ikke_ ?
17:13 metrixx_ joined #git
17:14 star_prone joined #git
17:15 _ikke_ Bubbles: The problem is that you need to find the commit this patch was based on
17:15 _ikke_ It does not apply cleanly on HEAD
17:15 _ikke_ on master I mean
17:15 metrixx_ joined #git
17:15 varx1 joined #git
17:16 heroux joined #git
17:16 pouet joined #git
17:17 aarobc joined #git
17:18 Mobutils left #git
17:18 jantje joined #git
17:18 metrixx_ joined #git
17:21 nettoweb joined #git
17:22 dviola joined #git
17:23 dreiss joined #git
17:25 Gsham joined #git
17:26 bluezone joined #git
17:27 _ikke_ Bubbles: I have a patch that you could apply
17:27 _ikke_ if you are interested
17:27 nikivi joined #git
17:27 Bubbles _ikke_, https://lists.archlinux.org/pipermail/​pacman-contrib/2016-October/date.html
17:29 _ikke_ https://ikke.info/d/paccache.sh.in.patch
17:29 _ikke_ This should apply
17:29 star_prone joined #git
17:29 bmahe joined #git
17:30 joki- joined #git
17:30 mizu_no_oto joined #git
17:31 SwiftMatt joined #git
17:31 Bubbles _ikke_, how'd you convert it?
17:31 _ikke_ Bubbles: I used git apply --reject <patch>
17:31 _ikke_ and then manually applied the rejected hunk
17:33 Bubbles I wonder if it's just the @
17:33 star_pro_ joined #git
17:33 _ikke_ yup, that's the diff
17:34 _ikke_ Bubbles: Be aware, my patch used spaces instead of tabs
17:36 Bubbles noticed :p
17:36 heroux joined #git
17:36 Bubbles I just changed the "  at  "'s with "@" in the patch file
17:37 Bubbles single spaces*
17:37 jstein_ joined #git
17:38 titankiller joined #git
17:40 cyphase joined #git
17:42 finalbeta joined #git
17:42 kpease joined #git
17:43 maret joined #git
17:43 heroux joined #git
17:45 _ikke_ rigth
17:47 Guest44669 joined #git
17:47 thiago joined #git
17:47 Sasazuka joined #git
17:48 anon183 joined #git
17:49 heroux joined #git
17:50 mns joined #git
17:50 aarobc joined #git
17:51 dviola joined #git
17:52 LucaS05 joined #git
17:53 buddyq joined #git
17:54 LucaS05 hi. Do you usually add the .gitignore file to the .gitattribtues file for things like merge=ours (So to have the .gitignore in production to be preserved in a merge)
17:54 LucaS05 ?
17:54 Emperor_Earth joined #git
17:54 buddyq hi all, I'm new at git and learning all the commands and trying it out and I know just enough now to screw things up!!!
17:54 buddyq I made a branch on my local and also made the same named branch on the remote server which is my hosting server. And switched to that branch.
17:55 P4nther joined #git
17:55 buddyq I then made a change to a file on my local and added to stage and did a commit. Then I pushed it to the hosting server and that branch.
17:55 King_Hual joined #git
17:55 King_Hual joined #git
17:55 Rodya_ joined #git
17:55 buddyq I did 'git log' and see my commit message on the remote server. But the change on the website did not take effect.
17:56 buddyq It still has the old code. Why is that? What am I doing wrong?
17:58 buddyq anyone have any ideas for me?? I must have read about 100 stackoverflow pages and watched 20 git vids on youtube.
17:58 thiago joined #git
17:58 jaafar joined #git
18:00 stbenz joined #git
18:00 Guest84029 joined #git
18:00 LucaS05 The question is: how to ignore .gitignore files during a merge? E.g. .gitignore files could be different in dev and production
18:01 kadoban buddyq: git isn't for deployment. What you've said so far is pretty much just ... everything working as designed.
18:01 kadoban buddyq: Use something else for deployment. I like rsync usually.
18:01 star_prone joined #git
18:01 mehola joined #git
18:02 heroux joined #git
18:02 dsantiago joined #git
18:03 test193 joined #git
18:03 mns joined #git
18:03 LionsMane joined #git
18:04 troulouliou_div2 joined #git
18:04 Mobutils joined #git
18:04 test193 Hi all, does anyone know if there are special steps required to compile git on a CentOS or RHEL platform?
18:04 cyphase joined #git
18:05 test193 After compilation of git I get a "git: 'submodule' is not a git command. See 'git --help'." error. The issue only happens after compiling git on RHEL or CentOS...I can compile OK on Ubuntu
18:05 arand__ joined #git
18:05 ash_workz joined #git
18:06 nilg joined #git
18:09 thiago joined #git
18:10 Guest84029 joined #git
18:13 Cavallari joined #git
18:15 cyphase joined #git
18:16 paul424 joined #git
18:17 buddyq kadoban: I'm really confused. This should change the file on the site though. I dont know why you say its not for deployment. You can use it on a hosting server that serves the pages up.
18:17 buddyq Whether you like that principle or not. Like doing this on dev.mysite.com
18:17 buddyq why wouldn't that make sense?
18:18 Doginal joined #git
18:18 mycelium joined #git
18:18 einnjo joined #git
18:18 _ikke_ test193: what does `file $(git --exec-path)/git-submodule` return?
18:18 kadoban buddyq: You can build a deployment thing around it, if you must. But you didn't describe doing that.
18:19 geoid joined #git
18:19 buddyq no because i'm not trying to do that.
18:19 buddyq I'm merely trying to edit a file and see the changes and be able to undo something if I screw it up.
18:20 Borkr joined #git
18:20 buddyq nobody uses git to change their websites?
18:21 _ikke_ No
18:21 _ikke_ well, enough people do, but they often run into problems
18:21 kadoban buddyq: Many people do, but they typically have to set it up themselves. (and IMO they shouldn't, more often than not)
18:21 thebope_ joined #git
18:22 buddyq ive been trying to set this up for 4 days straight. Probably spent 60 hours learning and trying things.
18:22 bremner did someone already point buddyq to !deploy?
18:22 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.html
18:22 cagedwisdom joined #git
18:22 bremner somebody did now.
18:22 buddyq mk
18:22 buddyq i c
18:23 thiago joined #git
18:24 nilg` joined #git
18:24 star_prone joined #git
18:24 Jackneill joined #git
18:24 realz__ joined #git
18:25 tomek joined #git
18:25 tomek joined #git
18:25 cite joined #git
18:25 oskarkv joined #git
18:26 PioneerAxon joined #git
18:26 obiwahn joined #git
18:26 nikivi joined #git
18:27 jaguarmagenta joined #git
18:28 SwiftMatt joined #git
18:28 malcon joined #git
18:28 esc_ joined #git
18:29 crayon joined #git
18:30 romerocesar joined #git
18:31 lcqq11 joined #git
18:33 cyan__ joined #git
18:34 xall joined #git
18:34 lcqq11 hi, is it possible to export a commit to a folder? something like "git archive <commit_id>", but exporting file by file recursively to a given folder.
18:34 Sasazuka_ joined #git
18:34 blypenn joined #git
18:35 rahtgaz joined #git
18:35 Seveas lcqq11: git archive ... | tar -x
18:35 Derperperd joined #git
18:35 Balliad joined #git
18:39 Cassiopaya joined #git
18:41 btyne79 joined #git
18:41 vulture_ joined #git
18:41 IlNominePatre joined #git
18:42 canuk_ joined #git
18:42 jeffreylevesque_ joined #git
18:42 Ice_Strike2 joined #git
18:42 Cavallari1 joined #git
18:42 Shakeel_ joined #git
18:42 eivarv_ joined #git
18:42 Kaisyu2 joined #git
18:42 isysd joined #git
18:42 UTAN_dev_ joined #git
18:42 manuels joined #git
18:43 akanksha__ joined #git
18:43 romerocesar joined #git
18:43 sin3t joined #git
18:43 rishi``` joined #git
18:43 martin_g_ joined #git
18:43 imanc_ joined #git
18:43 kutenai_ joined #git
18:43 flupke_ joined #git
18:43 joco42_ joined #git
18:44 tristanp_ joined #git
18:44 beckyconning__ joined #git
18:44 bluezone_ joined #git
18:44 epic_ joined #git
18:44 cloudcell__ joined #git
18:44 aendrew_ joined #git
18:44 da5id_ joined #git
18:44 yoyoyo_____ joined #git
18:44 [diecast]_ joined #git
18:44 bbhoss_ joined #git
18:44 addshore_ joined #git
18:44 nowhere_man joined #git
18:44 discopatrick_ joined #git
18:44 Balliad_ joined #git
18:44 ec_ joined #git
18:45 drizztbsd joined #git
18:45 kadoban_ joined #git
18:45 janx_ joined #git
18:45 Bengi__ joined #git
18:45 richardlitt_ joined #git
18:45 Iacobus_ joined #git
18:45 ToeSnacks_ joined #git
18:45 davisonio_ joined #git
18:45 d3r1ck_ joined #git
18:45 Slush-_ joined #git
18:45 ejb joined #git
18:45 colona_ joined #git
18:45 deltab_ joined #git
18:45 catsup_ joined #git
18:45 stnly joined #git
18:45 gyre007_ joined #git
18:45 Seveas_ joined #git
18:45 daey_ joined #git
18:45 ksk_ joined #git
18:45 chernjie_ joined #git
18:45 acetakwas joined #git
18:46 bjoe2k4 joined #git
18:46 topi`_ joined #git
18:46 chamunks- joined #git
18:46 BinGOs_ joined #git
18:46 CussBot_ joined #git
18:46 buzzLightBeer_ joined #git
18:46 hallogallo[m]1 joined #git
18:46 CrazyBonz_ joined #git
18:46 atomi_ joined #git
18:46 brewmast1r joined #git
18:46 doppo_ joined #git
18:46 souther_ joined #git
18:46 xkr47_ joined #git
18:46 helium-3 joined #git
18:47 ploop_ joined #git
18:47 Mekkis_ joined #git
18:47 iamthad joined #git
18:47 tjbp joined #git
18:47 boxrick1_ joined #git
18:47 Lunatrius` joined #git
18:48 Sasazuka joined #git
18:48 _tgunr joined #git
18:48 nd_ joined #git
18:48 BinGOs_ left #git
18:48 Anja_ joined #git
18:48 belak_ joined #git
18:48 Orion3000 joined #git
18:48 hdon joined #git
18:49 BinGOs joined #git
18:49 khfeng_ joined #git
18:49 brendyn joined #git
18:49 toydestroyer_ joined #git
18:49 HedgeMage_ joined #git
18:49 Lorcatar joined #git
18:49 hdon hi guys :) i'm getting a very weird error: http://ix.io/1w7V have the push.default allowed options changed?
18:49 bket1 joined #git
18:49 buddyq_ joined #git
18:49 Seveas bloody nickserv...
18:50 thejoecarroll_ joined #git
18:50 QshelTier joined #git
18:50 malcon joined #git
18:50 Seveas hdon: sounds like ancient git
18:50 enckse_ joined #git
18:50 Hello71_ joined #git
18:50 CustosLim3n joined #git
18:50 Seveas 'simple' was added in 1.8 I believe
18:50 tcurdt joined #git
18:50 martinklepsch|BN joined #git
18:50 kkirsche joined #git
18:50 biertie joined #git
18:50 jor_ joined #git
18:51 nowox_ joined #git
18:51 ozymandias_ joined #git
18:51 eycsigfy_ joined #git
18:51 neunon_ joined #git
18:51 WillMoogle joined #git
18:51 troyt_ joined #git
18:51 adambrenecki joined #git
18:51 sunri5e_ joined #git
18:51 CentaurWarchief joined #git
18:52 felowe joined #git
18:52 CalimeroTeknik_ joined #git
18:52 Spydar007 joined #git
18:52 Orbitrix joined #git
18:52 ribasushi_ joined #git
18:52 woodruffw joined #git
18:52 Nugget joined #git
18:52 forrestv joined #git
18:52 i7c joined #git
18:52 woodruffw joined #git
18:52 stuh84 joined #git
18:53 jokester joined #git
18:53 woodruffw joined #git
18:53 sonOfRa joined #git
18:53 habbasi joined #git
18:53 woodruffw joined #git
18:53 HedgeMage joined #git
18:54 languitar joined #git
18:54 woodruffw joined #git
18:54 Guest53930 joined #git
18:54 Cork joined #git
18:54 jas4711 joined #git
18:54 woodruffw joined #git
18:54 rgrinberg joined #git
18:55 Chinorro joined #git
18:55 woodruffw joined #git
18:55 Caelum joined #git
18:55 kwmiebach__ joined #git
18:55 woodruffw joined #git
18:55 woodruffw joined #git
18:56 SameOne joined #git
18:56 lxnch joined #git
18:56 XDS2010 joined #git
18:56 woodruffw joined #git
18:56 woodruffw joined #git
18:56 Samual joined #git
18:56 Samual joined #git
18:56 CheckDavid joined #git
18:56 bmahe joined #git
18:56 rnsanchez_ joined #git
18:56 alcohol joined #git
18:56 b100s joined #git
18:57 discopatrick_ joined #git
18:57 ec_ joined #git
18:57 Wayne_Shephard joined #git
18:57 BombStrike joined #git
18:57 M-meznak joined #git
18:57 woodruffw joined #git
18:57 dreiss joined #git
18:57 nedbat joined #git
18:57 MacGyver joined #git
18:57 aca20031 joined #git
18:57 woodruffw joined #git
18:57 PCatinean joined #git
18:58 davidosomething joined #git
18:58 evanvarvell joined #git
18:58 romerocesar joined #git
18:58 taargus41 joined #git
18:58 woodruffw joined #git
18:58 rxo joined #git
18:58 jrnieder joined #git
18:58 Gitzilla joined #git
18:58 txdv joined #git
18:58 roflin joined #git
18:58 aarobc joined #git
18:58 woodruffw joined #git
18:59 angular_mike_ joined #git
18:59 cory___ joined #git
18:59 batrick joined #git
18:59 jason237 joined #git
18:59 underpantz__ joined #git
18:59 woodruffw joined #git
18:59 ToeSnacks_ joined #git
18:59 techntoke_ joined #git
18:59 woodruffw joined #git
18:59 huhlig joined #git
19:00 tfnico joined #git
19:00 kireevco_ joined #git
19:00 XDS2010 joined #git
19:00 diogenese joined #git
19:00 woodruffw joined #git
19:00 M-ou-se joined #git
19:00 joseph_arnstein_ joined #git
19:00 barq joined #git
19:00 yossarian joined #git
19:01 Hobbyboy joined #git
19:01 aspiers joined #git
19:01 davisonio_ joined #git
19:01 theresajayne joined #git
19:01 Anupkumar joined #git
19:01 EvilPenguin joined #git
19:01 woodruffw joined #git
19:01 ec_ joined #git
19:01 Guest66634 joined #git
19:01 boxrick1_ joined #git
19:01 woodruffw joined #git
19:01 woodruffw joined #git
19:01 zidane_g_ joined #git
19:02 mehola joined #git
19:02 jleclanche joined #git
19:02 yossarian joined #git
19:02 minibar joined #git
19:03 hdon joined #git
19:03 phillly joined #git
19:03 hdon hi all :) sorry i had a bit of a glitch
19:03 woodruff- joined #git
19:03 SuperSeriousCat You are not the only one :p Freenode is not stable atm
19:03 mehdi___ joined #git
19:03 wizonesolutions joined #git
19:03 Iacobus_ joined #git
19:03 Arokh joined #git
19:03 Awesomecase joined #git
19:03 buddyq joined #git
19:04 thebope joined #git
19:04 al-damiri joined #git
19:04 infernix joined #git
19:05 Guest84029 joined #git
19:05 samuoio joined #git
19:05 Remramm joined #git
19:06 Prisoner-2460_1 joined #git
19:06 Guest84029 joined #git
19:07 realz__ joined #git
19:07 xall joined #git
19:08 Guest84029 joined #git
19:09 stealthii joined #git
19:09 crayon joined #git
19:10 chris2 joined #git
19:10 SameOne left #git
19:10 Guest84029 joined #git
19:13 henriquev joined #git
19:13 worstadmin joined #git
19:13 tcsc joined #git
19:14 nwkj86 joined #git
19:14 matthiaskrgr joined #git
19:14 WizJin joined #git
19:15 gho5t_ joined #git
19:15 Guest67424 joined #git
19:16 aswen joined #git
19:17 CIAguy joined #git
19:17 c0ded joined #git
19:18 crayon joined #git
19:18 crayon joined #git
19:19 ahmed_elgabri joined #git
19:19 aswen joined #git
19:19 kpease joined #git
19:21 ghostlight joined #git
19:22 Arokh joined #git
19:22 Guest84029 joined #git
19:22 Sasazuka_ joined #git
19:22 fuchstronaut joined #git
19:22 Guest67424 joined #git
19:23 Seveas SuperSeriousCat: FreeFallNode :)
19:23 jhe_ joined #git
19:24 strugee joined #git
19:25 heroux joined #git
19:25 eka joined #git
19:26 SuperSeriousCat FreeFallNode?
19:26 aviraldg joined #git
19:26 Gsham joined #git
19:27 Fissure joined #git
19:27 ieee joined #git
19:28 alex1a joined #git
19:30 shymega joined #git
19:30 stfn joined #git
19:30 arooni joined #git
19:30 contracode joined #git
19:30 paperziggurat joined #git
19:30 sparr joined #git
19:30 sfan786_ joined #git
19:30 krillr joined #git
19:30 imanc joined #git
19:31 aca20031 joined #git
19:31 llamapixel joined #git
19:31 miklcct joined #git
19:32 blackjid joined #git
19:32 hide joined #git
19:34 hariel joined #git
19:34 ionelmc joined #git
19:35 Gsham joined #git
19:38 eshlox joined #git
19:38 Faylite joined #git
19:38 Snugglebash joined #git
19:39 netcarver joined #git
19:40 madknight joined #git
19:41 Spec-Chum joined #git
19:42 Guest84029 left #git
19:42 SwiftMatt joined #git
19:43 belak joined #git
19:43 belak joined #git
19:43 belak joined #git
19:47 sea-gull_ joined #git
19:49 CalimeroTeknik buddyq, I'm deploying with a post-receive hook that runs `git pull --ff-only` in a directory next to the bare repo where I push to.
19:49 Arokh joined #git
19:50 CalimeroTeknik this solution is excellent and not evoked in the link you were given (`git pull` is, but immediately rejected for "required manual fixups" which --ff-only precise avoids)
19:50 CalimeroTeknik precisely*
19:51 CalimeroTeknik plus, it even allows somebody to fix things in the deployed environment and commit/push them from there.
19:53 heroux joined #git
19:53 CalimeroTeknik buddyq, http://sprunge.us/EfCV is the hooks/post-update file I use
19:54 synthroid joined #git
19:55 CalimeroTeknik bremner, by the way, why does the official tutorial in the 'deploy' factoid not mention this solution?
19:55 UrsoBranco joined #git
19:55 kadoban_ CalimeroTeknik: It breaks a lot
19:55 bremner CalimeroTeknik: what happens if --ff-only fails?
19:56 bremner if you know 100% that pull --ff-only never fails, you can use reset
19:58 CalimeroTeknik what happens if --ff-only fails? would that ever happen?
19:58 CalimeroTeknik push --force is forbidden to avoid losing any history
19:59 kadoban_ CalimeroTeknik: It's forbidden ... until something comes up and you do it anyway. And then a week later someone wonders why the automatic deployment isn't working anymore.
20:00 CalimeroTeknik it's forbidden by a hook
20:00 drmt joined #git
20:00 samtheknife joined #git
20:01 CalimeroTeknik if somebody does it anyway… they can't push until they commit on top of the origin's history again
20:03 Bubbles was hoping `git am <mbox>` would fast-forward my repo.. just tried to apply the very first patch
20:03 _cyril_ joined #git
20:04 arand__ joined #git
20:07 Bubbles instead it just*
20:10 nilg joined #git
20:10 joki- joined #git
20:12 mizu_no_oto joined #git
20:12 SwiftMatt joined #git
20:13 sea-gull_ joined #git
20:13 sea-gull_ joined #git
20:14 sea-gull_ joined #git
20:14 heroux joined #git
20:16 CEnnis91 joined #git
20:16 nettoweb joined #git
20:16 buddyq joined #git
20:16 littleforest joined #git
20:17 dviola joined #git
20:19 MrWoohoo joined #git
20:20 seishun joined #git
20:20 jfran joined #git
20:21 jfran joined #git
20:21 xall joined #git
20:22 _ikke_ Bubbles: Did you actually provided an mbox file?
20:23 Derperperd joined #git
20:24 fuchstronaut joined #git
20:25 johnlage joined #git
20:25 Bubbles yes :p
20:25 raijin joined #git
20:26 Bubbles was trying to apply https://lists.archlinux.org/pipermail/p​acman-contrib.mbox/pacman-contrib.mbox before I just did a pull from the repo
20:26 Gsham joined #git
20:28 seishun_ joined #git
20:28 jaguarmagenta joined #git
20:29 aax joined #git
20:30 tanuki joined #git
20:30 _ikke_ "git-am - Apply a series of patches from a mailbox" seems to imply it should apply all patches
20:33 Gsham joined #git
20:36 Bubbles certainly does
20:36 boombatower joined #git
20:38 grumble joined #git
20:38 acetakwas joined #git
20:40 joki joined #git
20:40 bluezone joined #git
20:42 Rodya_ joined #git
20:43 nikivi joined #git
20:47 danemacmillan joined #git
20:47 shaggycat joined #git
20:47 Orphis joined #git
20:52 netj joined #git
20:53 Sasazuka joined #git
20:55 raijin joined #git
21:00 crayon joined #git
21:02 EvilPeng1 joined #git
21:03 mehola joined #git
21:05 sammyo joined #git
21:05 sammyo left #git
21:13 inflames joined #git
21:16 e14 joined #git
21:20 star_prone joined #git
21:20 joki joined #git
21:21 tessier joined #git
21:23 m0viefreak joined #git
21:27 e14 joined #git
21:27 fscala joined #git
21:30 canuk left #git
21:30 BSaboia joined #git
21:33 dviola joined #git
21:34 e14 joined #git
21:35 manuels joined #git
21:38 e14 joined #git
21:41 malcon joined #git
21:41 eivarv joined #git
21:43 remote joined #git
21:44 remote hi
21:46 Vampire0 remote, !hi
21:46 gitinfo remote: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
21:47 remote gitinfo: what's up?
21:48 Zarthus remote, !bot
21:48 gitinfo remote: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans.  Please see http://jk.gs/git/bot for more information about how to (ab)use me.
21:48 gitinfo remote: [!botsnack] Om nom nom
21:49 gitinfo Zarthus: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
21:49 Zarthus wat.
21:49 Zarthus Oh, this server is lagging.
21:49 remote robots are awesome
21:49 gitinfo Zarthus: I can't answer that with a bot command, could you please rephrase the question?
21:50 Zarthus Oh, is this server lagging?
21:51 hue joined #git
21:51 Vampire0 Zarthus, no, just me not looking constantly :-D
21:51 gitinfo Zarthus: [!botsnack] Om nom nom
21:51 Zarthus !botsnack
21:51 gitinfo Om nom nom
21:51 remote so... I realized github pull requests weren't specific to a commit but to a branch and that later changes on the branch submitted as a pull request would, well... end up in the pull requests
21:52 b100s joined #git
21:52 Zarthus remote: :D
21:52 Vampire0 remote, yes, of course
21:52 jephsf joined #git
21:52 Vampire0 remote, until the PR is closed
21:52 remote what's the best way to fix this?
21:53 Vampire0 remote, the receivers of your PR could have some change requirements before accepting, so you can push to the branch to modify your PR
21:53 Vampire0 remote, to fix what? It is intended functionality
21:53 remote but my pull request now has unintended commits
21:53 Vampire0 remote, just force-push to that branch the commit that is intended
21:53 remote ok
21:53 Vampire0 remote, git push -f <good>:pr-branch
21:54 Zarthus keep in mind it'll remove your existing commits
21:54 remote well, I pushed master
21:54 Zarthus back it up to a different branch
21:54 remote :)
21:54 Vampire0 Zarthus, it will not
21:54 Vampire0 Zarthus, he will still have master where it is locally
21:54 Zarthus right
21:54 Vampire0 Zarthus, he just changes the remote
21:54 Zarthus but he'll still want to work from a different branch on his new feature, ideally!
21:54 Vampire0 remote, alternately you can close the PR and open a new one from a newly created branch with only that change of course
21:55 gitinfo Zarthus: [!coffee] Drink Earl Grey Tea. It’s better.
21:55 Zarthus gitinfo: I'm actually drinking tea right now.
21:56 gitinfo Zarthus: [!color] Bring some color to your life! git config --global color.ui auto
21:56 Derperperd joined #git
21:56 remote Vampire0: ya I'm going to do that
21:56 gitinfo remote: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
21:57 Zarthus gitinfo: % cat .gitconfig | grep 'ui = ' # => ui = auto
21:57 remote gitinfo: thanks
21:57 gitinfo remote: you're welcome, but please note that I'm a bot. I'm not programmed to care.
21:57 remote gitinfo: so why do you track karma, retard!
21:58 remote does anyone want me to thank them?
21:58 Vampire0 thank whoever you like
21:58 remote i'm confused as-to why the bot mentionned this functionality
21:58 serycjon joined #git
21:58 Vampire0 gitinfo, tracks for others, not for himself
21:58 remote i usually do but now that a bot has told me i should, i feel reluctant to do it
21:58 SwiftMatt joined #git
21:58 kadoban No need to use that language, especially when you're apparently raging against a bot.
21:59 remote kadoban: My apologies, Sir.
21:59 aant joined #git
21:59 gitinfo remote: We are what we repeatedly do. Excellence, then, is not an act, but a habit. (Aristotle)
21:59 remote kadoban: thank you
21:59 remote Vampire0: thank you
21:59 Vampire0 yw
21:59 remote Zarthus: thank you
21:59 Zarthus remote: thank you for thanking me
22:00 buddyq_ joined #git
22:00 remote gitinfo: You know what else is?
22:00 gitinfo Zarthus: [!feelings] Though I'm a bot, I have feelings too, you know.
22:00 remote you guys were great help but I now absolutely hate this channel
22:00 remote left #git
22:00 Zarthus why is that
22:01 Zarthus oh, well then
22:01 Vampire0 o_O
22:01 Vampire0 strange guy :-D
22:01 kadoban That happened, I guess.
22:01 Zarthus for what it's worth, I think you should stay alive.
22:01 gitinfo [!feelings] Though I'm a bot, I have feelings too, you know.
22:02 gitinfo bar
22:03 fb| joined #git
22:03 fb| hey guys, what graphical client would you guys recommend on linux?
22:03 Orphis joined #git
22:03 gitinfo Here, have a cute and cuddly Gitten. Nyaa~
22:04 kadoban fb|: None, except as a supplement, like gitk.
22:04 Vampire0 kadoban, !gui
22:04 gitinfo kadoban: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
22:04 fb| so say if I weren't looking for support, and we weren't on this channel, what client would you recommend?
22:05 Vampire0 fb|, !guis
22:05 gitinfo fb|: Popular GUIs for Git are listed on the website: http://git-scm.com/downloads/guis
22:05 kadoban Still the same, the command-line.
22:05 fb| thanks Vampire0
22:05 Vampire0 But yes, as kadoban says
22:05 Vampire0 yw fb|
22:05 fb| kadoban, yeah i'm comfortable using the command line
22:05 fb| when it comes down to it it's the simplest to use
22:05 fb| especially once you set up aliases
22:06 fb| sometimes though i just wanna do cherry picks with 3 clicks
22:06 eivarv joined #git
22:06 kadoban Indeed. It's far from perfect, but every GUI I've used is ... worse, except for a usually quite small subset of possible git commands.
22:06 fb| gitg's been fairly nice to me, it can handle branching and commiting fairly well
22:06 fb| and you can highlight the lines from files to stage if you don't want to commit an entire file
22:06 cdown joined #git
22:07 kadoban I've heard magit is pretty neat, but I'm not sure that counts as a GUI exactly either.
22:08 fb| i'll check that out
22:09 nettoweb joined #git
22:10 gitinfo Another satisfied customer. NEXT!
22:11 Vauff joined #git
22:11 cdown_ joined #git
22:11 fstd joined #git
22:12 xaa__ joined #git
22:12 gitinfo [!offon] Have you tried turning it off and on again?
22:13 cdown joined #git
22:14 Vampire0 !pizza
22:14 gitinfo If a pizza has a radius 'z' and a depth 'a' that pizza's volume can be defined Pi*z*z*a
22:17 gitinfo see !recursive
22:17 cdown joined #git
22:18 thiago joined #git
22:18 qws-user-1228 joined #git
22:20 elsevero joined #git
22:22 gitinfo SHOTS SHOT SHOTS SHOTS SHOTS! Then !beer
22:22 einnjo joined #git
22:25 eivarv joined #git
22:25 fuchstronaut joined #git
22:26 DarkFox_ joined #git
22:28 HoierM joined #git
22:29 jaguarmagenta joined #git
22:29 sangy joined #git
22:31 jade_ joined #git
22:31 cyphase joined #git
22:33 Electrometro joined #git
22:33 EvilPeng1 joined #git
22:35 nettoweb joined #git
22:37 Electrometro joined #git
22:38 Lor_ joined #git
22:38 danemacmillan joined #git
22:39 ToBeCloud joined #git
22:39 ap0c joined #git
22:39 madewokherd joined #git
22:50 Electrometro joined #git
22:51 barteks2x joined #git
22:54 elastix joined #git
22:56 danemacmillan joined #git
23:01 serycjon left #git
23:01 fusionx8_ joined #git
23:04 albel727 joined #git
23:05 njbair joined #git
23:16 danemacmillan joined #git
23:18 dviola joined #git
23:18 theskillwithin joined #git
23:20 buddyq joined #git
23:20 ruby_ joined #git
23:22 raijin joined #git
23:24 cbreak joined #git
23:26 mablae__ joined #git
23:26 fuchstronaut joined #git
23:27 clandestino joined #git
23:27 NoOutlet1 joined #git
23:28 deltab just did  git commit --amend  instead of  git commit  by mistake: how should I undo it and get back the previous commit?
23:33 raijin joined #git
23:35 avar joined #git
23:36 deltab should I use  git reset --soft HEAD@{20.minutes.ago}  and commit again?
23:37 boombatower joined #git
23:38 clandestino joined #git
23:38 Guest56222 joined #git
23:38 Guest56222 joined #git
23:42 svm_invictvs joined #git
23:42 mycelium joined #git
23:42 parliament joined #git
23:45 madewokherd joined #git
23:45 danemacmillan joined #git
23:46 mikecmpbll joined #git
23:48 Gloomy joined #git
23:51 deltab yep, that seems to have worked, thanks
23:52 gfixler joined #git
23:53 Bilge joined #git
23:53 tristanp joined #git
23:55 [snake] joined #git
23:56 Vauff joined #git

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