IRCloggy #git 2017-08-22

Logs Search ←Prev date Next date→ Channels Documentation

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

2017-08-22

← hahuang61 left00:01
← tsia left00:01
→ jeffreylevesque joined00:01
← cagomez left00:02
→ tsia joined00:02
→ mentazoom joined00:03
→ madewokherd joined00:04
← denimsoft left00:04
→ nd joined00:04
← chachasmooth left00:04
← orbyt_ left00:05
← PioneerAxon left00:05
→ chachasmooth joined00:05
← tsia left00:07
← nidr0x left00:07
← nd- left00:08
→ nidr0x joined00:08
← EvilPenguin left00:08
→ hahuang65 joined00:12
← cdown left00:12
→ EvilPenguin joined00:13
→ MattMaker joined00:14
← MattMake_ left00:16
← EvilPenguin left00:18
← brent__ left00:19
← peterbecich left00:20
→ brent__ joined00:21
← Brain left00:21
← thiago left00:25
← brent__ left00:25
→ yoyomandude joined00:25
→ flippo joined00:26
← staafl left00:26
→ staafl joined00:26
← sz0 left00:26
← nidr0x left00:26
← QualityAddict left00:27
→ nidr0x joined00:27
→ QualityAddict joined00:28
← sp33drac3r left00:29
→ tsia joined00:30
→ akushner___ joined00:30
← upperdeck left00:30
QualityAddict → Guest7607600:32
→ Rodya_ joined00:32
→ thiago joined00:33
← pzp left00:34
← Cabanossi left00:34
← xaa left00:35
← tsia left00:36
← Rodya_ left00:37
→ orbyt_ joined00:37
→ upperdeck joined00:37
→ Cabanossi joined00:37
← yoyomandude left00:38
← blinkingprompt left00:39
← orbyt_ left00:39
→ orbyt_ joined00:40
flippo → flippa00:41
← felipedvorak left00:41
← govg left00:42
→ gugah joined00:42
→ govg joined00:44
because → people00:44
← str left00:45
← govg left00:48
Sasazuka__ → Sasazuka00:50
← mentazoom left00:51
← perrier-jouet left00:52
→ perrier-jouet joined00:54
← ahr3n_ left00:57
→ tsia joined00:57
→ peterbecich joined00:58
→ felipedvorak joined01:00
← Gustavo6046 left01:02
← af-cmg left01:03
← sturner left01:03
← tsia left01:03
← Cabanossi left01:05
→ jameser joined01:06
→ Cabanossi joined01:07
← natechan left01:08
→ finalbeta joined01:09
→ bronson joined01:10
← hfp_work left01:11
← johnny56 left01:12
← peterbecich left01:14
← d^sh left01:15
← bronson left01:15
→ johnny56 joined01:16
→ d^sh joined01:16
→ hfp_work joined01:17
→ Gabemo joined01:17
← nidr0x left01:17
→ nidr0x joined01:18
→ peterbecich joined01:18
→ johnflux joined01:20
← johnflux left01:20
→ johnflux joined01:20
→ laumann joined01:21
← peterbecich left01:22
← hahuang65 left01:22
→ peterbecich joined01:23
← Noldorin left01:23
→ tsia joined01:24
→ hahuang65 joined01:25
→ str joined01:25
→ PaulCapestany joined01:26
← tsia left01:29
← gopar left01:31
← Murr left01:32
→ Murr joined01:32
→ Rodya_ joined01:33
→ dtrott joined01:33
← dtrott left01:33
→ dtrott joined01:34
← johnflux left01:34
← Cabanossi left01:36
← Rodya_ left01:37
→ Cabanossi joined01:37
flippa → flippo01:38
→ cdg joined01:39
← donmichelangelo left01:41
← Sasazuka left01:42
← cdg left01:43
← sunri5e left01:44
→ itat joined01:44
← ilbot3 left01:45
→ sunri5e joined01:46
← thiago left01:46
→ shiranuidong joined01:47
← chachasmooth left01:48
← gugah left01:48
→ kpease joined01:49
→ chachasmooth joined01:50
→ thiago joined01:50
← kpease left01:50
→ tsia joined01:51
→ ilbot3 joined01:52
← ski7777 left01:53
→ QualityAddict joined01:53
→ cqi joined01:53
gkats I've been running filter-branch --tree-filter "rm -rf dir1 dir2" --prune-empty -- --all on a large repo and the estimated seconds are 38 hours and likely to go up. Anyone used bfg repo cleaner to delete directories?01:53
→ ski7777 joined01:53
← tsia left01:54
← upperdeck left01:54
mud gkats: --index-filter is much faster than --tree-filter01:54
bfg should probably be faster than both, but that one is a really obvious change away from what you're already doing and just plain better.01:55
gkats mud: is --index-filter equivalent to --tree-filter though?01:57
mud: If bfg is better, will attempt it and see. Thanks mud!01:57
← hash-z3r0 left01:58
→ upperdeck joined02:00
← cqi left02:01
→ Goplat joined02:02
← Elon_Satoshi left02:05
← upperdeck left02:06
→ Elon_Satoshi joined02:07
→ upperdeck joined02:08
← shiranuidong left02:08
← bergice_ left02:09
← nidr0x left02:11
← MacWinner left02:11
→ Symfony3 joined02:11
→ nidr0x joined02:11
← flippo left02:13
gkats mud: Does bfg delete commits related to the directories being deleted?02:13
← upperdeck left02:15
mud gkats: *shrug* I usually just use filter-branch.02:16
gkats mud: :-) Thanks. Will attempt bfg and if it doesn't delete related commits, will use --index-filter. Thanks!02:17
mud Good luck02:17
← xaxxon left02:17
gkats :-) Thanks. Will need it02:17
→ natechan joined02:17
← chachasmooth left02:18
→ tsia joined02:19
→ upperdeck joined02:22
→ roelmonnens joined02:22
→ chachasmooth joined02:23
← tsia left02:24
← roelmonnens left02:26
← fstd left02:26
→ fstd joined02:26
← akushner___ left02:28
← upperdeck left02:28
→ xaxxon joined02:28
→ mbrumbelow joined02:32
→ Rodya_ joined02:33
→ upperdeck joined02:33
← sammyo left02:34
→ lagothri1 joined02:34
← peterbecich left02:34
← Cabanossi left02:35
→ Silenced joined02:36
← Elon_Satoshi left02:36
→ Cabanossi joined02:37
← lagothrix left02:37
← Rodya_ left02:39
← eshlox left02:42
← mbrumbelow left02:43
→ tsia joined02:46
← natechan left02:49
← str left02:51
← tsia left02:53
→ UncleB joined02:55
hehehe → hehehe_away02:55
hehehe_away → hehehe_off02:55
← acidjazz left02:55
→ cqi joined02:56
→ dgarr joined02:57
→ PioneerAxon joined02:57
← LeBlaaanc left02:57
→ Vortex35 joined02:58
← perrier-jouet left02:59
→ ignarps joined03:01
← pks left03:01
← Vortex34 left03:02
→ Elon_Satoshi joined03:02
← tanuki left03:02
← ignarps left03:03
← Cabanossi left03:04
→ pks joined03:04
→ ignarps joined03:05
← ignarps left03:06
← daynaskully left03:06
→ Cabanossi joined03:06
→ tanuki joined03:06
→ vlad1777d joined03:07
← d0nn1e left03:08
→ blinkingprompt joined03:09
→ govg joined03:10
→ d0nn1e joined03:11
→ daynaskully joined03:11
→ bronson joined03:11
→ tsia joined03:13
← bronson left03:16
← tsia left03:18
→ darth_platypus joined03:19
← Xiti` left03:22
→ Xiti joined03:22
← agnki left03:23
→ kanthael joined03:24
← dtrott left03:24
→ imack joined03:25
← upperdeck left03:25
← \drew left03:27
→ upperdeck joined03:31
← Murr left03:32
→ Murr joined03:32
← chachasmooth left03:33
→ BSAlb joined03:33
→ chachasmooth joined03:34
→ Rodya_ joined03:34
→ howdoi joined03:35
← BSaboia left03:36
← imack left03:37
→ cdown joined03:38
← Rodya_ left03:38
→ donmichelangelo joined03:39
→ cdg joined03:39
→ tsia joined03:40
← UncleB left03:41
→ UncleB joined03:42
← cdg left03:44
→ jnewt_ joined03:44
← jnewt left03:45
← tsia left03:47
→ guampa joined03:47
→ agnki joined03:50
← kanthael left03:50
← dgarr left03:55
→ akushner___ joined03:56
← upperdeck left03:56
← akushner___ left03:58
← xaxxon left04:00
→ jfelchner joined04:01
→ upperdeck joined04:02
→ monty_slate joined04:03
→ Cabanoss- joined04:03
← Cabanossi left04:03
Cabanoss- → Cabanossi04:04
→ h12o joined04:05
→ ibash joined04:07
→ Shane102 joined04:07
→ xaxxon joined04:08
← jfelchner left04:08
→ tsia joined04:08
← orbyt_ left04:09
→ akushner___ joined04:09
← MattMaker left04:12
→ MattMaker joined04:13
← tsia left04:14
← kini left04:15
→ peterbecich joined04:15
← chu left04:17
→ kini joined04:17
→ chu joined04:19
← ibash left04:19
← h12o left04:20
→ overlord_tm joined04:21
← blinkingprompt left04:21
→ h12o joined04:23
← jimmyrcom_ left04:24
← xcm left04:24
→ Guest73 joined04:26
← peterbecich left04:28
← kini left04:28
→ CBF16888 joined04:28
← h12o left04:28
→ LeBlaaanc joined04:30
→ blinkingprompt joined04:30
→ kini joined04:30
→ _ng joined04:31
→ h12o joined04:33
→ jceb joined04:33
→ Rodya_ joined04:35
→ tsia joined04:35
← pandeiro left04:36
← netj left04:37
→ netj joined04:37
← h12o left04:37
← skalpin_ left04:39
← _ng left04:40
← Rodya_ left04:40
← boombatower left04:41
← tunekey left04:42
→ skered joined04:42
← tsia left04:42
← cagedwisdom left04:42
→ fatalhalt joined04:43
→ rkta_ joined04:43
→ ti2 joined04:43
→ cagedwisdom joined04:44
← rkta left04:46
rkta_ → rkta04:46
← chachasmooth left04:46
→ chachasmooth joined04:49
→ ShekharReddy joined04:52
← UncleB left04:52
→ _ng joined04:57
← whitby left04:58
→ ppang joined04:58
→ fatihgenc joined04:58
← Shane102 left04:59
← Silenced left04:59
→ whitby joined04:59
← hehehe_off left05:00
← Soni left05:00
← Cabanossi left05:01
← MACscr left05:01
→ littlepython joined05:01
← jceb left05:02
→ tsia joined05:03
→ fatihgenc_ joined05:03
→ Cabanossi joined05:04
← fatihgenc left05:05
littlepython Hi ,I have added some new files to my branch,now if i do git status it tells me that its untracked files.how to add that files05:06
→ skalpin_ joined05:06
grawity `git add`05:06
← fatihgenc_ left05:06
→ fatihgenc_ joined05:07
← blinkingprompt left05:08
← tsia left05:08
→ UncleB joined05:10
→ PhpStorm4 joined05:11
→ dec0n joined05:12
→ xcm joined05:12
→ bronson joined05:13
← _ng left05:13
← YuGiOhJCJ left05:15
← Symfony3 left05:15
→ jimmyrcom_ joined05:15
← UncleB left05:16
→ pandeiro joined05:17
← bronson left05:17
jim I need to undo a commit I haven't pushed yet, where's that doc on reset?05:17
← skalpin_ left05:18
→ sturner joined05:19
← overlord_tm left05:20
← pandeiro left05:21
mud !undo05:22
gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!05:22
jim ??reset05:22
← itat left05:23
→ Rodya_ joined05:24
← Rodya_ left05:27
→ dersand joined05:29
→ tkore\work joined05:29
← tkore\work left05:29
→ tkore\work joined05:29
→ tsia joined05:29
→ indistylo joined05:30
← chachasmooth left05:31
← Murr left05:32
→ Soni joined05:32
→ Murr joined05:32
→ chachasmooth joined05:34
← tsia left05:35
← friketrin left05:36
→ cdg joined05:40
← thott left05:41
→ lss8_ joined05:42
→ skalpin_ joined05:44
← lss8 left05:45
← cdg left05:45
people → because05:46
→ imack joined05:49
→ friketrin joined05:49
← littlepython left05:50
← rkta left05:51
→ _ng joined05:53
j416 jim: man git-reset05:53
gitinfo jim: the git-reset manpage is available at https://gitirc.eu/git-reset.html05:53
← _ng left05:53
→ Raging_Hog joined05:56
→ ibash joined05:57
→ cdown_ joined05:57
→ tsia joined05:57
← fatihgenc_ left05:57
→ fatihgenc_ joined05:57
← ibash left05:57
← agnki left05:58
← cdown left05:59
cdown_ → cdown05:59
→ rscata joined06:01
← chachasmooth left06:02
← Cabanossi left06:02
← LeBlaaanc left06:04
→ Cabanossi joined06:04
← tsia left06:04
→ chachasmooth joined06:04
→ jknetl joined06:04
← PhpStorm4 left06:08
→ pandeiro joined06:11
→ knitkit joined06:11
← fatihgenc_ left06:11
→ fatihgenc_ joined06:12
→ Shane102 joined06:15
← pandeiro left06:15
→ Andrew_K joined06:15
← nidr0x left06:16
← sturner left06:16
← fatihgenc_ left06:17
→ fatihgenc_ joined06:17
← MattMaker left06:19
→ roelmonnens joined06:21
→ h12o joined06:22
→ MattMaker joined06:23
jim mud, j416, thanks06:23
→ lordjancso joined06:23
→ tsia joined06:24
jim how can I take what's staged and unstage it?06:24
← Arguggi left06:24
→ Arguggi joined06:25
← Raging_Hog left06:25
← h12o left06:26
← Arguggi left06:26
→ Arguggi joined06:26
mud jim: 'git status' tells you06:27
← upperdeck left06:28
← tsia left06:29
← cite left06:29
→ tsia joined06:30
← madewokherd left06:31
→ jceb joined06:31
← tsia left06:32
→ tsia joined06:32
← Cabanossi left06:33
→ SyndicateDon joined06:33
→ Raging_Hog joined06:33
← tsia left06:33
→ tsia joined06:33
→ Silenced joined06:34
→ upperdeck joined06:34
→ Cabanossi joined06:34
→ cite joined06:34
→ zefferno joined06:35
← __rob left06:37
→ __rob joined06:37
→ opalepatrick joined06:37
← tsia left06:38
← ti2 left06:43
→ Silmarilion joined06:45
← MattMaker left06:46
← monty_slate left06:49
← thiago left06:49
→ dege joined06:50
← ertes left06:54
← knitkit left06:56
← xaxxon left06:56
→ rick_sanchezz joined06:58
→ schleppel joined06:59
← rick_sanchezz left07:00
→ rick_sanchezz joined07:00
→ tsia joined07:01
→ TomyWork joined07:01
← rick_sanchezz left07:01
→ rick_sanchezz joined07:01
← Andrew_K left07:01
→ SyndicateDon_ joined07:02
→ ti2 joined07:02
← nydel07 left07:03
→ rick_sanchezz_ joined07:04
→ overlord_tm joined07:04
← SyndicateDon left07:05
→ pandeiro joined07:05
→ MACscr joined07:06
→ jstein_ joined07:08
jstein_ → jstein07:09
← pandeiro left07:09
→ alcohol joined07:12
→ bronson joined07:13
← rick_sanchezz_ left07:15
→ zxd joined07:15
← upperdeck left07:16
zxd what's the quickest and best way to check if a tag exists and is valid? it's for use in a script I want to push the snapshot referenced by the tag if it's good and valid and is newer than its previous value07:16
_ikke_ combination of git rev-parse and git merge-base07:17
← chachasmooth left07:17
→ nydel07 joined07:17
← rick_sanchezz left07:18
← bronson left07:18
→ chachasmooth joined07:19
← alcohol left07:19
→ seschwar joined07:20
barteks2x I currently have 3 branches, one of them being my "master" branch. Currently the main one is periodically merged into the other 2, with some other changes being applied on top of the other 2. Now I watt to make some other of these 2 branches the main one. Is there any way to merge the new oen into the other 2, but skipping some commit in it, while making git think it's fully merged?07:20
→ roelmonn_ joined07:20
← mmattice left07:21
_ikke_ barteks2x: no, git merge merges entire trees. You'd have to manually undo the changes coming from these commits07:21
→ alcohol joined07:21
barteks2x that's what I did for the first time I did that, but it means I either end up with a commit where the code just doesn't compile, or introduce nontricial changes into a merge commit07:22
*nontrivial07:22
← roelmonnens left07:23
zxd what _ikke_ : git merge-base is for checking if it's valid?07:23
s/what//07:23
→ idr joined07:24
_ikke_ zxd: It's to check if it's 'newer' than the other tag07:24
barteks2x I would like some solution that doesn't involve manually undoing these changes, and revert usually won;t do it because it will result in many conflicts07:24
_ikke_ zxd: git merge-base --is-ancestor <previous_tag> <new_tag>07:25
→ upperdeck joined07:25
zxd _ikke_: but it's the same tag name only updated with a new ref07:25
_ikke_ ...07:26
A tag is not supposed to move generally07:26
← idr left07:26
zxd that's what they are doing here07:27
here = company07:27
immae _ikke_: zxd: maybe reflog keeps tag's history? In which case git merge-base --is-ancestor tag@{1} tag could work07:27
→ thebigj joined07:27
→ wandering_vagran joined07:27
immae (just a suggestion, didn't actually check)07:27
thebigj I have am trying to pick specific one commit from another branch. When I apply command "git cherry-pick hash-of-commit my-branch-name" instead of picking one specified commit it is picking 2 commits. One of that hash and one of parrent.07:29
← al-damiri left07:29
thebigj I am not sure why it is picking both whereas I am applying only specific hash of ti.07:29
*it07:29
Can anyone help me?07:29
Thanks!07:29
_ikke_ thebigj: no need to specify the branch07:29
thebigj: the commit is the commit, no matter on what branch it is07:29
jast it'll do the right thing if you give it only the commit ID. what you're doing right now is asking it to pick the commit "and the branch", meaning the commit on top of that branch07:30
thebigj _ikke_: Thanks. It worked!07:33
jast: Agreed. I haven't used cherry-pick much. Thanks for helping :)07:33
Bye friends!07:33
← bladdezz left07:34
→ MattMaker joined07:34
← tsia left07:36
← wandering_vagran left07:37
→ mentazoom joined07:37
← nappy[m] left07:39
→ nappy[m] joined07:39
→ misosoup joined07:40
zxd is it possible to push an annotated tag to refs/heads/master lik git push myorigin refs/tags/sometag:refs/heads/master07:41
I tried it rejected ,07:41
→ cdg joined07:41
zxd remote: error: cannot update the ref 'refs/heads/master': Trying to write non-commit object d2d68e39ee8ddb296999f33002368a2a2f61a0ea to branch refs/heads/master07:41
← daurnimator left07:41
zxd To! [remote rejected] sometag -> master (failed to update ref)07:42
preaction why are you trying to do that?07:42
→ tsia joined07:42
jast well, as git tells you... no, it's not possible :)07:42
→ sturner joined07:44
zxd ok so I use git rev-parse to find out the commit object in the annotated tag?07:44
and push that?07:44
→ wandering_vagran joined07:44
preaction you don't want to edit the local master, but you want to edit the remote master?07:45
← cdg left07:45
zxd remote master just needs regular snapshots of new local releases07:46
nobody pushes to the remote master other than me doing these updates07:46
← MissionCritical left07:46
← hvxgr left07:46
← darth_platypus left07:47
→ hvxgr joined07:48
jast zxd: git has syntax to resolve a tag to a commit, for example: git push myorigin sometag^0:refs/heads/master07:48
^0 is shorthand for ^{commit}07:49
→ jntme joined07:49
← MattMaker left07:49
→ MattMaker joined07:49
← MattMaker left07:50
→ MattMaker joined07:50
← nivag left07:50
← MattMaker left07:50
→ MattMaker joined07:51
→ nivag joined07:51
← MattMaker left07:51
← ubuntu1 left07:52
→ kirb joined07:52
← kirb left07:52
→ kirb joined07:52
zxd jast: thanks07:52
← nivag left07:53
→ nivag joined07:53
→ doev joined07:55
→ shgysk8zer0 joined07:55
→ sigdk joined07:59
→ theoceaniscool joined07:59
→ xall joined07:59
→ Mavericks1 joined07:59
→ redtail joined08:00
← Cabanossi left08:01
← xall left08:01
← Mavericks1 left08:01
← imack left08:01
→ Mavericks joined08:02
Mavericks hello08:02
From a docker image, I've issue git pushing to heroku repo. but'm able to pull --rebase and push to a bitbucket repo.08:02
I've reviewed ssh keys and no luck08:02
This wasn't an issue before. The error is "ssh: connect to host heroku.com port 22: Connection refused"08:02
Could this be a docker issue ? messing with the firewall ?08:02
← cagedwisdom left08:02
jast possibly08:02
Mavericks Didn't disable the firewall either. This wasn't an issue in the past08:02
jast first things first: does DNS lookup seem correct? ("host heroku.com", compare to output in another system)08:03
→ Cabanossi joined08:03
→ imack joined08:03
jast generally speaking, though, we probably won't be able to help much, since this is pretty specific to docker and the image you're using08:04
Mavericks got it. checking it now08:04
DelTree verbose ssh log could maybe help... why "connection refused" ?08:04
Mavericks tried asking there and waiting on a reply. thought I should share i there in case I missed anything on the ssh front08:05
jast well, 'connection refused' happens on TCP level, I kind of doubt sshd has any useful extra information08:05
← shgysk8zer0 left08:05
jast err, the SSH client, I mean08:05
← Elon_Satoshi left08:05
→ kurkale6ka joined08:05
DelTree sure it's at tcp level and not at negociation level of some kind ?08:06
jast in my experience you get different messages for that08:06
→ MissionCritical joined08:07
→ YuGiOhJCJ joined08:07
jast of course, you can always look at the details to be sure (ssh -vv heroku.com)08:07
→ pbandark joined08:07
→ cagedwisdom joined08:07
→ valize joined08:08
← ppang left08:08
→ shgysk8zer0 joined08:08
→ mbrumbelow joined08:08
← imack left08:08
→ daurnimator joined08:09
← Raging_Hog left08:09
← misosoup left08:10
→ h12o joined08:10
→ Andrew_K joined08:11
← dersand left08:11
← upperdeck left08:12
Mavericks ssh -vv heroku.com shows a "connecting to heroku.com [ip address] port 22" "connect to address port 22: Connection refused"08:13
three times in a sequence with a different ip08:13
selckin a firewall is blocking it, either your side or theirs08:14
← h12o left08:14
Mavericks selckin: I see makes sense. I'm trying from the Windows terminal directly than docker and getting the same issue08:14
Different error at the end tho. "ssh: connect to host heroku.com port 22: Ba file number "08:16
*Bad08:16
→ EABKQKW joined08:16
→ Floflobel__ joined08:16
Mavericks Instead of "Connection refused" it says "Attempt to connect timed out without establishing a connection"08:17
← Floflobel__ left08:17
→ upperdeck joined08:17
Mavericks I'm gonna un/re- installing heroku . may be that will fix it08:17
*try08:17
→ Murii joined08:22
→ lyxus joined08:23
→ deepakbndeepu joined08:25
→ oxymoron93 joined08:25
→ bongjovi joined08:27
→ Rodya_ joined08:27
→ King_Hual joined08:28
← King_Hual left08:28
→ King_Hual joined08:28
← Mavericks left08:30
→ xaa joined08:32
← chachasmooth left08:33
← Rodya_ left08:33
→ chachasmooth joined08:34
← jceb left08:35
→ jceb joined08:37
→ Floflobel_ joined08:38
← Floflobel_ left08:38
→ Floflobel joined08:38
← mbrumbelow left08:40
← mentazoom left08:40
→ bergice_ joined08:42
← neunon left08:46
→ neunon joined08:46
← Geeky_Bear left08:50
→ itat joined08:51
→ Raging_Hog joined08:51
→ FatKiwi joined08:52
← lyxus left08:53
→ pandeiro joined08:53
← Shayan-To left08:54
→ Geeky_Bear joined08:56
← FatKiwi left08:56
← pandeiro left08:57
→ Tobbi joined08:58
→ troyt joined08:59
→ masuberu joined09:00
← chachasmooth left09:02
← jknetl left09:02
→ lyxus joined09:03
→ chachasmooth joined09:04
→ j08nY joined09:04
← xcm left09:06
← Tobbi left09:06
→ xcm joined09:06
→ krad joined09:07
← Andrew_K left09:07
→ Shayan-To joined09:07
krad hi. i'm trying to apply a patch using git apply file.patch .. but when i check the outcome it looks like the file is still the same.. any idea how to debug09:07
it's skipping the patch09:10
← energizer left09:14
→ bronson joined09:15
→ jknetl joined09:19
← bronson left09:19
→ aax joined09:22
← cqi left09:24
→ xaa__ joined09:24
← xaa left09:26
→ MattMaker joined09:26
→ chll_ joined09:27
← aax left09:28
→ Rodya_ joined09:29
← ZexaronS-2 left09:31
← Murr left09:32
← chachasmooth left09:32
→ Murr joined09:32
← King_Hual left09:32
→ djb-irc joined09:33
← lyxus left09:33
← olalonde left09:33
← Rodya_ left09:34
→ chachasmooth joined09:34
→ ph88_ joined09:34
← fatalhalt left09:34
← Goplat left09:35
← ph88^ left09:37
→ czart__ joined09:38
→ tarkus joined09:41
→ cdg joined09:41
← czart_ left09:42
← Shane102 left09:42
← in1t3r left09:44
→ in1t3r joined09:44
← cdg left09:46
← indistylo left09:48
← MeltedLux left09:48
→ ghishadow_ joined09:50
← MattMaker left09:50
→ kurkale61 joined09:52
← kurkale6ka left09:53
→ tvw joined09:54
← doev left09:59
→ kurkale6ka joined10:02
← krad left10:03
← kurkale61 left10:03
→ ph88^ joined10:05
→ scarcry joined10:06
← ph88_ left10:08
→ ferr joined10:12
→ \drew joined10:13
→ zulutango joined10:14
→ roelmonnens joined10:15
← roelmonn_ left10:18
← \drew left10:19
← masuberu left10:21
← jntme left10:21
← jakogut left10:22
→ cybrjcl joined10:25
→ idoko joined10:26
→ jakogut joined10:26
→ amirpro joined10:27
→ bladdezz joined10:27
← cybrjcl left10:29
→ Rodya_ joined10:30
← redtail left10:31
← jameser left10:32
→ Mononoke-BT joined10:33
→ sz0 joined10:34
← Rodya_ left10:34
→ SkyPatrol joined10:37
→ beauloser joined10:38
← SkyPatrol_ left10:39
→ cdg joined10:39
← idoko left10:39
→ ssarah joined10:40
→ gxt joined10:40
← Mononoke-BT left10:42
→ mentazoom joined10:43
← cdg left10:44
← beauloser left10:45
→ MattMaker joined10:47
→ mikeyman1 joined10:49
→ masuberu joined10:49
← mikeyman1 left10:49
→ penanze joined10:51
→ beauloser joined10:52
→ \drew joined10:52
← Hogofwar left10:52
→ PI joined10:53
← kirb left10:53
← LeMike left10:53
← pix9 left10:53
← valize left10:54
← linuxenko left10:54
→ linuxenko joined10:54
← tkore\work left10:54
← mentazoom left10:54
← tarkus left10:54
→ tkore\work joined10:55
→ LeMike joined10:55
→ kirb joined10:56
← kirb left10:56
→ kirb joined10:56
→ nauar joined10:56
→ Hogofwar joined10:57
i7c Maybe the path is not right?10:57
← masuberu left10:57
← PI left10:58
→ masuberu joined10:58
← Dick_Hammer left10:59
→ Feral_Cat joined11:00
← Arguggi left11:00
← Xarodon left11:00
← TooLmaN left11:00
← c^ left11:00
← Werring left11:00
← sborza left11:00
← Xethron left11:00
← thejoecarroll left11:00
← rigid left11:00
← Zarthus left11:00
← Impaloo left11:00
← reactormonk[m] left11:00
→ hanthings_ joined11:00
→ gruetzko- joined11:00
← patrickr[m] left11:00
← waltervargas[m] left11:00
← chachasmooth left11:00
← __rob left11:00
← steven left11:00
← Anthaas left11:00
← mdbk left11:00
← artgoeshere left11:00
← catern left11:00
← emPi left11:00
← incredible left11:00
← lohfu left11:00
← bluepixel left11:00
← pdgwien left11:00
← dustinm left11:00
← ninsei left11:00
← quite left11:00
← Slush- left11:00
→ dustinm- joined11:00
→ pdgwien joined11:00
→ noteness_ joined11:01
← aviraldg left11:01
← hvxgr left11:01
← kisonecat left11:01
→ greenbagels_ joined11:01
→ __rob joined11:01
← ndim left11:01
← gruetzkopf left11:01
← Zoxc left11:01
← evil-god left11:01
← kirb left11:01
← Ragnor left11:01
← UncleCJ left11:01
← nikivi left11:01
← opalepatrick left11:01
← zefferno left11:01
← rscata left11:01
← eb0t left11:01
← hanthings left11:01
← acetakwas left11:01
← A|TARIS left11:01
← greenbagels left11:01
← Inception left11:01
← CalimeroTeknik left11:01
← yan__ left11:01
← qassim left11:01
← jrahmy left11:01
→ systmkor joined11:01
→ A|TARIS joined11:02
→ kisonecat joined11:02
← Vaelatern left11:02
→ Slush- joined11:02
→ tjbp joined11:02
← souther left11:02
← andai left11:02
← cbreak left11:02
→ Eugene joined11:03
→ ndim joined11:03
← lukky513 left11:03
→ Ragnor joined11:03
→ kurkale61 joined11:03
→ Zoxc joined11:03
→ Rigg joined11:04
← kurkale6ka left11:04
→ evil-god joined11:04
← TinkerTyper left11:04
→ TooLmaN joined11:05
→ quite joined11:05
→ sborza joined11:05
→ qassim joined11:05
→ Zarthus joined11:05
→ nikivi joined11:05
→ Werring joined11:05
→ yan__ joined11:05
→ incredible joined11:05
→ c^ joined11:05
→ chachasmooth joined11:05
→ emPi joined11:05
→ artgoeshere joined11:05
→ bluepixel joined11:05
→ rscata joined11:05
→ Arguggi joined11:05
→ andai joined11:05
→ Xarodon joined11:05
→ opalepatrick joined11:05
→ zefferno joined11:05
→ mdbk joined11:06
→ cbreak joined11:06
→ rigid joined11:06
← rigid left11:06
→ rigid joined11:06
→ thejoecarroll joined11:06
→ lohfu joined11:06
→ Inception joined11:06
→ Cavallari joined11:06
← Feral_Cat left11:06
→ Anthaas joined11:06
→ catern joined11:06
→ jrahmy joined11:06
→ eb0t joined11:06
← Rigg left11:07
→ acetakwas joined11:07
→ steven joined11:07
→ Xethron joined11:07
→ ninsei joined11:08
→ CalimeroTeknik joined11:08
← kurkale61 left11:08
→ d-fence joined11:09
→ hvxgr joined11:09
← opencw left11:10
→ kurkale61 joined11:10
→ kirb joined11:11
← kirb left11:11
→ kirb joined11:11
→ |Joker| joined11:11
← amirpro left11:12
← MattMaker left11:12
→ linuxmodder joined11:13
→ raynold joined11:13
← |Joker| left11:14
→ souther joined11:15
→ Impaloo joined11:15
→ bronson joined11:16
→ patrickr[m] joined11:16
→ aviraldg joined11:16
→ UncleCJ joined11:16
→ reactormonk[m] joined11:16
→ waltervargas[m] joined11:16
→ cheapslut_uk joined11:17
→ Dick_Hammer joined11:18
← cagedwisdom left11:19
→ amirpro joined11:20
← bronson left11:20
← fatihgenc_ left11:20
→ ChiLL_SurF joined11:23
→ lukky513 joined11:24
kurkale61 → kurkale6ka11:24
→ jntme joined11:29
→ Rodya_ joined11:31
← upperdeck left11:31
← Murr left11:32
→ Murr joined11:32
→ ToBeCloud joined11:34
gitinfo set mode: +v11:34
← Rodya_ left11:35
→ kurkale61 joined11:36
→ upperdeck joined11:36
← kurkale6ka left11:38
→ LBV_User joined11:41
→ aard joined11:41
← jntme left11:41
← amirpro left11:44
→ Vaelatern joined11:44
← jeffreylevesque left11:45
→ ghishadow joined11:45
→ flaviodesousa joined11:46
← ghishadow_ left11:47
← beauloser left11:48
→ funkytwig joined11:49
← \drew left11:49
→ peacememories joined11:50
funkytwig Hi. ime learning about creating a development branch using tutorial at https://www.digitalocean.com/community/tutorials/how-to-use-git-branches11:50
I create a develop btanch and change to it 'git commit develop', add a file and commit it 'git commit -m "develop file" develop'11:51
so my question is if I am in develop branch why do I have to add its name at end?11:52
oxymoron93 git checkout develop will switch to develop branch11:52
← cdown left11:52
funkytwig so its for safty, in case I am in wrong branch, i.e. it is not strictly speaking needed as I am already in that branch, I can see it is good practice though11:53
→ hehehe_off joined11:53
oxymoron93 yes, but you can use bash environment11:54
it shows you what branch is currently checked out11:55
funkytwig oxymoron93, dont follow11:55
oxymoron93 also you can use git branch command11:55
funkytwig OK, must of done something wrong11:56
oxymoron93 it will list the local branches you have, and the one with asterisk is the one currently checked out11:56
funkytwig ben@whatnow:~/eventpuddle/eventpuddle$ git branch -a11:56
develop11:56
* master11:56
remotes/origin/HEAD -> origin/master11:56
remotes/origin/master11:56
and11:57
oxymoron93 yeah, git branch -a will also show remote branches11:57
well you are currently on master branch11:57
as asterisk pointed out11:57
if you want to switch to develop branch, do git checkout develop11:57
→ cdown joined11:57
→ agowa338 joined11:58
oxymoron93 after running git branch -a, asterisk will be in front of develop branch11:58
← hehehe_off left11:59
oxymoron93 http://prntscr.com/gblib8 this is what you have in bash11:59
→ hehehe joined12:00
hehehe fatal: unable to access 'https://github.com/opencart/opencart.git/': Failed to connect to github.com port 443: Connection timed out12:00
weird ehh12:00
oxymoron93 are you using proxy hehehe12:00
← infernix left12:00
hehehe no12:00
I dont12:01
oxymoron93 no help from me then12:01
hehehe git clone https://github.com/opencart/opencart.git --branch 2.2.0.012:01
thats the command I used12:01
→ guccimeow joined12:02
→ clmsy joined12:02
← chachasmooth left12:02
i7c nc -v -z github.com 44312:02
hehehe 1 moment12:03
doing it12:03
I did check syslog firewall does not block it12:03
port 443 in is open12:03
i7c mhm12:04
Try again to clone? Academic approach.12:04
TomyWork i get a permission denied error while copying the sample hooks. i dont need those and i think that is the only problem. any flag to disable that?12:04
→ chachasmooth joined12:04
→ amirpro joined12:05
TomyWork (while running "git init")12:05
← guccimeow left12:05
funkytwig trying to add a file to a branch but having problems...12:06
→ EvilPenguin joined12:06
funkytwig ben@whatnow:~/eventpuddle/eventpuddle$ git branch -a12:06
* develop12:06
master12:06
remotes/origin/HEAD -> origin/master12:06
remotes/origin/master12:06
and12:07
TomyWork use pastebin12:07
or gist or something12:07
oxymoron93 funkytwig ^12:07
funkytwig ok12:07
i7c git branch | curl -F 'f:1=<-' ix.io12:07
:)12:07
oxymoron93 champollion! come in here12:08
→ MattMaker joined12:09
oxymoron93 hehehe if you need only files you can get archive12:10
you don't need repository12:10
← EvilPenguin left12:11
funkytwig OK, having problems learning about branches, trying to commit to a branch https://gist.github.com/funkytwig/66a6ded6863a4714cbe401a3f6fd664d12:11
hehehe yep12:11
oxymoron93 you have to add files first funkytwig12:11
with git add12:12
← jstein left12:12
oxymoron93 funkytwig read https://git-scm.com/book/en/v212:12
→ cdown_ joined12:13
funkytwig oxymoron93, already did that, sorry you could not see file was green, did again and still got samr error12:13
oxymoron93 my bad, I wasn't reading, don't need color :)12:13
→ smaudet joined12:13
funkytwig LOL12:13
← ChiLL_SurF left12:13
oxymoron93 well you see the error12:14
https://git-scm.com/docs/git-commit12:14
funkytwig oxymoron93, no, cant se what is wrong, sorry I misread and thought you said did not see colour (gist did not show it)12:15
agowa338 Hello, I accidentally did a fast forward and now I'm wondering, if it is possible to go back to a commit before the fast forward. How would I do that?12:15
← cdown left12:15
cdown_ → cdown12:15
oxymoron93 error: pathspec 'develop' did not match any file(s) known to git. funkytwig12:15
← magicturtle left12:15
← rwb left12:16
→ kurkale6ka joined12:17
← govg left12:17
→ jeffreylevesque joined12:18
← kurkale61 left12:19
→ govg joined12:19
← sturner left12:21
← albel727 left12:21
funkytwig has to pop out for lunch12:21
← vlad1777d left12:21
→ roelmonn_ joined12:22
← ghishadow left12:23
oxymoron93 it is possible agowa33812:24
if you are still on the branch where you merged12:24
git reset --hard @{1}12:24
→ albel727 joined12:24
agowa338 oxymoron93 I did not merge, I just switched pc and my gui tool did a fast forward to my remote repo. That's the whole story.12:25
→ infernix joined12:25
→ manuelschneid3r joined12:25
← roelmonnens left12:25
agowa338 oxymoron93 is it still possible?12:26
oxymoron93 yes I am here, I need more time to process cause I am probably more new to git than you :)12:26
well it is possible12:27
probablu gui did git pull12:27
which is basically a fetch + merge12:27
← theoceaniscool left12:28
oxymoron93 also, I am not experienced with gui tools at all, sorry12:29
→ pandeiro joined12:29
→ jntme joined12:30
→ Rodya_ joined12:32
← Cabanossi left12:33
← sarri left12:33
→ Cabanossi joined12:34
→ sarri joined12:34
← sarri left12:34
→ sarri joined12:34
← pandeiro left12:34
← diogenese left12:34
→ \drew joined12:35
← Rodya_ left12:36
← MattMaker left12:37
← cheapslut_uk left12:38
→ sansna joined12:42
→ doev joined12:44
← sansna left12:47
← chachasmooth left12:47
→ chachasmooth joined12:49
→ sansna joined12:49
→ fission6 joined12:51
← zulutango left12:53
← Kaisyu left12:56
→ Tobbi joined12:59
← Cabanossi left13:03
→ Cabanossi joined13:03
→ cdg joined13:03
→ agowa339 joined13:04
← nauar left13:05
→ cbonobo joined13:05
Vampire0 agowa338, do a `git reflog <branch>` and find where the fast-forward merge was done. Then as oxymoron93 said, use reset --hard like `git reset --hard <branch>@{1}` or which the right one is to reset branch pointer, index and worktree to that state13:05
← agowa338 left13:06
← howdoi left13:06
← Milijus left13:07
→ cdg_ joined13:08
← SkyPatrol left13:09
→ SkyPatrol joined13:10
← cdg left13:10
← hehehe left13:11
→ jameser joined13:11
← penanze left13:13
→ penanze joined13:14
← deepakbndeepu left13:14
→ cdown_ joined13:15
→ mmattice joined13:15
← cdown left13:15
cdown_ → cdown13:15
→ bronson joined13:16
→ shirty joined13:18
← jnewt_ left13:18
shirty hey, trying to apply a patch from a p4 repo to a git folder13:19
git repo sorry13:20
Vampire0 shirty, so?13:20
→ vargas joined13:20
shirty i'm having trouble, anyone have any experience with this?13:20
Vampire0 shirty, you should start with telling us *what* kind of trouble you have13:21
← bronson left13:22
shirty my problem is the format of the diff produced by p4, it doesn't play well with git13:22
Vampire0 shirty, what do you mean "with git"? `git apply` or `git am`? !repro13:23
gitinfo shirty: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see13:23
→ pandeiro joined13:23
← bongjovi left13:24
← pandeiro left13:28
← alcohol left13:31
← Murr left13:32
→ Murr joined13:32
→ MeltedLux joined13:32
→ Rodya_ joined13:32
→ rda-mac joined13:33
→ snowkidimd joined13:33
→ Bhootrk_ joined13:34
→ MattMaker joined13:34
← Bhootrk_ left13:34
← Rodya_ left13:37
← snowkidimd left13:37
→ iNCoNFuN joined13:37
→ str joined13:40
← peacememories left13:40
→ tunekey joined13:41
← ToBeCloud left13:44
→ eset_ joined13:46
← roelmonn_ left13:47
→ roelmonnens joined13:47
← chachasmooth left13:48
← eset_ left13:48
→ eset_ joined13:48
→ chachasmooth joined13:49
← eset left13:49
→ rwb joined13:50
→ tcorneli joined13:51
→ theoceaniscool joined13:52
← \drew left13:55
← eset_ left13:56
← ravndal left13:57
← quite left13:58
→ interrobangd joined13:58
← shirty left13:58
→ ravndal joined13:59
← Rotaerk left14:00
← oxymoron93 left14:01
→ pandeiro joined14:01
← tcorneli left14:02
← MattMaker left14:02
← pandeiro left14:06
← armyriad left14:06
→ kurkale61 joined14:06
→ Gurkenglas_ joined14:07
← Tobbi left14:07
← kurkale6ka left14:08
← overlord_tm left14:09
→ Tobbi joined14:11
→ jorgebonafe joined14:11
jorgebonafe Can anyone give me some help? I'm really confused. I'm trying to merge a local fork with the upstream code, and I'm getting on a lot of files three tabs, "local changes", "changes from the server", and "result" in the middle. The thing is, it makes no sense, because the local and server codes are the same, and the "result" is getting stuff I don't14:14
know from where, because it's on neither side.14:14
→ AaronMT joined14:14
← AaronMT left14:15
→ AaronMT joined14:15
Vampire0 jorgebonafe, maybe your merge tool behaves bogus?14:15
jorgebonafe I'm using Android Studio's merge tool14:16
is there one you'd recommend?14:16
→ zivester joined14:17
← kurkale61 left14:19
← iNCoNFuN left14:19
→ redtail joined14:20
→ kurkale61 joined14:20
Vampire0 jorgebonafe, well, basically I think that P4Merge is the best free merge and diff tool I know. The one from IntelliJ IDEA and thus Android Studio is ok too though14:20
jorgebonafe Ok, I'll check it out. It's really weird, I can't find anyone that had a problem like this online14:22
I'm pretty much a newbie with git so I don't know if I'm doing something stupid, but...14:22
→ iNCoNFuN joined14:22
jorgebonafe it makes no sense14:22
← iNCoNFuN left14:22
→ iNCoNFuN joined14:23
Vampire0 jorgebonafe, sorry, cannot say too much for your situation because of !gui14:25
gitinfo jorgebonafe: 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.14:25
← Raging_Hog left14:25
Vampire0 jorgebonafe, especially point 1)14:25
← dec0n left14:25
→ rahtgaz joined14:26
← leeN left14:26
← rahtgaz left14:27
→ dec0n joined14:27
jorgebonafe Ok. thanks anyway14:27
→ leeN joined14:28
← cdown left14:28
funkytwig Still not worked out why I cant commit. I have updated the gist https://gist.github.com/funkytwig/66a6ded6863a4714cbe401a3f6fd664d/edit maybe I should just totaly delete the devel branch (nothing has been pushed from it14:29
← tkore\work left14:30
← sz0 left14:31
← Murii left14:31
→ Lynxium joined14:31
→ LeBlaaanc joined14:31
← Sharker left14:31
← jknetl left14:32
→ Sharker joined14:32
→ h12o joined14:32
→ \drew joined14:33
→ al-damiri joined14:34
→ robotroll joined14:35
← upperdeck left14:36
← opalepatrick left14:36
← itat left14:37
funkytwig sorry, forgot to press update on gist, have not14:37
← Tobbi left14:37
Vampire0 funkytwig, you do not specify to which branch you want to commit. You always commit on top of the commit you currently have checked out and if you have a branch checked out, that branch will then point to the new commit14:39
→ Argylelabcoat joined14:41
→ thiago joined14:41
→ upperdeck joined14:43
← SkyPatrol left14:44
→ SkyPatrol joined14:45
Baughn So, I'd like to test changes before commit...14:45
Vampire0 Baughn, very good idea14:45
→ gugah joined14:45
← interrobangd left14:45
Baughn The usual advice is to use a pre-commit hook, with git stash --keep-index to temporarily clear out the non-added changes.14:45
amirpro error: RPC failed; curl 18 transfer closed with outstanding read data remaining14:46
Baughn However, that doesn't work if I've removed files as part of the commit. They stay removed in the commit itself, but turn up back in the repository afterwards.14:46
← jameser left14:46
amirpro Why i got this error?14:46
Baughn Is there a more robust implementation I should be looking at?14:46
→ seni joined14:47
Vampire0 Baughn, if the removal is of the commit, they are also not in the repository afterwards, can you !repro?14:47
gitinfo Baughn: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see14:47
Baughn Sure. Let me make a test case.14:48
→ diogenese joined14:48
→ alcohol joined14:48
← zefferno left14:50
Baughn Vampire0: https://pastebin.com/VNAgAjU314:51
This is the pre-commit script: https://github.com/Erisia/builder/blob/master/hooks/pre-commit14:52
→ phluks joined14:52
Baughn nix-build won't work for you unless you happen to have Nixpkgs installed, but it has no effect other than its return code.14:53
← dave0x6d left14:53
← raynold left14:53
Baughn ...oh, and I have an unpushed update to the script which adds --index to the git-stash-pop command. That doesn't fix it.14:54
← rscata left14:55
← Silmarilion left14:56
Vampire0 Baughn, so what is your question? In the repository the file is deleted, or did you mean in the worktree?14:56
← jorgebonafe left14:56
← bgerber left14:56
→ bgerber joined14:57
Baughn In the worktree. It shouldn't come back like that.14:57
← dermoth left14:57
→ Bobdude joined14:57
→ dermoth joined14:58
→ sturner joined14:58
Baughn It's the git stash command which resurrects it, and that seems like a bug. Certainly it's to be expected for a normal stash, but with --keep-index, the deletion is already in the index -- right?14:59
It certainly seems to be, since it gets deleted with the commit.14:59
→ MattMaker joined14:59
← shgysk8zer0 left15:00
→ imack joined15:00
← Cavallari left15:00
← str left15:01
→ tcorneli joined15:01
Vampire0 Baughn, yep, seems like a bug, you should report it to the !mailing_list15:02
gitinfo Baughn: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git15:02
Baughn Hmm, is there an issue tracker I can use?15:02
Vampire0 Baughn, yes, the mailing list15:03
Baughn *screaming internally*15:03
Vampire0 Baughn, nothing more formal unfortunately, except this changed15:03
← PioneerAxon left15:03
→ PioneerAxon_ joined15:03
Vampire0 chiming in on the screaming15:03
Baughn ...very well. I'll make double sure it hasn't bene fixed since, first.15:03
Vampire0 Baughn, at least in 2.13.1 it still happens15:04
Baughn This was on 2.13.2, but 2.14 is out already.15:04
Vampire0 2.13.2 actually15:04
2.14.1 is out even15:04
← imack left15:04
→ roelmonn_ joined15:05
→ imack joined15:05
Vampire0 Baughn, yep, still the mailing list for reporting bugs: https://git-scm.com/community15:06
→ webdev007 joined15:08
← thiago left15:08
← bgerber left15:08
← roelmonnens left15:09
← SkyPatrol left15:09
← markzen left15:09
← masuberu left15:10
→ SkyPatrol joined15:10
← roelmonn_ left15:10
→ Murii joined15:10
→ bauruine joined15:11
→ pix9 joined15:11
← dermoth left15:12
→ madewokherd joined15:12
→ dermoth joined15:12
← hussam left15:13
amirpro https://paste.gnome.org/peogmwrnx15:14
← jntme left15:14
amirpro why I got this error?15:14
→ sz0 joined15:14
← SkyPatrol left15:16
→ SkyPatrol joined15:17
← sturner left15:17
← h12o left15:18
→ bronson joined15:18
← jceb left15:20
← clmsy left15:20
→ SwiftMatt joined15:20
→ durham joined15:21
→ bgerber joined15:21
→ jntme joined15:22
← Bobdude left15:22
← upperdeck left15:22
← bronson left15:22
→ menip joined15:23
← jntme left15:23
← bgerber left15:23
→ upperdeck joined15:24
→ peterbecich joined15:24
← cbonobo left15:24
← ski7777 left15:25
→ bgerber joined15:25
← pelegreno______ left15:25
→ jntme joined15:25
→ Milijus joined15:26
← dec0n left15:26
→ dec0n joined15:26
→ cbonobo joined15:27
→ pelegreno joined15:27
← MattMaker left15:28
→ cagomez joined15:28
→ roelmonnens joined15:28
← bgerber left15:29
← akushner___ left15:30
← jntme left15:31
← Cabanossi left15:31
← Argylelabcoat left15:32
← Murr left15:32
← roelmonnens left15:32
→ Murr joined15:32
→ jntme joined15:32
→ ski7777 joined15:32
→ bgerber joined15:32
← peterbecich left15:33
→ Cabanossi joined15:33
← jntme left15:34
→ jntme joined15:35
← jntme left15:36
→ peacememories joined15:37
← bgerber left15:37
→ Argylela_ joined15:37
← Argylela_ left15:37
← Lynxium[] left15:38
→ jntme joined15:38
→ Argylelabcoat joined15:38
← jntme left15:38
← wandering_vagran left15:39
→ jntme joined15:39
→ brent__ joined15:39
← SwiftMatt left15:40
← SkyPatrol left15:40
→ sturner joined15:40
→ h12o joined15:40
← jntme left15:41
→ indistylo joined15:41
→ kpease joined15:41
→ SkyPatrol joined15:42
→ jntme joined15:42
← jntme left15:43
→ jntme joined15:45
← lordjancso left15:45
→ bgerber joined15:45
→ opalepatrick joined15:46
→ Gustavo6046 joined15:46
← jntme left15:46
→ thiago joined15:46
← SkyPatrol left15:47
→ jntme joined15:47
→ digidog joined15:48
← chachasmooth left15:48
digidog → diqidoq15:48
← jntme left15:48
← tcorneli left15:49
→ chachasmooth joined15:49
Celelibi ahrem. git is definitely not fine with large binary files. ^^15:49
← cdg_ left15:50
← bgerber left15:50
← durham left15:51
→ bgerber joined15:51
→ cdg joined15:53
← thiago left15:53
→ SkyPatrol joined15:54
→ durham joined15:54
→ dreiss joined15:54
← bgerber left15:56
→ path2 joined15:56
← cdg left15:57
← tunekey left15:57
→ bgerber joined15:57
← seschwar left15:57
→ glad joined15:58
→ SwiftMatt joined15:59
→ EvilPenguin joined15:59
← TomyWork left16:00
→ thiago joined16:02
← Cabanossi left16:03
→ jceb joined16:03
→ alexgooz joined16:03
← bgerber left16:03
→ Cabanossi joined16:03
← alexgooz left16:05
→ cdown joined16:09
← agowa339 left16:10
→ boombatower joined16:10
→ bgerber joined16:13
← PaulCapestany left16:13
← seni left16:13
← hahuang65 left16:14
→ str joined16:14
→ roelmonnens joined16:14
→ PaulCapestany joined16:16
← menip left16:17
← chachasmooth left16:18
← roelmonnens left16:19
→ chachasmooth joined16:19
→ db8093246 joined16:19
→ blinkingprompt joined16:21
← imack left16:23
← redtail left16:24
→ MattMaker joined16:25
← plasticle left16:25
← durham left16:26
→ durham joined16:26
→ jstein_ joined16:26
jstein_ → jstein16:27
← webdev007 left16:30
← djb-irc left16:30
→ pockata joined16:31
← jstein left16:31
← tvw left16:31
← durham left16:31
→ durham_ joined16:31
← durham_ left16:32
→ orbyt_ joined16:32
→ roelmonnens joined16:34
→ SteffanW joined16:36
→ snowkidimd joined16:36
← dreiss left16:36
← upperdeck left16:37
← roelmonnens left16:37
← kurkale61 left16:37
← Gurkenglas_ left16:37
→ roelmonnens joined16:38
← iNCoNFuN left16:39
pockata Ok, I've been banging my head for a while about this and I can't seem to figure out why git ls-remote --heads origin gives me 5 branches, and git branch --all (after git fetch) shows only 316:39
← peacememories left16:40
pockata I have read/write access to the remote repo and I can pull all the latest changes on master, however I cannot checkout the other branches. Does anyone have any pointers?16:41
→ peacememories joined16:41
→ durham joined16:41
→ peterbecich joined16:42
→ upperdeck joined16:42
← netj left16:42
→ danguafer joined16:42
← aard left16:43
→ netj joined16:43
← SkyPatrol left16:43
moritz pockata: what happens if you explicitly fetch one of teh branches that you don't see locally?16:43
git fetch origin <thebranch>16:43
→ safe joined16:44
→ SkyPatrol joined16:44
← roelmonnens left16:44
← manuelschneid3r left16:44
← Argylelabcoat left16:45
→ roelmonnens joined16:45
→ redtail joined16:45
← LBV_User left16:46
← chachasmooth left16:48
← diqidoq left16:48
→ svm_invictvs joined16:49
→ chachasmooth joined16:49
→ TomyLobo joined16:50
← SteffanW left16:51
→ czart joined16:52
→ af-cmg joined16:53
← czart__ left16:53
→ Brain joined16:53
← MattMaker left16:53
→ howdoi joined16:53
→ abec0 joined16:57
→ hussam joined16:58
← peacememories left16:59
← chll_ left16:59
← pbandark left16:59
← Cabanossi left17:01
→ akushner___ joined17:03
← Floflobel left17:03
→ Argylelabcoat joined17:03
→ Cabanossi joined17:03
→ raynold joined17:04
→ plasticle joined17:05
→ SteffanW joined17:05
→ SkyPatrol_ joined17:05
pockata moritz: It says it pulls the branch as FETCH_HEAD17:05
← danguafer left17:06
← oprypin left17:06
→ oprypin joined17:06
← CBF16888 left17:06
← SkyPatrol left17:08
→ cdg joined17:08
pockata I still can't see the branches on the remote with git branch -a, which is what it should do, if I'm not interpreting the manpage wrong17:09
→ cdg_ joined17:09
← johnny56 left17:09
← amirpro left17:10
← SteffanW left17:12
→ SteffanW joined17:12
→ fatalhalt joined17:12
← cdg left17:13
→ MattMaker joined17:13
→ Cassiopaya joined17:15
→ Discovery joined17:15
← Discovery left17:16
← Cassiopaya left17:16
→ hahuang65 joined17:17
→ bronson joined17:19
pockata Ok, so after a few wasted hours, this was the thread that helped me: https://stackoverflow.com/questions/12319968/remote-branch-not-showing-up-in-git-branch-r17:19
→ menip joined17:20
← SwiftMatt left17:22
→ angrybacon joined17:23
← bronson left17:23
→ kanthael joined17:23
→ john_hexis joined17:25
→ mr_fribble joined17:25
→ ibash joined17:25
thiago pockata: you didn't have a fetch line it the git config?17:25
← ibash left17:26
→ ibash joined17:26
→ SwiftMatt joined17:26
← Cabanossi left17:32
darth_dilfridge → dilfridge17:32
→ Cabanossi joined17:33
← snowkidimd left17:34
← MattMaker left17:35
← roelmonnens left17:36
→ roelmonnens joined17:37
← BSAlb left17:37
→ wootehfoot joined17:38
← roelmonnens left17:39
→ dsantiag_ joined17:40
← gxt left17:40
→ roelmonnens joined17:40
← peterbecich left17:40
← Bubiah left17:40
← sigdk left17:41
← roelmonnens left17:41
← wootehfoot left17:41
← itseris left17:42
→ Bubiah joined17:42
→ wootehfoot joined17:42
→ roelmonnens joined17:42
← dsantiago left17:43
← flaviodesousa left17:43
← angrybacon left17:44
→ Gustavo6046_ joined17:45
→ Noldorin joined17:46
← roelmonnens left17:46
← chachasmooth left17:47
← Gustavo6046_ left17:47
→ Gustavo6046_ joined17:47
→ Bass10 joined17:48
→ chachasmooth joined17:49
← str left17:49
← SwiftMatt left17:49
→ D630 joined17:51
← Gustavo6046 left17:51
← Vaelatern left17:52
← Bass10 left17:52
→ energizer joined17:53
→ johnny56 joined17:53
← Gustavo6046_ left17:54
→ Phylock joined17:54
→ Gustavo6046 joined17:54
← tsia left17:58
← D630 left18:00
→ Shakeel__ joined18:01
→ Sasazuka joined18:01
→ dave0x6d joined18:01
→ yehowyada joined18:01
← Shakeel_ left18:02
→ peterbecich joined18:05
→ rkta joined18:06
→ sebboh joined18:07
pockata thiago: Yep, that was the problem. I'm sure I didn't edit the .git/config file before and this was not a shallow clone (if it's even related)18:10
→ edvb joined18:12
→ Vaelatern joined18:14
→ itseris joined18:15
← wootehfoot left18:16
→ snowkidimd joined18:18
→ misosoup joined18:19
→ wootehfoot joined18:19
← mr_fribble left18:20
→ agnki joined18:22
→ lafleurdubien joined18:22
→ hash-z3r0 joined18:23
← hash-z3r0 left18:23
← shdw- left18:23
→ PikalaxALT joined18:24
→ newbie|4 joined18:24
← a3Dman left18:24
→ manuelschneid3r joined18:26
PikalaxALT In[1]: __name__ == '__main__'18:26
← jceb left18:26
PikalaxALT would it make sense to implement a git-ignore command that manages the .gitignore?18:27
← SteffanW left18:28
← Bock left18:28
→ test123456 joined18:29
→ mikeric joined18:29
← konsolebox left18:29
→ a3Dman joined18:29
→ JanC_ joined18:29
→ shdw joined18:30
→ jwmann joined18:30
→ tarak joined18:30
JanC → Guest2319618:31
← Guest23196 left18:31
JanC_ → JanC18:31
jwmann One of my coworkers merged a branch and when he fixed the conflict, he choose the wrong commit. The merge has already been pushed.18:31
→ jceb joined18:31
← cbonobo left18:31
→ Tobbi joined18:31
jwmann How do I fix this without messing up the repo?18:32
← Cabanossi left18:32
moritz push a new commit that undoes the damage18:32
→ darth_platypus joined18:32
jwmann Both branches are still in use, I should just make a new commit mimicing the past commit?18:32
← tarak left18:32
jwmann Or should I revert the merge and try again?18:33
→ Cabanossi joined18:33
jwmann Basically merging development into staging branch18:34
The best way would be to make a staging specific commit?18:34
→ cbonobo joined18:34
→ MattMaker joined18:34
→ myhau joined18:35
→ konsolebox joined18:36
→ cdg joined18:37
← cdg_ left18:40
thiago jwmann: do not revert the merge18:41
just fix the state with a new commit18:41
moritz just make a new commit in the branch that was the target of the merge18:41
← snowkidimd left18:41
← cdg left18:42
← phluks left18:42
→ Cassiopaya joined18:42
→ Discovery joined18:42
← Cassiopaya left18:42
← Discovery left18:42
← jwmann left18:42
→ jost joined18:43
→ jwmann joined18:43
jwmann Thanks thiago and moritz18:44
→ Discovery joined18:45
→ Cassiopaya joined18:45
← Discovery left18:45
← Cassiopaya left18:45
→ durham_ joined18:46
← Guest76076 left18:46
→ overlord_tm joined18:46
← theoceaniscool left18:47
→ Guest76076 joined18:48
← shdw left18:48
→ TinkerTyper joined18:48
← durham left18:49
→ snowkidimd joined18:50
← jwmann left18:50
→ shdw joined18:50
→ jwmann joined18:51
← orbyt_ left18:54
← shdw left18:55
→ orbyt_ joined18:56
← oprypin left18:56
→ oprypin joined18:56
← a3Dman left18:57
→ shdw joined18:59
→ a3Dman joined19:01
→ SwiftMatt joined19:02
→ King_Hual joined19:02
← Guest73 left19:07
→ phinxy joined19:07
← sturner left19:07
← jceb left19:08
→ cagedwisdom joined19:09
→ ForeignBiscuit joined19:10
← jwmann left19:11
→ JR042444__ joined19:11
→ theoceaniscool joined19:11
→ peacememories joined19:11
← snowkidimd left19:13
→ jwmann joined19:13
→ eelster joined19:13
← vamiry left19:13
← ibash left19:14
← ResidentBiscuit left19:14
← opalepatrick left19:14
→ ertes joined19:14
← cagomez left19:15
← ForeignBiscuit left19:15
← JR042444__ left19:16
← orbyt_ left19:16
← a3Dman left19:17
→ bronson joined19:20
← newbie|4 left19:21
← Murii left19:22
← yehowyada left19:22
→ a3Dman joined19:23
→ ldybgd joined19:25
← bronson left19:25
← Tobbi left19:25
← bket left19:25
→ meLon joined19:26
← a3Dman left19:28
← rwb left19:30
→ a3Dman joined19:31
← chachasmooth left19:32
← ferr left19:33
← kanthael left19:34
→ ferr joined19:34
→ chachasmooth joined19:34
← peacememories left19:34
→ MattMake_ joined19:36
← MattMake_ left19:38
→ MattMake_ joined19:39
← MattMake_ left19:39
→ MattMake_ joined19:40
← menip left19:40
← MattMaker left19:40
← a3Dman left19:40
→ bket joined19:40
← energizer left19:41
← MattMake_ left19:41
→ energizer joined19:42
→ ibash joined19:42
→ EY joined19:44
→ a3Dman joined19:45
← shdw left19:46
→ shdw joined19:47
← test123456 left19:50
← sathed left19:51
→ sbeyer joined19:51
← durham_ left19:51
→ jstein_ joined19:51
jstein_ → jstein19:52
→ durham joined19:52
→ robouk joined19:52
← ibash left19:54
← jstein left19:55
← brent__ left19:55
→ tsia joined19:56
← durham left19:56
← PaulCapestany left19:57
→ m0viefreak joined20:00
← sunri5e left20:00
← myhau left20:00
← redtail left20:02
← chachasmooth left20:02
→ durham joined20:02
→ sunri5e joined20:02
→ Tobbi joined20:02
→ orbyt_ joined20:04
→ chachasmooth joined20:04
← orbyt_ left20:04
→ sturner joined20:05
→ orbyt_ joined20:06
→ cdg joined20:07
← tsia left20:07
→ fuzzzerd joined20:07
← YuGiOhJCJ left20:08
→ YuGiOhJCJ joined20:09
→ cdg_ joined20:09
← bgerber left20:12
→ olalonde joined20:12
← ShekharReddy left20:12
← cdg left20:12
← ertes left20:14
→ cagomez joined20:15
→ bruce_lee joined20:16
← bruce_lee left20:16
→ bruce_lee joined20:16
← cagomez left20:20
→ bgerber joined20:20
→ brent__ joined20:21
→ cagomez joined20:21
← wootehfoot left20:22
← gugah left20:24
→ Grezzi joined20:25
→ jost_ joined20:26
→ ibash joined20:27
← jost left20:27
→ Disgeae joined20:28
Disgeae Is there any decent way to 'git add file --patch' on untracked files?20:28
← QualityAddict left20:28
← Guest76076 left20:29
i7c mhm I guess you could git add -N them first20:29
← mmlb left20:29
→ githubmgw joined20:29
← Grezzi left20:30
→ mmlb joined20:30
i7c but what’s the sense really?20:30
→ tunekey joined20:30
→ QualityAddict joined20:30
Disgeae Only add certain parts of the new file.20:30
→ Guest76076 joined20:30
i7c ah I see20:30
Disgeae Plus I like the check of 'add --patch', to check if what I did was intended20:30
i7c It’s maybe not the most elegant way, but should work.20:31
Disgeae I see, thanks.20:31
i7c Disgeae, I do that too.20:31
I find it very good pratcicse.20:31
practice*20:31
← githubmgw left20:31
Disgeae Yep it seems alright for what it does, an additional step but safety first anyways.20:31
← path2 left20:32
← robotroll left20:32
→ wootehfoot joined20:33
Disgeae Another noob question, what's the best way to stash? Just git stash save MESSAGE?20:34
← peterbecich left20:34
mud It depends. If it's short term and you don't need the message 'git stash' works fine20:35
→ sathed joined20:35
→ ertes joined20:35
→ PaulCapestany joined20:36
Disgeae And just 'git stash pop' to get back at it?20:36
← wootehfoot left20:36
i7c yup20:36
→ peterbecich joined20:37
→ roygbiv joined20:37
i7c Or stash apply if you wanna keep it on the stash.20:38
← safe left20:39
Disgeae What's the difference between apply/pop20:41
Or is it the same?20:41
i7c Same effect but apply leaves the entry on the stash.20:41
while pop removes it20:41
← madewokherd left20:42
→ str joined20:43
Disgeae Alright, thanks!20:43
Coming from SVN, made the Git switch a while back, but those things are new.20:44
← blinkingprompt left20:44
← hahuang65 left20:44
← cdg_ left20:45
← xaa__ left20:45
→ duarte joined20:46
→ xaa joined20:46
← Tobbi left20:46
← Cabanossi left20:47
← in1t3r left20:47
→ in1t3r joined20:47
← Gustavo6046 left20:47
→ Cabanossi joined20:49
← chachasmooth left20:49
← danieli left20:49
→ chachasmooth joined20:49
→ jstein_ joined20:49
jstein_ → jstein20:49
→ MattMaker joined20:50
← MattMaker left20:50
→ hehehe joined20:50
hehehe ty for the tutorial linj20:51
:))))20:51
→ MattMaker joined20:51
→ manuels joined20:51
← manuelschneid3r left20:51
← hehehe left20:51
→ rwb joined20:51
← Richard_Cavell left20:52
→ opalepatrick joined20:52
→ Gustavo6046 joined20:52
→ danieli joined20:55
← schleppel left20:56
← ibash left20:57
← jstein left20:58
← SwiftMatt left20:58
→ bitBaron joined21:00
→ Richard_Cavell joined21:00
← bitBaron left21:00
← penanze left21:01
→ nidr0x joined21:02
← sathed left21:04
← n-st left21:04
← TomyLobo left21:04
→ n-st joined21:05
← \drew left21:05
→ cdg joined21:05
← str left21:06
← cdg left21:08
← bgerber left21:08
← eelster left21:08
→ cdg joined21:08
→ tymczenko joined21:09
← n-st left21:09
← h12o left21:09
→ n-st joined21:09
→ Sasazuka__ joined21:12
← Sasazuka left21:12
Sasazuka__ → Sasazuka21:13
← chachasmooth left21:17
funkytwig I made a local branch and have added changes. If I commit and push will it be pushed to the remote repository21:19
→ tsia joined21:19
→ chachasmooth joined21:19
→ cdown_ joined21:19
← svm_invictvs left21:21
→ svm_invi_ joined21:21
→ bronson joined21:21
← cdown left21:22
cdown_ → cdown21:22
funkytwig do I just 'push origin <branch-name>', and do I even need origin, ir does it asume that21:25
← bronson left21:26
→ hahuang65 joined21:26
perlpilot funkytwig: on the first push, you normally do `git push -u origin branch` to set the upstream, but afterwards just `git push` should suffice21:29
→ SwiftMatt joined21:29
← hahuang65 left21:30
← Guest29805 left21:31
→ Xiti` joined21:31
← Murr left21:31
→ giraffe joined21:32
giraffe → Guest5465221:32
→ Murr joined21:32
← tunekey left21:32
funkytwig Cool, thought that was it. It this a good way of doing it or should I of done something when I created the branch to say it is to be pushed to remote when I do a puch. seemd safer in case I miss out origin.21:32
← artgoeshere left21:33
→ tunekey joined21:33
← MACscr left21:33
← boombatower left21:34
→ artgoeshere joined21:34
→ justache joined21:35
← Xiti` left21:35
← Xiti left21:35
→ Xiti joined21:35
→ boombatower joined21:35
→ mr_sm1th joined21:35
← jakogut left21:36
→ bbhoss joined21:36
→ ibash joined21:36
← indistylo left21:37
→ l2y joined21:37
← tsia left21:37
→ Pilfers joined21:37
→ bgerber joined21:38
← phinxy left21:39
← db8093246 left21:39
→ vamiry joined21:40
← Jak_o_Shadows left21:40
→ roelmonnens joined21:41
→ jakogut joined21:41
← Disgeae left21:41
→ sizur1 joined21:42
← butterthebuddha left21:42
→ redtail joined21:43
← AaronMT left21:43
sizur1 Help! git mergetool's LOCAL is not matching my actual local whle attempting to resolve a rebase conflict. at branch B, commited, git rebase A; conflict; git merge; bam local_LOCAL is different from local... What's up?21:44
conflict; git mergetool;21:45
← roelmonnens left21:45
← Cabanossi left21:46
← vamiry left21:47
← chachasmooth left21:47
← jeffreylevesque left21:47
→ Jak_o_Shadows joined21:47
← Jak_o_Shadows left21:47
→ Jak_o_Shadows joined21:47
→ Elon_Satoshi joined21:48
→ cdg_ joined21:48
→ chachasmooth joined21:49
→ Cabanossi joined21:49
→ ToBeCloud joined21:50
gitinfo set mode: +v21:50
← cdg left21:51
→ vamiry joined21:52
← cbonobo left21:53
← glad left21:53
← ams__ left21:53
← tymczenko left21:53
← cagomez left21:54
→ cagomez joined21:54
← ibash left21:55
← shdw left21:56
← pockata left21:57
→ ZyX-I joined21:57
← cagomez left21:58
← zivester left21:58
→ CheckDavid joined22:02
← bgerber left22:03
→ bgerber joined22:04
← roygbiv left22:05
← leeN left22:05
→ dreiss joined22:06
→ danieli_ joined22:06
← danieli left22:06
→ ibash joined22:07
← Argylelabcoat left22:07
← m0viefreak left22:07
→ Tobbi joined22:07
← LeBlaaanc left22:08
← Phylock left22:08
← oojacoboo left22:09
→ oojacoboo joined22:09
→ cagomez joined22:11
← fission6 left22:11
← jakogut left22:13
← darth_platypus left22:15
→ SkyPatrol joined22:15
← SkyPatrol_ left22:17
← guampa left22:18
← chachasmooth left22:18
→ chachasmooth joined22:19
← SwiftMatt left22:20
→ SwiftMatt joined22:21
→ phinxy joined22:22
← ahrs left22:22
→ ahrs joined22:24
← sbeyer left22:24
→ jstein_ joined22:25
jstein_ → jstein22:25
← theoceaniscool left22:25
← jost_ left22:26
→ ZexaronS joined22:26
← Random832 left22:27
← kpease left22:29
← EY left22:29
← orbyt_ left22:29
← akushner___ left22:30
→ jakogut joined22:31
→ NoneTheRed joined22:34
→ hahuang65 joined22:34
← dege left22:36
← phinxy left22:37
→ Random832 joined22:39
→ orbyt_ joined22:40
→ sathed joined22:41
→ kasual joined22:42
→ bronson joined22:42
← ldybgd left22:43
→ mizu_no_oto joined22:44
svm_invi_ → svm_invictvs22:46
← chachasmooth left22:47
← Cabanossi left22:47
→ perrier-jouet joined22:48
→ Cabanossi joined22:48
← mizu_no_oto left22:48
→ chachasmooth joined22:49
→ jeffreylevesque joined22:49
← redtail left22:54
← danieli_ left22:55
→ shdw joined22:56
→ danieli joined22:56
← hahuang65 left22:57
← ibash left22:57
→ steeze joined22:59
← misosoup left23:00
← al-damiri left23:01
← finalbeta left23:03
→ hahuang65 joined23:07
→ butterthebuddha joined23:08
← SwiftMatt left23:12
← hahuang65 left23:12
→ RandomSerb joined23:12
← Guma left23:13
RandomSerb hello. One question on tagging. I've created repo on github, cloned it, added code, added tag, pushed with --tags, made a commit, pushed to origin23:13
I presume I did it wrong23:13
I wanted to tag a version of my code23:13
would someone please help on how to tag a commit?23:14
I presume I needed to add a commit first, then push, then add a tag, then push tags23:14
→ jameser joined23:17
→ madewokherd joined23:18
← peterbecich left23:20
← in1t3r left23:21
→ ibash joined23:22
← manuels left23:22
← perrier-jouet left23:22
← ibash left23:22
← jameser left23:23
→ in1t3r joined23:24
→ innrain joined23:25
→ ibash joined23:26
← cdown left23:26
← NoneTheRed left23:27
→ peterbecich joined23:27
→ perrier-jouet joined23:28
← perrier-jouet left23:28
← sathed left23:29
→ perrier-jouet joined23:29
→ sathed joined23:30
← sathed left23:30
→ cdown joined23:30
← salamanderrake left23:30
← cdown left23:31
← Murr left23:32
→ Murr joined23:32
→ salamanderrake joined23:33
→ shennyg joined23:35
→ mizu_no_oto joined23:36
→ ggherdov joined23:36
← govg left23:36
→ masuberu joined23:37
← andai left23:37
← innrain left23:38
→ cdg joined23:38
→ andai joined23:38
← peterbecich left23:38
→ govg joined23:38
→ peterbecich joined23:39
← duarte left23:40
→ hahuang65 joined23:40
← cdg_ left23:41
← mizu_no_oto left23:43
← sz0 left23:43
← govg left23:43
← ibash left23:44
→ ixian joined23:44
← itseris left23:46
→ mizu_no_oto joined23:46
→ darth_platypus joined23:46
← xaa left23:46
← cdg left23:47
← chachasmooth left23:47
gkats Hi, I'm looking for recommendations on Git branching models to follow.23:47
→ bambs joined23:48
gkats When to cut feature branches, release branches, how frequently to merge to master etc23:48
→ chachasmooth joined23:49
→ cdg joined23:50
→ durham_ joined23:51
← jstein left23:51
→ ibash joined23:52
← durham left23:54
← durham_ left23:55
← cdg left23:55
→ ahr3n joined23:56
→ tvw joined23:56
→ durham_ joined23:57
→ Bock joined23:59

Logs Search ←Prev date Next date→ Channels Documentation