Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-09

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

All times shown according to UTC.

Time Nick Message
00:00 durham_ joined #git
00:05 tesuji_ joined #git
00:06 BSaboia joined #git
00:07 _sjs joined #git
00:08 patrick-sartent joined #git
00:09 jimi_ joined #git
00:09 mweshi joined #git
00:09 tesuji joined #git
00:10 NightStrike joined #git
00:10 mweshi joined #git
00:11 NightStrike Help.... I just did a "git rebase -k" instead of "git rebase -i" (typo...)  It did a bunch of stuff and I don't know what.  Is this bad?
00:11 hahuang61 joined #git
00:12 medeirosthiiago joined #git
00:13 Derperperd joined #git
00:13 csd_ joined #git
00:17 button joined #git
00:17 MattMaker joined #git
00:17 button joined #git
00:22 livingstn joined #git
00:22 KnightsOfNi joined #git
00:23 ReenignE NightStrike: -k doesn't appear to be a flag that git rebase accepts so it likely just rebased.
00:24 ReenignE NightStrike: Check git reflog
00:24 NightStrike The docs say that k makes it keep empty commits
00:24 ReenignE That's --keep-empty, didn't see shorthand for it though -k would make sense.
00:25 ReenignE If your reflog says there was a rebase you can 'git reset --hard HEAD@{1}' assuming no other updates have happened since that was ran.
00:28 akiva joined #git
00:28 ReenignE Being familiar with 'git reflog' is quite useful. In a situation like this it allows you to see what actions have changed where your HEADs at and to get an idea of what happened while also providing the HEAD@{#} ref syntax to use in commands.
00:29 ReenignE Is there a git-joke with "Where's your HEAD at" yet?
00:30 Rodya_ joined #git
00:30 therealGent joined #git
00:30 therealGent joined #git
00:30 bremner many
00:30 justanotheruser joined #git
00:34 b1tchcakes joined #git
00:36 pioiytr_ joined #git
00:37 hahuang61 joined #git
00:38 Electrometro joined #git
00:43 BSaboia joined #git
00:43 dhollinger joined #git
00:51 NeXTSUN joined #git
00:53 veilig2000 joined #git
00:53 sebascar left #git
00:54 jimi_ joined #git
00:55 livingstn joined #git
01:00 a3Dman joined #git
01:00 crayon joined #git
01:01 Anderson69s_Pi joined #git
01:01 crayon joined #git
01:04 zivester joined #git
01:04 MattMaker joined #git
01:09 mellernoia joined #git
01:10 jeffreylevesque joined #git
01:14 cqi joined #git
01:14 zacts joined #git
01:14 al-damiri joined #git
01:16 diogenese joined #git
01:20 jantje joined #git
01:23 thiago joined #git
01:27 pks joined #git
01:29 jantje joined #git
01:29 sagerdearia joined #git
01:29 ytl joined #git
01:31 arescorpio joined #git
01:31 HanClinto joined #git
01:32 Mannn joined #git
01:35 akiva joined #git
01:37 jost_ joined #git
01:38 akiva joined #git
01:38 durham joined #git
01:42 rkazak joined #git
01:46 SwiftMatt joined #git
01:46 MattMaker joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and botany | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Nurture your git-twigs and they will grow into a full branch
01:49 d^sh joined #git
01:51 vassagus joined #git
01:55 red^ joined #git
01:57 ShekharReddy hello anyone here :)
01:57 ShekharReddy I have deleted a file locally and when I push the repository is not getting updated
01:59 israelzuniga joined #git
02:01 Derperperd joined #git
02:02 cqi joined #git
02:12 fish3485 joined #git
02:12 kanyeezy joined #git
02:14 fahadash joined #git
02:16 cyphase_eviltwin joined #git
02:16 romerocesar joined #git
02:16 Dougie187 joined #git
02:18 fish3485 joined #git
02:22 drupald joined #git
02:24 MattMaker joined #git
02:30 interne7y joined #git
02:30 dhollinger joined #git
02:32 ryez ShekharReddy: what have you done? steps? did each succeed?
02:34 blockzombie joined #git
02:35 nyexpress joined #git
02:35 Goplat joined #git
02:38 nyexpress joined #git
02:39 Dougie187 left #git
02:44 j416 joined #git
02:45 lagothrix joined #git
02:47 Portable joined #git
02:48 rkazak joined #git
02:49 Brain joined #git
02:49 hexagoxel joined #git
02:50 MattMaker joined #git
02:51 skylite joined #git
02:52 ShekharReddy ryez: got it
02:52 ShekharReddy Thanks
02:59 omegaenigma joined #git
02:59 chachasmooth joined #git
03:00 troyt joined #git
03:01 ytl_ joined #git
03:04 aavrug joined #git
03:05 aavrug joined #git
03:11 dreiss joined #git
03:12 bjpenn joined #git
03:12 therealGent joined #git
03:12 therealGent joined #git
03:13 harish joined #git
03:15 durham joined #git
03:16 asdofindia joined #git
03:16 romerocesar joined #git
03:18 veilig2000 joined #git
03:19 _sjs joined #git
03:20 fstd_ joined #git
03:21 dhanush joined #git
03:25 Derperperd joined #git
03:25 durham joined #git
03:27 elementalest joined #git
03:27 elementalest joined #git
03:31 robogoat joined #git
03:32 chamunks joined #git
03:38 MattMaker joined #git
03:41 SonicJam joined #git
03:42 dsdeiz joined #git
03:42 dsdeiz joined #git
03:49 carif joined #git
03:53 cagmz joined #git
03:54 MattMaker joined #git
03:54 danslo joined #git
03:54 dsantiago joined #git
03:56 blackwind_123 joined #git
03:56 mwlang joined #git
03:57 cagomez joined #git
03:57 cagomez joined #git
03:59 shgysk8zer0 joined #git
03:59 zmachine joined #git
04:01 thecomedian joined #git
04:02 dhollinger joined #git
04:04 Ph_ joined #git
04:05 neca joined #git
04:07 romerocesar joined #git
04:07 beyertech joined #git
04:08 mischat joined #git
04:09 dreiss joined #git
04:09 chris_ joined #git
04:10 bjpenn joined #git
04:10 a_thakur joined #git
04:10 FelixVi joined #git
04:11 SwiftMatt joined #git
04:13 chris___ joined #git
04:13 phanimahesh joined #git
04:15 israelzuniga joined #git
04:17 romerocesar joined #git
04:24 phanimahesh joined #git
04:28 Rodya_ joined #git
04:31 interne7y joined #git
04:32 NeXTSUN joined #git
04:32 Cabanossi joined #git
04:34 govg joined #git
04:36 cqi joined #git
04:37 MattMaker joined #git
04:45 romerocesar joined #git
04:45 howdoi joined #git
04:50 israelzuniga joined #git
04:52 leeN joined #git
04:55 Limes__ joined #git
04:55 sulky joined #git
04:55 noteness joined #git
04:56 skasturi joined #git
04:57 subhojit777 joined #git
04:57 NeXTSUN joined #git
05:05 Kulrak joined #git
05:05 Kulrak joined #git
05:08 inflames joined #git
05:13 vassagus joined #git
05:15 romerocesar_ joined #git
05:15 pR0Ps joined #git
05:16 pwnz0r joined #git
05:18 rbern joined #git
05:19 stuh84 joined #git
05:19 nilg joined #git
05:20 MattMaker joined #git
05:25 Raging_Hog joined #git
05:29 Rodya_ joined #git
05:32 johnny56_ joined #git
05:34 LeMike joined #git
05:35 ome joined #git
05:38 zeroed joined #git
05:38 zeroed joined #git
05:38 robogoat joined #git
05:38 slayerjain joined #git
05:39 satya4ever joined #git
05:44 a_thakur_ joined #git
05:47 rscata joined #git
05:48 bocaneri joined #git
05:48 azerus joined #git
05:52 alfy joined #git
05:53 jceb joined #git
05:54 Codfection joined #git
05:54 mweshi joined #git
05:55 danslo joined #git
05:56 mweshi joined #git
05:59 apprentice joined #git
06:00 xlegoman joined #git
06:02 Codfection joined #git
06:07 MattMaker joined #git
06:10 LeBlaaanc joined #git
06:13 LeBlaaanc joined #git
06:15 LeBlaaanc joined #git
06:16 johnny56_ joined #git
06:19 hanthings joined #git
06:20 seishun joined #git
06:21 kanyeezy joined #git
06:25 nights joined #git
06:26 apipkin_ joined #git
06:26 freimatz joined #git
06:27 rchavik joined #git
06:27 moumitude joined #git
06:28 pdgwien joined #git
06:28 rcn joined #git
06:28 jabular joined #git
06:28 AlHafoudh joined #git
06:28 iokill joined #git
06:28 Timvde joined #git
06:30 star_prone joined #git
06:30 jknetl joined #git
06:30 t-mart__ joined #git
06:31 interne7y joined #git
06:32 roelmonnens joined #git
06:35 Seveas ReenignE: https://github.com/EugeneKay/​git-jokes/blob/lulz/Jokes.txt
06:35 Seveas looks like no. Fix it :)
06:35 dhollinger joined #git
06:35 mariuscc joined #git
06:39 roelmonn_ joined #git
06:41 Sceorem joined #git
06:42 noteness joined #git
06:42 tvw joined #git
06:43 ryez joined #git
06:45 skasturi joined #git
06:46 TinkerTyper joined #git
06:47 roelmonnens joined #git
06:47 ShekharReddy joined #git
06:48 t0by joined #git
06:49 danslo joined #git
06:50 MattMaker joined #git
06:51 abyx joined #git
06:52 settermjd joined #git
06:53 submitnine joined #git
06:54 gfixler joined #git
06:55 fahadash joined #git
06:58 ki0 joined #git
07:01 vmiklos joined #git
07:01 johnny56_ joined #git
07:09 rewt joined #git
07:11 jguillen joined #git
07:11 romerocesar joined #git
07:11 sagerdearia joined #git
07:12 moumitude joined #git
07:13 vassagus joined #git
07:14 PCatinean joined #git
07:15 Softeisbieger joined #git
07:16 bjpenn joined #git
07:20 a_thakur joined #git
07:21 saidelike joined #git
07:21 romerocesar joined #git
07:23 Darcidride joined #git
07:23 d4rklit3 joined #git
07:25 pitastrudl joined #git
07:25 Balliad joined #git
07:29 watabou joined #git
07:32 ahmedelgabri joined #git
07:36 csd_ joined #git
07:38 star_prone joined #git
07:44 tinajohnson___ joined #git
07:47 LiohAu joined #git
07:48 aidalgol joined #git
07:49 rubyonrailed joined #git
07:52 DevAntoine joined #git
07:52 davidbz joined #git
07:55 mikecmpbll joined #git
07:56 NeXTSUN joined #git
07:56 johnny56 joined #git
07:59 GavinMagnus joined #git
07:59 grift joined #git
08:06 Anderson69s_Pi joined #git
08:08 garethdaine joined #git
08:09 nilsi joined #git
08:09 piling joined #git
08:09 MrWoohoo joined #git
08:09 mibr0 joined #git
08:10 harish_ joined #git
08:12 maxorator joined #git
08:13 tomog999 joined #git
08:14 marcogmonteiro joined #git
08:14 davisonio joined #git
08:17 bongjovi joined #git
08:17 chll_ joined #git
08:23 synthmeat joined #git
08:26 synthmeat joined #git
08:31 eijk_ joined #git
08:32 star_prone joined #git
08:32 interne7y joined #git
08:33 fees joined #git
08:34 eijk joined #git
08:37 a_thakur joined #git
08:37 a_thakur joined #git
08:39 interrobangd joined #git
08:39 nilsi joined #git
08:48 eott joined #git
08:51 nikitasius joined #git
08:51 Balliad joined #git
08:52 jabular joined #git
08:53 aidalgol joined #git
08:54 eott is this the right place to ask for help concerning 'huge mistakes done using git'? we have trouble undoing a huge fast-forward merge
08:54 kadoban Seems like a good place for it, sure.
08:55 eott okay, thanks. a bit of backstory:
08:55 arand joined #git
08:57 eott we have a "Core" repository and over the years "Custom" repos forked off of the core. both the core and the custom repos have been developed over the years. now someone accidentally merged a custom branch into the core master by way of a fast-forward merge. so now we have 11000 commits over three years interspersed with the commits to the core repo in the commit history. so we can't see a single point to where we could reset t
08:58 kadoban eott: You got cut off after "... to where we could reset th"
08:58 eott point to where we could reset the master.
08:59 kadoban eott: Have you checked the reflog? 'git reflog master' should show you previous states of master, and why they changed.
09:00 eott unfortunately I can only see the reflog of my local copy, which only shows me "git pull origin master"
09:00 LeBlaaanc joined #git
09:01 kadoban eott: Surely there must be some version of the repo somewhere that has the old versions?
09:01 UncleCJ joined #git
09:01 j416 joined #git
09:01 eott probably. our current proposes solution involves deleting the remote master, pushing an older version from a local copy, then remerging the "core" branches that have been merged since then
09:02 eott however that doesn't seem like "the git way"
09:02 Ezzy joined #git
09:02 kadoban Well, the other option is some huge revert.
09:03 eott wouldn't that require identifying the 11k commits for the revert?
09:04 leeN joined #git
09:05 kadoban You can specify ranges, and if you have a local copy that knows both the old "good" version of master in the reflog that saw the mistaken merge, that's easy to specify. I have no godly idea how long it'll take to revert 11k commits though ...
09:05 kadoban It's really up to you if you want to change history, which has its own issues, or do that.
09:06 kadoban If you change history, everyone needs to make sure they also start using your changed history. Which is kind of tedious and confusing, but not particularly hard. Depending on how many people are basing work off of it anyway, or have a copy.
09:06 eott eugh, yeah that is not an appealing option. we'll probably do the reset to an older version, then ask everyone to push their branches of the last X days again
09:06 eott thanks for the help
09:07 kadoban 'welcome
09:11 Juzzika joined #git
09:14 vassagus joined #git
09:20 encod3 joined #git
09:20 Muzer joined #git
09:21 lss8 joined #git
09:21 mattsl joined #git
09:23 xaa joined #git
09:24 nuc joined #git
09:25 Sceorem joined #git
09:25 Rish joined #git
09:25 djb-irc joined #git
09:26 GavinMagnus left #git
09:27 linuxmint joined #git
09:28 neca joined #git
09:32 lugzer joined #git
09:37 Rish joined #git
09:37 GavinMagnus joined #git
09:43 roelmonnens joined #git
09:44 Anticom joined #git
09:47 Ardethian\work joined #git
09:48 iomari joined #git
09:49 netj joined #git
09:49 ondrejs joined #git
09:51 nivag joined #git
09:52 star_prone joined #git
09:55 sdothum joined #git
09:55 phoenix301 joined #git
09:57 sagerdearia joined #git
09:59 flopsec joined #git
10:00 nilg joined #git
10:03 mablae__ joined #git
10:04 UncleCJ joined #git
10:05 IIT joined #git
10:05 IIT can we clone all the repos under a specific organization ?
10:07 jceb joined #git
10:07 alipoor90 joined #git
10:07 davisonio joined #git
10:08 alipoor90 Is there any difference between `git gc` and `git repack -ad`?
10:09 Rikairchy joined #git
10:10 ahmedelgabri joined #git
10:11 zack_s_ joined #git
10:12 thebloggu joined #git
10:14 alipoor90 left #git
10:17 zack_s_ I have a commit-msg hook, which should extract from the branch name the jira ID
10:17 zack_s_ https://paste.ee/p/YGTqE
10:17 thebloggu joined #git
10:17 zack_s_ however, it doesnt work to attach the extracted id AFTER the message
10:18 satifant joined #git
10:20 MattMake_ joined #git
10:23 mcqr joined #git
10:24 ribasushi joined #git
10:25 ahmedelgabri joined #git
10:30 canton7 zack_s_, define "it doesn't work to ..."? does it actually execute line 19?
10:31 sin3t joined #git
10:31 Ranhir joined #git
10:33 IIT joined #git
10:33 interne7y joined #git
10:33 NeXTSUN joined #git
10:34 rik316 joined #git
10:34 selckin joined #git
10:34 sin3t joined #git
10:41 rockitude joined #git
10:42 cdown joined #git
10:42 eott left #git
10:44 sin3t joined #git
10:45 Izabia joined #git
10:46 gajus joined #git
10:46 gajus joined #git
10:47 ahmedelgabri joined #git
10:48 fuchstronaut joined #git
10:48 fuchstronaut joined #git
10:50 veilig2000 joined #git
10:54 rns joined #git
10:54 danslo joined #git
10:54 sin3t joined #git
11:01 roelmonnens joined #git
11:02 Maple__ joined #git
11:03 jeffreylevesque joined #git
11:04 sin3t joined #git
11:05 cyan__ joined #git
11:05 mithenks joined #git
11:06 selceeus joined #git
11:11 danslo joined #git
11:11 zack_s_ joined #git
11:11 zack_s_ canton7: yes it does
11:12 abatwork joined #git
11:12 zack_s_ it get this output: "New commit message: [TTS-2336] test"
11:12 abatwork left #git
11:14 sin3t joined #git
11:14 choki joined #git
11:15 vassagus joined #git
11:15 rik316 joined #git
11:17 ojdo joined #git
11:24 sin3t joined #git
11:24 UncleCJ joined #git
11:25 fuchstronaut is there a way to count the number of commits from a sha hash on until the latest commit on a certain branch?
11:28 jceb joined #git
11:28 selckin git log | sed '/sha.*$/,$d' | wc -l
11:28 selckin hacky hacky
11:29 fuchstronaut git rev-list hash..HEAD shows me a list of all hashes but how do i count them?
11:29 selckin | wc -l
11:30 fuchstronaut aaah
11:30 fuchstronaut so the | takes what rev-list returns and wc -l counts the number of new lines?
11:30 star_prone joined #git
11:30 p4trix joined #git
11:31 selckin | pipes the stdout of the left side to the stdin of the program on the right
11:31 selckin wc is wordcound, and -l counts lines
11:33 GavinMagnus joined #git
11:33 MattMaker joined #git
11:33 anuxivm joined #git
11:34 sin3t joined #git
11:34 fuchstronaut thanks selckin
11:36 csd_ joined #git
11:37 livingstn joined #git
11:39 Ardethian\work joined #git
11:40 zack_s_ canton7: are you there?
11:41 ahmedelgabri joined #git
11:43 circ-user-Y1dra joined #git
11:44 sin3t joined #git
11:44 romerocesar joined #git
11:46 str joined #git
11:47 medeirosthiiago joined #git
11:49 star_prone joined #git
11:51 fuchstronaut having a branch that is behind ~1300 commits, is there a way I can TRY to rebase it and abort and revert back in case I fail? Im afraid I might screw up either the branch or  master
11:52 ec\ joined #git
11:53 sanketdg joined #git
11:53 danslo fuchstronaut: you can always 'git rebase --abort', that said, just back up the folder before you start doing that stuff
11:54 sin3t joined #git
11:54 star_prone joined #git
11:55 rubyonrailed joined #git
11:55 flaguy48 left #git
11:56 artgoeshere joined #git
12:02 MattMaker joined #git
12:03 kc8wxm joined #git
12:03 davisonio joined #git
12:03 kc8wxm left #git
12:04 Sceorem joined #git
12:05 fuchstronaut danslo: what do you mean, backup the folder? just copy/paste it?
12:05 donnib joined #git
12:05 donnib hi
12:05 johnmilton joined #git
12:06 fuchstronaut shouldn't git rebase --abort restore everything?
12:06 danslo fuchstronaut: it should, and I do it all the time :) but why risk it?
12:07 donnib i am working both on Mac and Windows and i have problems with Line endings, if i run core.autocrlf input on mac and core.autocrlf true on windows then how should the line endings be when files reside in git ?
12:08 fuchstronaut ok, so backing up is just for peace of mind.. will backing up screw up anything git-related? or is it all inside .git?
12:08 mischat joined #git
12:09 ahmedelgabri joined #git
12:10 flaguy48 joined #git
12:11 LiohAu joined #git
12:11 ahmedelgabri joined #git
12:14 LeBlaaanc joined #git
12:15 rwb joined #git
12:15 dsdeiz joined #git
12:16 TooLmaN joined #git
12:17 ujan joined #git
12:17 synthroid joined #git
12:18 abdul joined #git
12:21 xaa joined #git
12:21 a_thakur joined #git
12:23 fmcgeough joined #git
12:23 D[4]ni_ joined #git
12:23 sin3t joined #git
12:27 tabrez joined #git
12:28 tlaxkit joined #git
12:28 fuchstronaut if I checkout a feature branch and 'git rebase master', the feature branch will be rebased onto master, right?
12:29 fuchstronaut now I have a merge conflict and I wonder if the code in between '<<<<<<< HEAD' and '=======' is the code on top of master
12:31 Rodya_ joined #git
12:33 docnvk joined #git
12:33 sin3t joined #git
12:36 tvw joined #git
12:36 kc8wxm joined #git
12:36 daniel_rose joined #git
12:40 davisonio joined #git
12:43 sin3t joined #git
12:44 fahadash joined #git
12:44 livingstn joined #git
12:44 MattMaker joined #git
12:45 Rodya_ joined #git
12:48 osse fuchstronaut: it's the code from the current branch
12:49 fuchstronaut and the lower part is code from master?
12:49 zivester joined #git
12:50 fuchstronaut behind '<<<<<<' there is the commit message from a commit in my branch i am trying to rebase onto master and the only line that was commited is part of the second block
12:50 fuchstronaut but the second block contains way more lines than only that line
12:51 perlpilot joined #git
12:52 osse ah rebase
12:52 osse then it's the other way around
12:52 m1dnight1 :(
12:52 fuchstronaut So, in a conflict while rebasing A onto master, the first block is code from master's head and the second block is code from the commit of A that is causing a conflict?
12:52 HappyLoa- joined #git
12:53 jeffreylevesque joined #git
12:53 sin3t joined #git
12:59 codeman joined #git
12:59 Sasazuka joined #git
13:00 jimi_ joined #git
13:03 fuchstronaut riiiight=
13:03 sin3t joined #git
13:04 MattMaker joined #git
13:06 sebascar joined #git
13:07 sebascar left #git
13:08 HanClinto joined #git
13:10 cdown joined #git
13:12 cdown_ joined #git
13:13 topolinux joined #git
13:13 sin3t joined #git
13:15 loulou123546 joined #git
13:15 FilipNortic__ joined #git
13:15 JanC_ joined #git
13:16 vassagus joined #git
13:16 MattMaker joined #git
13:17 cdg joined #git
13:18 veilig2000 joined #git
13:18 cdg joined #git
13:18 danslo joined #git
13:18 osse fuchstronaut: that should be it, yes
13:19 crose joined #git
13:20 ksolv joined #git
13:20 daniel_rose joined #git
13:21 danslo joined #git
13:23 sin3t joined #git
13:23 rik316 joined #git
13:23 jstimm joined #git
13:25 Finnoloid joined #git
13:28 ExoUNX joined #git
13:29 DevAntoine joined #git
13:29 playfullyExist joined #git
13:30 ash_workz joined #git
13:32 achadwick joined #git
13:33 sin3t joined #git
13:33 Rodya_ joined #git
13:34 govg joined #git
13:34 MattMaker joined #git
13:34 BSaboia joined #git
13:35 Rodya_ joined #git
13:36 CheckDavid joined #git
13:37 jaafar joined #git
13:40 arooni joined #git
13:42 LBV_User joined #git
13:43 LionsMane joined #git
13:43 sin3t joined #git
13:44 rubyonrailed joined #git
13:45 BSAlb joined #git
13:49 phaleth joined #git
13:50 AaronMT joined #git
13:50 star_prone joined #git
13:50 JeremyM joined #git
13:52 sarbs joined #git
13:53 MattMaker joined #git
13:53 sin3t joined #git
13:54 Shadow6363 joined #git
13:55 Dougie187 joined #git
13:55 fracting joined #git
13:56 SourTrout joined #git
13:59 Rodya_ joined #git
14:00 bongjovi joined #git
14:00 BrianJ joined #git
14:02 slayerjain joined #git
14:03 sin3t joined #git
14:04 dhollinger joined #git
14:04 Shadow6363 Not sure if this is the right channel for design questions, but I have a remote repo with a tag, latest-stable that might switch branches. I only care about the latest-stable code; however, I need to apply a patch to that code. Is there a good way to do this such that I have a latest-stable that tracks their latest-stable while also having my patch applied?
14:04 airdisa joined #git
14:05 Uat joined #git
14:07 LeBlaaanc joined #git
14:07 rubyonrailed joined #git
14:08 z_ joined #git
14:08 jguillen joined #git
14:09 rahtgaz joined #git
14:10 gargola joined #git
14:11 kbs` joined #git
14:11 GodGinrai joined #git
14:13 al-damiri joined #git
14:13 sin3t joined #git
14:15 Rish joined #git
14:15 codeman joined #git
14:16 codeman_ joined #git
14:16 Darren_ joined #git
14:18 subhojit777 joined #git
14:20 mohabaks joined #git
14:21 kaldoran joined #git
14:23 sin3t joined #git
14:25 MattMaker joined #git
14:25 Enyo1 joined #git
14:25 claudiop joined #git
14:26 DevAntoine hi
14:26 fuchstronaut joined #git
14:27 DevAntoine I've did a stash pop resulting in lot of conflict. If I understand the doc correctly if I do "git reset --hard HEAD" the stash pop will be reverted but I'll keep all the files in the stash?
14:28 cdg_ joined #git
14:28 csd_ joined #git
14:29 jorj joined #git
14:29 quenode joined #git
14:30 moritz DevAntoine: did you have uncommitted changes before doing the 'git stash pop'?
14:31 DevAntoine moritz: all the files in the stash
14:31 stamina joined #git
14:31 star_pro_ joined #git
14:31 moritz DevAntoine: was that a "no"?
14:31 leeN joined #git
14:31 DevAntoine moritz: except the unstashed files, no
14:32 danslo “Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call git stash drop manually afterwards.”. - So, yes, you will keep the changes in your stash. But like moritz said, a reset will also reset all non-committed stuff that wasn’t stashed. Just so you’re aware.
14:32 ResidentBiscuit joined #git
14:33 sin3t joined #git
14:33 moritz DevAntoine: I'm still not sure what your answer to a simple yes/no question is :/
14:33 Ardethian\work joined #git
14:34 moritz anyway, I think danslo answered sufficiently
14:34 DevAntoine ok, then I think I can reset to head
14:35 ahmedelgabri joined #git
14:35 interne7y joined #git
14:35 DevAntoine When you ask me about uncomittted changes I'm not sure if I should include stashed files in it. Because what I have in the stash is not committed
14:37 daniel_rose joined #git
14:38 dlaboratory joined #git
14:39 subscope joined #git
14:40 ripero joined #git
14:40 l4v2 joined #git
14:42 ripero while fixing conflicts in a merge, I have rm'd a file I had been working on; what is the best way to recover the partially merged file with conflicts?
14:43 sin3t joined #git
14:44 DevAntoine thanks btw moritz and danslo
14:44 cyphase joined #git
14:45 shinnya joined #git
14:45 star_prone joined #git
14:45 Gitzilla joined #git
14:45 danslo joined #git
14:46 moritz DevAntoine: there are no "stashed files"
14:47 zmachine joined #git
14:47 moritz DevAntoine: at any point in time, either you have changes to files in the working directory, or you don't
14:48 moritz ripero: there's a git checkout option for that
14:48 moritz ripero: --merge if I remember correctly
14:49 eivarv joined #git
14:50 HappyLoa- joined #git
14:51 fuchstronaut joined #git
14:51 ahmedelgabri joined #git
14:51 NightStrike Somehow I screwed up a branch on github such that it has two duplicate sets of the same 5 commits
14:51 NightStrike how do I fix that?
14:53 sin3t joined #git
14:54 thiago joined #git
14:55 mikecmpb_ joined #git
14:56 madewokherd joined #git
14:58 fmcgeough joined #git
14:59 Derperperd joined #git
15:00 ripero moritz: thank you, that's the option I was looking for; in the conflict regions it changes the branch names to "ours" and "theirs", but the rest is as expected
15:00 guardian joined #git
15:00 fate_ joined #git
15:01 MattMaker joined #git
15:02 stephanie joined #git
15:02 abyx joined #git
15:03 sin3t joined #git
15:05 nilg joined #git
15:05 romerocesar joined #git
15:06 Lvjasha joined #git
15:07 chigang_ joined #git
15:09 Flowinho joined #git
15:10 tinajohnson___ joined #git
15:11 mikecmpbll joined #git
15:12 rahtgaz joined #git
15:12 playfullyExist joined #git
15:12 choki joined #git
15:12 Lvjasha joined #git
15:13 cdown joined #git
15:13 sin3t joined #git
15:13 zivester joined #git
15:13 dmto joined #git
15:14 nettoweb joined #git
15:14 grill joined #git
15:14 spriz joined #git
15:14 kedare joined #git
15:14 IWishIKnew joined #git
15:15 dufus joined #git
15:15 kedare joined #git
15:15 Lvjasha joined #git
15:16 fate_ joined #git
15:16 vassagus joined #git
15:18 faux___ joined #git
15:18 Rodya__ joined #git
15:18 HappyLoa- joined #git
15:18 tyreld joined #git
15:19 fractalizator joined #git
15:19 ripero
15:20 _ikke_
15:20 qsx
15:21 kpease joined #git
15:22 cdg joined #git
15:23 fractalizator joined #git
15:23 cdg joined #git
15:23 harish_ joined #git
15:28 ams__ joined #git
15:29 burtons joined #git
15:29 synthmeat joined #git
15:29 Derperperd joined #git
15:30 aard_ joined #git
15:30 osse c-c-c-c-combo breaker!!!!
15:31 cdg_ joined #git
15:31 osse was kicked by qsuscs: insolent little …
15:31 MattMaker joined #git
15:32 sin3t joined #git
15:33 burtons joined #git
15:34 fate_ joined #git
15:34 a_thakur joined #git
15:35 daniel_rose joined #git
15:35 Rodya_ joined #git
15:37 dufus left #git
15:37 osse joined #git
15:39 zack_s_1 joined #git
15:39 zack_s_1 left #git
15:40 fractalizator joined #git
15:40 watabou joined #git
15:41 a_thakur joined #git
15:41 fractalizator_ joined #git
15:42 _ikke_ qsx: Do you have to change your nick to become op?
15:42 sin3t joined #git
15:45 MattMaker joined #git
15:46 a_thakur joined #git
15:46 GavinMagnus joined #git
15:46 Guest18642 left #git
15:47 govg joined #git
15:48 hahuang61 joined #git
15:49 fractalizator_ joined #git
15:52 sin3t joined #git
15:52 clemf joined #git
15:53 fractalizator_ joined #git
15:55 Bunk joined #git
15:56 Bunk I had an error updating zsh: can not execute "pull" with "rebase". Does anybody know what that means ?
15:56 timvishe` left #git
15:57 vktec Bunk: Updating zsh?
15:57 fuchstronaut joined #git
15:57 timvisher joined #git
15:57 timvisher what's the right way to check whether a set of files is dirty?
15:58 Bunk Yes, when i start zsh, i get the error update msg. the colleagues from the zsh channel have sent me here
15:58 vktec timvisher: What do you mean by "dirty"?
15:58 vktec Bunk: Do you use oh-my-zsh?
15:58 vktec timvisher: Do you mean "changed"?
15:59 Bunk vktec: Correct oh-my-zsh
15:59 timvisher vktec: yes. preferably whether or not git currently knows about them should be irrelevant, but that's just a +1
16:00 fractalizator_ left #git
16:00 timvisher no, forget i said anything about whether or not git currently knows about them. that just confuses things
16:00 vktec timvisher: Do you want to know about added and removed files too?
16:00 EgS joined #git
16:00 le_melomane joined #git
16:00 timvisher in this instance i have a file `foo` and `bar`. i want to test whether or not running a command changes them at all
16:00 timvisher they are both added to git
16:01 vktec What about git diff?
16:01 timvisher so my test was going to be, run the command, and see if they were changed by using `git x`
16:01 vktec Or git status
16:01 _ikke_ git diff --quiet <file>
16:01 timvisher i didn't want to bother trying to parse git status
16:01 timvisher git diff is a good candidate i think
16:02 vktec Yes, _ikke_'s solution is probably the best one
16:02 osse it's the best there is
16:02 timvisher sounds perfect then :)
16:02 timvisher `git diff --quiet -- foo bar`
16:02 fractalizator joined #git
16:02 sin3t joined #git
16:02 daniel_rose joined #git
16:03 Guest98228 left #git
16:03 LeBlaaanc joined #git
16:03 alsaher joined #git
16:04 osse timvisher: just make sure to interpret it right: it succeeds when there aren't any changes
16:05 osse if git diff --quiet; then echo there are no changes bruh; fi
16:05 timvisher osse: yup
16:06 synthroid joined #git
16:07 Guest10414 joined #git
16:07 Guest10414 left #git
16:08 thiago joined #git
16:08 thiago joined #git
16:08 fractalizator_ joined #git
16:09 MattMaker joined #git
16:09 synthroi_ joined #git
16:11 EvilPeng1 joined #git
16:12 hahuang61 joined #git
16:12 sin3t joined #git
16:13 zacts joined #git
16:14 LeBlaaanc joined #git
16:15 fractalizator_ left #git
16:17 Flowinho joined #git
16:17 DJ_Spies joined #git
16:20 whyme joined #git
16:20 whyme HELLO
16:20 gitinfo whyme: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
16:20 whyme I have a question
16:20 whyme about projects
16:21 whyme HOW come everytime I create something, Usually no one checks out my project.
16:21 whyme Im mean whats the use of developin
16:21 whyme if no one sees your project
16:21 whyme ?
16:22 canton7 whyme, if you have something that's very popular, maybe someone will do some work on it
16:22 cdg joined #git
16:22 sin3t joined #git
16:22 canton7 whyme, but in general, people aren't going to find some random project on github (assuming you're talking about github)
16:22 whyme well see its a big project, but no one can find it
16:22 Dougie187 whyme: A lot of people start projects because of a personal need / want.
16:23 Dougie187 whyme: The purpose of them putting it up there is to allow other people to use it, not to expect them to.
16:23 canton7 developing something with the intention that other people will use it is usually a waste of time :P
16:23 whyme Well I been working on a project for years. Ive worked on 13.
16:23 whyme nothin
16:23 cdg joined #git
16:23 whyme not 1 person
16:23 whyme !!!
16:23 canton7 sure, but is it useful to other people? have you told those people who might find it useful about it?
16:23 whyme Ya I have and they have installed it
16:24 a_thakur joined #git
16:24 Dougie187 Then, people have cloned it.
16:24 Dougie187 or downloaded it
16:24 Rodya_ joined #git
16:24 canton7 are they developers? are there things they want to fix, or improvements they want to make?
16:24 whyme but how am i supposed to tell people about it if Im just goin to get banned/kicked on the channels.
16:24 whyme Whats the use?
16:24 canton7 there's a huge difference between people who use your project, and people who will contribute back
16:24 canton7 for my projects, I get about one contributer per 5000 users
16:24 whyme ya
16:24 Dougie187 Because IRC is not the right place to be publicizing your projects.
16:24 canton7 it depends, of course, on whether your users are developers
16:24 MattMaker joined #git
16:25 whyme because see, if i were to advertise here i would 99.9% be banned
16:25 whyme or kicked
16:25 Dougie187 Of course, because it's the wrong place.
16:25 whyme whats better, github or bitbukkit
16:25 whyme ?
16:25 canton7 yes, and if you went into the street and shouted about it, people would ignore you
16:25 Bunk so what is this zsh error about ?
16:25 canton7 they both have their own merits. github is arguably more popular, but bitbucket has free private repos
16:25 whyme canton7: yes lol
16:26 canton7 sometimes there are lists of useful projects for a language. Sometimes languages have their own package managers you can put libraries onto. If you've written something for a particular community, they might have a message board or mailing list
16:26 canton7 if you just write something random, chances are noone's going to care
16:26 canton7 because everyone's writing random stuff
16:26 whyme But it is not random
16:26 whyme THats the THING
16:26 canton7 what is it?
16:26 canton7 also, how good are your docs? how readable is the code?
16:26 Dougie187 You had to ask...
16:27 whyme if i say, probably banned
16:27 whyme or kick
16:27 canton7 I won't kick you for pasting a link to it because I asked you to
16:27 whyme You shure
16:27 whyme sure
16:27 whyme last time i did it
16:27 Dougie187 He'll kick you if you ask again. :P
16:27 whyme I got banned/kick
16:27 whyme ok
16:27 whyme let me get the link
16:27 whyme brb
16:28 canton7 yeah, if you go randomly advertising people won't like it, but if someone actually asks you... PM me if you're concerned
16:28 whyme https://github.com/alwaysontop617/easySITE
16:28 whyme Here is the link
16:29 dcg joined #git
16:29 le_melomane joined #git
16:29 canton7 well, first off, I've read the README and I've no idea what it is
16:29 Dougie187 Same here
16:30 Dougie187 And you have no other documentation
16:30 daniel_rose joined #git
16:30 canton7 so you might want to improve your README
16:30 nitric joined #git
16:30 Dougie187 Something to do with wordpress, but it seems like it's specific to wordpress.
16:30 whyme no
16:30 whyme here
16:30 whyme is more info
16:30 a_thakur_ joined #git
16:31 whyme it can interate with wordpress, but it works best with pure html code
16:31 Dougie187 canton7: you should hold a "How to advertise your project" seminar. :P
16:31 whyme Ya
16:31 whyme great idea
16:31 whyme :D
16:31 canton7 heh, I'm hardly one to talk. I have read some good blog posts in the past
16:32 seishun joined #git
16:32 sin3t joined #git
16:32 a_thakur_ joined #git
16:33 whyme So
16:33 whyme ANY IDEAS
16:33 whyme ?
16:33 canton7 yep, we told you
16:33 Dougie187 We gave you some.
16:33 canton7 no need to shout
16:33 Dougie187 I still don't have a clue what your project is or what it does.
16:33 Dougie187 So, you should work on your readme to make it more clear
16:33 whyme ok
16:33 Dougie187 Improve your documentation some
16:34 canton7 there's a repository of wordpress plugins isn't there? if your thing is a wordpress plugin, list it there
16:34 whyme Its not
16:34 MattMaker joined #git
16:35 Dougie187 well, it's definitely related to webpages.
16:35 Dougie187 So, you probably should go find a forum or something where people discuss this kind of stuff
16:35 Dougie187 And try to see if your project would meet someones need, and then tell them about it.
16:35 canton7 the code's also pretty hard to read. I wouldn't want to touch it if I was a potential contributer
16:35 beyertech joined #git
16:36 interne7y joined #git
16:37 Flowinho joined #git
16:37 canton7 you're using CI (I think?), but there's no separation between views and controllers (there's one controller, and all of the controller logic is in the views). The indentation is all over the place. You're using things like $_POST and $_SESSION instead of CI's wrappers. I can't follow the intention in a lot of places.
16:37 canton7 it looks like a beginner's learning project. That's fine as a learning experience, but it's unlikely that other people will build on it
16:38 canton7 you should absolutely be writing that stuff, as a means to practice and improve. You shouldn't intend for other people to use it, because they almost certainly won't
16:38 ack_inc joined #git
16:38 whyme Here is a better Readme
16:38 whyme https://github.com/alwaysontop61​7/easySITE/blob/master/README.md
16:38 Dougie187 But, it's perfectly fine to host that stuff on github still.
16:38 whyme ok
16:39 Lvjasha joined #git
16:39 canton7 whyme, I still don't know what it does, or why I would want to use it
16:39 whyme ok so your saying i should improve the style of my code
16:39 whyme READ THE readme file
16:39 canton7 also the commit messages are "finalfix", "trackle", etc. They give no information
16:39 Dougie187 Or "p" and "f
16:39 Dougie187 "
16:40 canton7 whyme, I did. "Lets make the IOT a better place.". Still no idea what it actually *does*
16:40 canton7 you need to pretend you know nothing about it, then try and read the README as if you were looking at the project for the first time
16:40 whyme you did not see this
16:40 whyme Our software can integrate with almost every platform, even if you just have a plain html website. This project will improve your site by adding many features. The best part about our script is we will generate an htaccess best for your site to make your site very fast. We also have a maintainance mode page, and a full blown plugin system allowing
16:40 whyme you to expand your features.
16:40 whyme If you have a wordpress site you can also use easySITE, we are currently releasing support for joomla next. Our system will not act like a pluin for wordpress, it completely rewrites the index.php of that wordpress site. easySITE can be imported into any website, its fast and light weight.
16:40 Dougie187 I read that.
16:40 whyme Thats what it does
16:41 preaction it integrates with a platform, it adds "many" features, but what are those features?
16:41 canton7 whyme, yeah, and it explains *nothing* about those. How does it improve my site? What features does it add? How does it make it faster? Will it do something stupid and screw up my system?
16:41 SirFunk How does one deal with a "BUG: There are unmerged index entries:" on a merge?
16:41 canton7 SirFunk, report it to the mailing list? Looks like a bug :)
16:41 canton7 !list
16:41 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
16:41 canton7 you'll need a way to reproduce it
16:42 canton7 or a transcript of what happened and a snapshot of the repo that other people can use to see what's happened
16:42 sin3t joined #git
16:42 SirFunk canton7: it's a fairly large private repo. And not on a branch I was working on. I don't know who did what with what versions of git
16:42 Dougie187 whyme: Your best bet is to read some good readmes.
16:42 Dougie187 And try to duplicate those.
16:42 canton7 gather as much information as you can, then. Maybe search the archives first, see if anyone else reported it
16:43 whyme Thank You guys
16:43 whyme ill edit
16:43 whyme it more
16:43 whyme add more information
16:43 whyme THX
16:43 SirFunk Is there anything I can do in the meantime to continue working?
16:43 SirFunk The files that It is complaining about are not important. Can I skip them or something?
16:43 canton7 not sure what state your repository is in. It's probably OK, and if not a reset should get rid of whatever state is hanging around in your index
16:43 canton7 without knowing what happened, I can't guess at what's going on
16:44 SirFunk it's happening when merging master into a branch
16:44 Sdas_it joined #git
16:44 mikecmpbll joined #git
16:45 qsx _ikke_: no.  i was a bit dumb.
16:46 madewokherd joined #git
16:46 a_thakur joined #git
16:47 Dougie187 SirFunk: are these public repos?
16:47 SirFunk nope
16:47 SirFunk sadly
16:47 Dougie187 :/
16:47 _ikke_ SirFunk: What action did you do to cause this error?
16:48 drewo joined #git
16:48 daniel_rose joined #git
16:48 damjan left #git
16:49 MattMaker joined #git
16:49 a_thakur_ joined #git
16:49 SirFunk _ikke_: git checkout some branch; git merge mastere
16:49 SirFunk *master
16:49 _ikke_ Is that the only thing it outputs, or more information?
16:50 paul424 joined #git
16:50 burtons joined #git
16:51 GavinMagnus left #git
16:51 Flowinho joined #git
16:52 daynaskully joined #git
16:52 tabrez joined #git
16:52 SirFunk _ikke_: a few lines like these: BUG: 1 mogile-node/mogdata/dev1/0/000/000/0000000108.fid     BUG: 3 mogile-node/mogdata/dev1/0/000/000/0000000186.fid
16:52 veilig2000 joined #git
16:52 sin3t joined #git
16:52 SirFunk and fatal: Bug in merge-recursive.c
16:53 a_thakur joined #git
16:55 pwnz0r joined #git
16:56 cjohnson joined #git
16:56 ki0 joined #git
16:56 cjohnson I've got an issue with prod I'm solving. I merged a PR into master, then later reverted that merge, and recently deployed master to prod
16:56 ToBeCloud joined #git
16:57 cdg_ joined #git
16:57 cjohnson The issue is, github's compare feature says the branches are in sync
16:57 cjohnson Is this because I reverted? And the question is, if I want to fully merge the branch, will rebasing be an issue?
16:57 cjohnson or should I do a merge
16:57 Dougie187 cjohnson: Yeah, in the past what I've done after that setup, is rebase it onto the same base, just to change the hashes
16:58 Dougie187 and then the merge works fine.
16:58 cjohnson oh merge says nothing to merge
16:58 _ikke_ SirFunk: Right
16:58 Dougie187 Yeah, because the branches are in sync
16:58 cjohnson Dougie187: so I should rebase master onto branch?
16:58 cjohnson or other way around
16:58 drewo joined #git
16:58 _ikke_ SirFunk: Can you reproduce it?
16:58 durham joined #git
16:58 Dougie187 The other way around, but you rebase it onto the same base it has currently.
16:58 Dougie187 So, something like:
16:58 cdg_ joined #git
16:58 fuchstronaut joined #git
16:58 MattMaker joined #git
16:58 Dougie187 `git checkout branch; git rebase -i ${git merge-base master branch}`
16:59 cjohnson interesting
16:59 Dougie187 I can't remember if you have to re-order the commits to get new hashes, or if you just get them as a side effect
17:00 osse Dougie187: just about anything will produce new hashes
17:00 Dougie187 osse: Does just the act of that rebase (with no actions) cause new hashes?
17:00 Dougie187 Or do you need at least one action?
17:00 grill left #git
17:00 osse Dougie187: git is smart enough to figure out that it doesn't have to do anything
17:01 osse => no new hashes
17:01 Dougie187 I thought the act of that rebase would update the commiter info in the first commit, and cause all of them to have a new hash.
17:01 Dougie187 Oh ok
17:01 Dougie187 So, you need at least one action then
17:01 Dougie187 You could just swap the first two commits, and that would do it.
17:01 drewo joined #git
17:01 osse yep, or edit the message of the first one
17:01 Dougie187 cjohnson: Is there an easier way to re-merge a branch, after a revert?
17:01 Dougie187 Yeah, that's true. that's a good idea (better than mine)
17:02 choki joined #git
17:02 Dougie187 Since swapping them isn't guaranteed to apply cleanly.
17:02 Dougie187 err, osse: Is there an easier way to re-merge a branch, after a revert?
17:02 sin3t joined #git
17:02 osse undo the revert and merge it again I think
17:04 kadoban joined #git
17:04 osse no, that's wrong
17:04 lugzer joined #git
17:04 durham joined #git
17:05 osse !revert_merge
17:05 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Docu​mentation/howto/revert-a-faulty-merge.txt
17:07 cjohnson yeah I figured haha. I just hit the "revert" button from the github PR interface
17:07 cjohnson I knew I shouldn't have
17:07 cjohnson Ok so when I run the git rebase -i command with the merge-base commit passed, all I see is "noop"
17:07 cjohnson no commits listed
17:07 osse then that commit is HEAD
17:08 Darren_ joined #git
17:08 drewo joined #git
17:08 SirFunk _ikke_: reproduce? It happens every time I try to merge master to that branch. I have no idea how to make another branch have that problem though
17:09 LeBlaaanc joined #git
17:10 GlenK left #git
17:11 spudowiar joined #git
17:11 mikecmpbll joined #git
17:11 SteffanW2 joined #git
17:12 sin3t joined #git
17:13 _ikke_ Alright
17:13 MattMaker joined #git
17:15 _ikke_ SirFunk: Looking a bit through the code if I can find what's going on
17:16 SirFunk thanks
17:16 SirFunk If there is some way I can have it ignore those files that would be cool, They are generated files and I can regenrate them
17:17 dances-with-cats joined #git
17:17 TomyLobo joined #git
17:17 _ikke_ I don't think so
17:17 BSaboia joined #git
17:17 _ikke_ What does git status say afterwards?
17:17 vassagus joined #git
17:17 bjpenn joined #git
17:18 SirFunk no changes
17:19 _ikke_ So nothing is merged at all?
17:21 ash_workz joined #git
17:22 sin3t joined #git
17:22 MattMaker joined #git
17:22 dances-with-cats joined #git
17:23 SirFunk _ikke_: it doesn't merege anything, no
17:24 Vinnie_win joined #git
17:26 InfoTest joined #git
17:27 ki0 joined #git
17:29 dreiss joined #git
17:29 eight58 joined #git
17:29 rymurphy joined #git
17:30 rymurphy Hello, is there a way to clone a repo at a specific commit?
17:30 rymurphy Or, could I checkout a commit without downloading the full history?
17:31 GodGinrai rymurphy: you just want the files?  Is this a project on github?
17:31 rymurphy I just want the files, and it's for a local repo
17:32 mohabaks joined #git
17:32 GodGinrai rymurphy: a local repo?  Then don't you already have the files?
17:32 durham joined #git
17:33 rymurphy It's for a program call
17:34 rymurphy command --from-repo /path/to/repo --commit foo12bar takes the repo at the commit, tars it in a temp directory, and sends it to a server
17:35 cjohnson osse, Dougie187: I had to revert the revert
17:35 GodGinrai rymurphy: I think you want `git archive`
17:35 rymurphy I'm trying to move the repo to a temp directory for tar-ing with clone
17:35 cjohnson I couldn't get a rebase to play nicely
17:35 cjohnson fortunately I only had to to resolve 2 small conflicts from the revert
17:35 rymurphy GodGinrai: :P That's what we were doing, but someone had issues with submodules
17:36 Dougie187 cjohnson: Too bad. :P I've had the rebase work in the past though, so maybe next time try it again. :P
17:36 cjohnson yeah I'm quite positive this was my fault
17:36 GodGinrai rymurphy: unfortunately, that's the only way through git to get "just the files".  I'd suggest using `cp` if you need something else.
17:36 cjohnson I'm moving from a one-man dev operation to a team so my old workflow I think was causing headaches
17:37 cjohnson rymurphy: github offers an option to download a zip of a branch
17:37 cjohnson I bet you could specify a commit id
17:37 cjohnson if you're on github
17:37 MattMaker joined #git
17:37 GodGinrai cjohnson: he said it was local.  I already asked that
17:37 cjohnson oh missed it, sorry. that totally works though
17:37 rymurphy GodGinrai: Could I clone the repo with a depth of 1, and checkout to the commit, or would I need the full history for that?
17:37 Dougie187 cjohnson: Though, I guess another way to do it is something like `git revert <revert> --no-commit; git merge <branch>` or something, to get all the changes back in.
17:37 hellyeah joined #git
17:37 rymurphy GodGinrai: Or maybe create an empty one, and fetch the commit?
17:38 cjohnson Dougie187: interesting. I'll have to tuck that away for the next fire
17:38 cjohnson lol
17:38 Dougie187 Anyway, that situation is annoying. :P
17:38 cjohnson yeah
17:38 GodGinrai rymurphy: you are overcomplicating it.  just use `cp`
17:39 rymurphy GodGinrai: I can't assume that the user has the commit checked out
17:40 GodGinrai rymurphy: `git checkout <commit>; cp . /tmp/gitfolder; find . -name '.git' -exec rm {} \;`
17:41 byteflame joined #git
17:41 GodGinrai ^ need to cd to /tmp/gitfolder before running that find
17:41 GodGinrai or use /tmp/gitfolder instead of "." in find
17:42 sin3t joined #git
17:42 GodGinrai also, the rm would be rm -r, I guess
17:42 lugzer joined #git
17:46 eivarv joined #git
17:48 jaequery joined #git
17:48 cjohnson or use rsync with an exclude
17:49 MattMaker joined #git
17:50 cdg joined #git
17:50 SourTrout joined #git
17:50 hellyeah knowing git seems good on my cv?
17:51 nettoweb joined #git
17:51 fractalizator joined #git
17:51 cdg joined #git
17:51 whyme joined #git
17:51 GodGinrai cjohnson: that works, too.  But when copying on the same system, I find rsync to be a little unneeded
17:52 sin3t joined #git
17:52 SirFunk _ikke_: any idea?
17:53 SourTrou_ joined #git
17:53 GodGinrai hellyeah: It's worth it to put on there, IMO.
17:56 cjohnson GodGinrai: I like that it preserves permissions and such, even on the same system it's nice
17:56 cjohnson but yeah not strictly required
17:56 alansaul joined #git
17:57 alansaul Hey everyone, I have a bit of a odd question. I have a fork of a repository, and I *think* I made some edits. Someone else has made a fork of the same repository, I basically want to use theres, but want to make sure I am not throwing away any edits I made without knowing what they are
17:57 alansaul How can I see what edits I have made to a fork since I forked?
17:57 Lvjasha joined #git
17:57 alansaul I mean commits sorry not 'edits' obviously
17:57 b1tchcakes joined #git
17:58 alansaul I guess I could diff upstream, but ideally I only want to diff with the upstream from the commit I forked it at. Is there a way of getting the hash of the commit when the fork was made easily?
17:59 fuchstronaut joined #git
17:59 kadoban alansaul: 'git log yourbranch ^origin/whateverbranch' ?
17:59 fractalizator alansaul: if you didn't merge your stuff:
18:00 alansaul I don't think I merged my stuff, maybe sent a pull request
18:00 fractalizator alansaul: git log origin/master..yourbranch
18:00 hahuang61 joined #git
18:01 whyme joined #git
18:01 fractalizator and if your want to find the last common commit of two unmerged branches: git merge-base branch1 branch2
18:01 alansaul git log yourbranch ^origin/whateverbranch doesn't give me any commits
18:01 UncleCJ joined #git
18:01 alansaul should I replace origin with my upstream?
18:01 rubyonrailed joined #git
18:02 sin3t joined #git
18:02 pignaniel joined #git
18:02 fractalizator alansaul: of course you need to use your branches and upstreams names
18:02 pignaniel left #git
18:03 fractalizator and also 'git log AAA..BBB' =  'git log ^AAA BBB' = 'git log BBB ^AAA', just different syntax
18:04 fractalizator that means "show me commits that are reachable from BBB, but not reachable from AAA"
18:04 alansaul Hmm I think I am a bit confused. I am trying: git log master ^upstream/master
18:04 alansaul Which I thought should find the commits between my local master branch, and the upstreams master branch?
18:05 alansaul But I get a fatal: bad revision ^upstream/master
18:06 fractalizator alansaul: what does git branch -a say?
18:06 medeirosthiiago joined #git
18:07 alansaul Sorry just to be clear, I was running: git log devel ^upstream/devel before
18:07 alansaul and git branch -a gives me:
18:07 alansaul * devel
18:07 alansaul master
18:07 alansaul remotes/origin/HEAD -> origin/master
18:07 whyme joined #git
18:07 alansaul remotes/origin/devel
18:07 alansaul And then some other branches I don't care about
18:08 YourTheBombNow23 joined #git
18:08 fractalizator and git remote?
18:08 kadoban alansaul: Where did the "upstream" name come from?
18:08 alansaul I have a feeling it has something to do with the HEAd?
18:08 alansaul I just added the remote called upstream, with git remote add upstream "blah".git
18:08 alansaul where blah is the url
18:08 alansaul git remote, lists both origin and upstream
18:09 kadoban alansaul: You need to fetch then. 'git fetch --all'
18:09 fractalizator alansaul: you need git fetch upstream then
18:09 nettoweb joined #git
18:09 alansaul Okay, thats like a pull without merging right?
18:09 perlpilot joined #git
18:09 fractalizator alansaul: and then you'll get your "upstream/stuff" branches
18:09 solrize left #git
18:09 mischat joined #git
18:09 fractalizator alansaul: right
18:10 lifeforms joined #git
18:10 alansaul Okay, now git log devel..upstream/devel lists lots of commits, but they are commits made on the upstream
18:10 alansaul I want it the other way, commits I have made, that aren't on upstream.
18:10 UncleCJ joined #git
18:10 alansaul Is that possible?
18:10 fractalizator alansaul: didn't you want upstream/master?
18:10 fractalizator oops, nevermind
18:10 alansaul No sorry, I made that confusing in my first message, I actually want to diff devel and upstream/devel
18:11 fractalizator alansaul: do git log upstream/devel..devel
18:11 alansaul And get the commits I have made, but that aren't upstream
18:11 alansaul Excellent
18:11 durham joined #git
18:11 alansaul Thats exactly what I want, thanks, I was being dumb not thinking to change it around
18:11 durham joined #git
18:12 sin3t joined #git
18:13 whyme joined #git
18:13 veilig2000 joined #git
18:14 rivarun joined #git
18:14 settermjd joined #git
18:15 _ikke_ SirFunk: Your best option is the !mailing_list
18:15 gitinfo SirFunk: The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
18:16 danimal2 joined #git
18:17 _Patrick_ joined #git
18:17 lifeforms hey all, I want to purge a big file from a dev branch (for instance using BFG), I'm fine with having devs do a new clone on their workstations, but will this also hurt people who are tracking the master branch (which does not have the file)?
18:17 alansaul Another stupid question (that I can google if you tell me I am being stupid). When I merge, its often the case that the merge becomes one big commit, that I am then *blamed* for, is there any way around this?
18:17 daniel_rose joined #git
18:17 _ikke_ alansaul: No, this should only affect the dev branch
18:17 lifeforms _ikke_: <3
18:17 alansaul Seems weird, that sometimes when I merge something in, if there is any edits, *everything* gets blamed on me.
18:17 _ikke_ lifeforms: sorry I meant you of course :P
18:18 lifeforms ;) I detected it anyway. thanks, this is my big worry (well except destroying the universe)
18:19 settermjd joined #git
18:20 UncleCJ joined #git
18:20 nitric alansaul: that's not how git merge works (unless you're auto-squashing or doing something weird)
18:20 alansaul It's happening when I pull
18:21 osse pull = fetch + merge
18:21 osse sounds like you're talking about the merge commit
18:21 osse and yes, those are fairly large when you diff it
18:21 MattMaker joined #git
18:21 alansaul Like if someone has made lots of commits, and I pull the commits, a window opens with something along the lines of "Merge remote-tracking branch 'upstream/devel' into devel", if I just save and close that commit message, I get blamed for everything I've just pulled in
18:21 alansaul Even though I never touched them.
18:22 osse but if you're blamed (in real life in the human sense) because of that commit then the accusers are morons
18:22 sin3t joined #git
18:22 rivarun joined #git
18:22 danimal2 hi guys, confused on a few things.when i fork a project on git, i create my own repo.if i want to be able to keep the master in sync with the original repo, do i have to create my own branch? id like to be able to do pull requests, work on my own code and keep it up to date with the original repo.
18:22 alansaul Yes a merge commit is probably the correct terminology
18:23 danimal2 sorry meant github not git
18:23 osse alansaul: http://sprunge.us/CSTT
18:23 perlpilot danimal2: do you mean "fork on github"?  If so, they have lots of good documentation on this very topic
18:23 whyme joined #git
18:23 danimal2 perlpilot yes sorry
18:23 osse alansaul: the M's will have your name on them, and that's ok
18:24 whyme hu
18:24 alansaul but if I did a git diff M^! then it has everything that happened
18:24 whyme so
18:24 alansaul all through E F G H unless I'm mistaken?
18:24 whyme So i improved my code
18:24 whyme Is there a reason that no one is downloading
18:24 whyme it
18:26 UncleCJ joined #git
18:26 osse alansaul: yes
18:26 FilipNortic joined #git
18:26 daniel_rose joined #git
18:27 alansaul that seems odd, so that if people did a git blame, my name will be next to anything happened in E F G and H?
18:27 rymurphy left #git
18:27 alansaul I could be wrong :)
18:27 osse have you tried? :) I think git blame skips merges
18:27 ki0 joined #git
18:27 cjohnson I believe it does. the actual commit that caused the change in the file is not the same as the merge that merged it into the branch
18:27 osse looking at the diff of a merge usually isn't very interesting, because of what you see. it'
18:27 osse it's huge
18:28 whyme joined #git
18:29 SwiftMatt joined #git
18:30 cjohnson https://i.imgur.com/pHOMceO.png
18:30 Spacew00t joined #git
18:30 cjohnson the commit id on line 3 is from the commit that changed the file from dev, not from my merge commit
18:30 LionsMane joined #git
18:31 osse alansaul: it maketh sense: git blame shows how a line came to be in a file. If a particular line is present in one of the ancestors of the merge commit then it did not originate from the merge.
18:31 danimal2 so my question is after i created my own fork and move files into a folder called htdocs will that cause my fork to not stay in sync with the original?
18:31 cjohnson Oh maybe git merge actually did a rebase though. that might not be a valid test
18:31 cjohnson I don't see a merge commit
18:32 sin3t joined #git
18:32 osse alansaul: if, however, the line is not present in either of the ancestors then it will be attributed to the merge commit itself, and rightly so
18:32 whyme joined #git
18:32 osse I mean parents, not ancestors.
18:32 moritz danimal2: git repos don't magically stay in sync. You have to pull changes in
18:32 lifeforms _ikke_: it seems to have worked, cheers :)
18:32 moritz danimal2: pull = fetch + merge, usually merge across renamed files works pretty well in git
18:33 lifeforms I feel I have leveled up in git
18:33 YourTheB_ joined #git
18:33 whyme https://github.com/devmachine321/easySITE <-- Can someone look at my git repo
18:33 Dyonisos joined #git
18:33 cjohnson danimal2: I have done what you are attempting to do and I can say that it was definitely a lot more hassle that way
18:34 _ikke_ whyme: sure, look at what?
18:34 cjohnson especially if you ever want to merge back up
18:34 whyme my readme is it good
18:34 cjohnson whyme: only you can tell. does it adequately describe the system and repo to a new user?
18:34 danimal2 cjohnson thats what i was thinking...so dont commit a change like that..will cause headaches it seems
18:35 whyme hmm
18:35 whyme brb
18:35 kfunk joined #git
18:35 jimi_ joined #git
18:35 MattMaker joined #git
18:35 cjohnson depends also on who the readme is for. is it for a dev or for a user?
18:36 danimal2 moritz, thanks for that..understand
18:36 _ikke_ whyme: "This has nothing to do with wordpress"
18:36 _ikke_ whyme: Not the best way to start describing your product
18:36 whyme well
18:36 whyme hmm
18:37 whyme I need someone who is great at writin Readme files
18:37 lugzer joined #git
18:37 interne7y joined #git
18:37 _ikke_ Not me
18:37 whyme how do i get op
18:37 whyme I want op
18:38 lifeforms some things never change
18:38 whyme left #git
18:38 osse like war
18:38 Seveas war is peace
18:38 APic True.
18:38 Seveas freedom is slavery
18:38 APic
18:38 nitric france is bacon
18:38 osse ignorance is strength
18:38 Seveas ignorance is strength
18:38 Seveas heh
18:38 _ikke_ nitric: :D
18:39 Seveas git is version control
18:39 osse rebase -i
18:40 APic Francis?
18:40 YourTheBombNow23 joined #git
18:40 _ikke_ APic: https://www.reddit.com/r/AskReddit/c​omments/dxosj/what_word_or_phrase_di​d_you_totally_misunderstand/c13pbyc
18:41 * APic opens
18:41 APic Yay, rReddit.
18:41 APic o/
18:41 APic -r
18:41 sin3t joined #git
18:41 Rodya_ joined #git
18:42 up_the_irons joined #git
18:42 gmh joined #git
18:42 APic Uh oh.
18:43 APic Seen enough Reddit for today, i guess.  B-)
18:43 Seveas reddit, bludat, greenwat..
18:44 rubyonrailed joined #git
18:45 mikecmpbll joined #git
18:47 YourTheBombNow23 joined #git
18:47 unreal joined #git
18:48 abyx joined #git
18:48 Manuel15 joined #git
18:48 Manuel15 joined #git
18:49 YourTheBombNow23 joined #git
18:51 qpdb joined #git
18:51 govg joined #git
18:51 sin3t joined #git
18:51 YourTheB_ joined #git
18:52 mmlb joined #git
18:52 heroux joined #git
18:52 NeXTSUN joined #git
18:52 nopea joined #git
18:53 alansaul joined #git
18:54 nopea I have a WordPress server that I have setup git with (just my theme child dir), and I was thinking that I might move my WordPress to a new server.  This could be done by simply zipping up the Wordpress dir.  But I am wondering, would the .git directory also get included in that (and if I am to unzip to a new server)
18:55 _ikke_ nopea: That should just work
18:55 MattMaker joined #git
18:55 nitin joined #git
18:56 nopea perfect - I thought it should (as it just needs to copy the .git dir)
18:56 moritz nopea: you can look into the .zip file and see if the .git dir is included
18:56 fahadash joined #git
18:57 nopea thanks guys - just wanted to make sure that it is not 'attached' any way to the server itself, and that it is just the files (again from the .git dir) that are needed.
18:57 _ikke_ yes, that's correct
19:01 sin3t joined #git
19:02 beyertech joined #git
19:03 nopea left #git
19:03 DolphinDreamm is there such thing as pulling --tags ?
19:04 i7c git fetch --tags
19:04 Balliad joined #git
19:04 fractalizator left #git
19:05 MattMaker joined #git
19:05 _ikke_ tags should be fetched automatically
19:06 j416 fetched but not updated if they already exists
19:06 DolphinDreamm but there is no --tags flag for pull i take
19:06 Sasazuka joined #git
19:06 _ikke_ j416: by design
19:06 j416 (just adding to your comment)
19:07 Gamecubic joined #git
19:08 felher_ left #git
19:09 felher joined #git
19:09 nettoweb joined #git
19:11 sin3t joined #git
19:12 danimal2 Created a branch called mywork, and in sourcetree i have that branch selected. when i commit a change it wont affect the master branch, just the mywork one, right?
19:12 j416 if that branch is checked out, yes.
19:12 j416 it will only affect that branch.
19:13 darkbit joined #git
19:13 danimal2 j416, yes that is the one checked out, ok thanks.. i need to keep master branch clean so it will pull updates from the original repo on github that i forked.
19:13 j416 sounds sane.
19:14 danimal2 awesome thanks!
19:14 johnmilton joined #git
19:14 j416 :)
19:15 daniel_rose joined #git
19:16 star_prone joined #git
19:17 EduardoMartins joined #git
19:18 Mannn joined #git
19:18 Manuel15 joined #git
19:18 Manuel15 joined #git
19:18 BrianJ joined #git
19:20 mymohsin joined #git
19:20 docnvk joined #git
19:21 robotroll joined #git
19:21 sin3t joined #git
19:23 nettoweb joined #git
19:24 MattMaker joined #git
19:25 mmlb joined #git
19:25 m0viefreak joined #git
19:26 LiohAu joined #git
19:27 sagerdearia joined #git
19:28 DolphinDreamm ha
19:28 docnvk joined #git
19:28 DolphinDreamm it seems that git pull --tags does work.. it fetches --tags and merges remote into the current branch
19:28 byteflame joined #git
19:29 burtons joined #git
19:31 lugzer joined #git
19:31 sin3t joined #git
19:31 burtons left #git
19:32 _sjs joined #git
19:32 johnmilton joined #git
19:34 ki0 joined #git
19:35 netcarver joined #git
19:35 treehug88 joined #git
19:37 fuchstronaut joined #git
19:39 jeffreylevesque joined #git
19:42 choki joined #git
19:42 dunpeal joined #git
19:42 eivarv joined #git
19:43 dunpeal Hi. We have a fairly large team and all our merges into master are done as feature branches merged via pull-requests (probably a common workflow?). How should we deal with the accumulation of merged, obsolete feature branches over time?
19:43 osse dunpeal: delete them
19:44 dunpeal osse: but isn't it up to every single developer to delete them?  since they all get pulled automatically...
19:44 osse dunpeal: anyone with push access can delete them
19:44 Ardethian\work joined #git
19:45 GodGinrai dunpeal: delete them once you confirm that the merged changes didn't negatively affect master
19:45 GodGinrai which you should be doing anytime you merge master
19:45 dunpeal right, but if you have N developers, and they all pull branch X, then once X gets merged, all N developers have to individually delete X from their local Git node...
19:46 GodGinrai well yea
19:46 GodGinrai that's to be expected
19:47 veilig2000 joined #git
19:47 GodGinrai I mean, you wouldn't want a file you downloaded to be deleted just because it doesn't exist online anymore, right?  Same idea.
19:47 GodGinrai If a dev wants to be rid of the branch they checked out, they must remove it themselves
19:48 SpeakerToMeat joined #git
19:49 ResidentBiscuit Don't think of it as a git node, think of it a git repo. Everybody has their own repo. It makes no sense for deletes to propogate to all the clones
19:50 nilg joined #git
19:50 paul424 joined #git
19:51 clemf joined #git
19:51 osse dunpeal: no. if it's deleted from the remote then they can fetch --prune
19:52 p4trix joined #git
19:54 IWishIKnew joined #git
19:56 MafiaInc joined #git
19:56 clemf joined #git
19:57 cdg joined #git
19:57 daniel_rose joined #git
19:59 clemf joined #git
20:01 sin3t joined #git
20:01 Electrometro joined #git
20:03 MattMaker joined #git
20:04 dunpeal osse: looks like --prune would only remove remote references to branches, but not local branches?
20:04 mar77i joined #git
20:04 osse dunpeal: I'm confused. If they "pull branch X" then they will merge the remote one
20:04 dunpeal i.e. if at any point I checked out branch-foo, `fetch --prune` won't remove it just because it's gone on the remote - I'd have to explicitly `brahcn -d` it
20:05 osse yes
20:06 dunpeal osse: I'm talking about two types of developers: 1) isn't involved in foo's development, so only pulls this branch incidentally, in which case `fetch --prune` will remove it
20:06 dunpeal 2) was involved in foo's development, in which case it seems `branch -d` is necessary
20:07 GodGinrai dunpeal: As I said before.  The server shouldn't be deleting local branches.  Your devs need to take responsibility for the branches they check out and delete their local copies
20:08 osse also: that one particular developer's local repo is a mess does not affect all the other developers
20:08 clemf joined #git
20:08 mablae joined #git
20:08 mischat joined #git
20:10 lugzer joined #git
20:11 dunpeal osse: as a perfectionist, I'd rather they all be very neat.
20:11 clemf joined #git
20:11 sin3t joined #git
20:12 osse dunpeal: unfortunately git lives and lets live, and you can't make it do stuff to other peoples own repos
20:12 osse the main goal should be to keep the main/central/official repo clean.
20:12 osse it's the only goal that's easily achievable
20:13 Faylite joined #git
20:14 nwkj86 joined #git
20:15 dances-with-cats dunpeal: as long as the devs aren’t pushing their local copy of the branch back to the origin, it shouldn’t be an issue if they have a collection of dead branches on their local repo
20:15 foist joined #git
20:15 rahtgaz joined #git
20:15 GodGinrai dunpeal: making the server do things to people's repos could have horrible problems. (example: someone deletes an unmerged branch from the server, now everyone who pulls loses that branch)
20:15 unbalancedparen joined #git
20:15 durham joined #git
20:15 trewe joined #git
20:16 shinnya joined #git
20:16 zacts joined #git
20:16 eivarv joined #git
20:17 dunpeal osse: yeah, I'm just trying to establish best practices
20:17 dunpeal so far here's what I have:
20:17 dunpeal 1) Once you've merged your PR, `git branch -d <merged-branch>`
20:17 dunpeal 2) Then `git push origin --delete <merged-branch>`
20:17 osse Agreed
20:17 dunpeal 3) Finally `git fetch --prune` to remove remote reference.
20:18 ResidentBiscuit If you're on GitHub/Lab, you can just click "Delete merged branch" after the merge
20:18 ResidentBiscuit Who cares what devs have on their machine
20:18 osse dunpeal: if it's a PR-style workflow then (2) can be done by the guy who accepts the PR.
20:18 dunpeal Done. As long as everyone occasionally fetch --prune, they'd all have a clean local.
20:18 nitric ResidentBiscuit: perfectionists, apparently
20:18 daniel_rose joined #git
20:18 mohabaks joined #git
20:18 osse dunpeal: and (3) can be made automatic by doing  ''git config fetch.prune true''
20:19 ResidentBiscuit I never remember to delete my local branches. Every month or so I go on a cleaning spree
20:19 dances-with-cats joined #git
20:20 diegoviola joined #git
20:21 sin3t joined #git
20:21 rivarun joined #git
20:27 SwiftMatt joined #git
20:28 clemf joined #git
20:29 dreiss joined #git
20:31 sin3t joined #git
20:33 danimal2 a repo i need to work with has one branch - master, and several tags. assume i only care about Tag A. do i check out Tag A into my own branch? i dont want to mess up the master branch. sourcetree states by checking out Tag A it will create a detached head, etc. is that what i should do? thanks!
20:34 p1k hey so I have a submodule which I committed to
20:34 daniel_r_ joined #git
20:34 _ikke_ danimal2: Yeah, just create another branch based on the tag
20:34 kadoban danimal2: What does "check out Tag A into my own branch" mean?
20:34 p1k so logically the outer repo should now have an untracked submodule ref, but it doesn't show up on git status
20:34 lifeforms left #git
20:34 cjohnson p1k: you committed to the submodule from within the submodule as it sits on your parent repo's working copy?
20:34 cjohnson or, you have a clone of that submodule somewhere else, changed it somewhere else
20:35 danimal2 _ikke_ ok got it.
20:35 cjohnson dunpeal: I would strongly recommend against auto-deleting anything. sometimes things happen and the only good backup is a dev's local repo
20:35 p1k cjohnson: I have two of the same submodule they are both up to date with the remote master
20:35 danimal2 kadoban like he said i would be creating a branch based on the tag.
20:36 cjohnson p1k: your parent repo has two submodules both of which refer back to the same repo?
20:36 dunpeal cjohnson: yeah, nobody is going to auto-delete anything (as others observed, there's no concept of centralized control in Git anyway), just posting some best practices for my fellow devs
20:36 p1k cjohnson: they refer to the same other repo
20:37 p1k cjohnson: oh that's weird git status --verbose showed the untracked updates to submodules
20:37 cjohnson p1k: you keep skipping parts of my questions
20:37 p1k but regular git status did not
20:37 cjohnson :P
20:37 rivarun joined #git
20:37 cjohnson if you have two submodules, they aren't going to know about new updates until you update those submodules
20:38 interne7y joined #git
20:38 dances-with-cats joined #git
20:38 cjohnson doesn't matter if htey point to the same remote
20:41 sin3t joined #git
20:41 eivarv joined #git
20:43 Rodya_ joined #git
20:44 Anoia joined #git
20:45 Anoia left #git
20:45 Anoia joined #git
20:45 Anoia hi all
20:45 Anoia I have an issue at work were a named branch no longer seems to contain the changesets I;ve previously committed ont hat branch
20:46 _ikke_ Ok
20:46 Anoia form what I;ve read, it's possible for people pushing to change where a branch name points to
20:46 Anoia is that correct?
20:46 _ikke_ Yes, a branch is just a pointer, you can point it to whatever you want
20:47 _ikke_ though you need to force push to the server when you point it to something not descending from what it currently is
20:47 Anoia i.e. someone (force) pushes which "moves" the branch to another changeset
20:47 _ikke_ Anoia: Correct
20:47 Anoia ok
20:47 Anoia so it looks liek some idiot force pushed :(
20:47 _ikke_ But that does not affect your local history immediately
20:47 Anoia great
20:47 Anoia not until I git pulled and all my changes disappeared... :)
20:47 _ikke_ git pull just merges
20:47 _ikke_ So, the commits are still there
20:48 Anoia but no longer seem to be a descendant of that branch
20:48 Anoia decenedant? predecessor reven
20:48 Anoia -typos
20:48 brandon joined #git
20:49 _ikke_ You should see the merge of the pull you did
20:49 osse "ancestor" i think is the common term
20:49 Anoia osse: that's the one
20:49 Anoia _ikke_: I don't, my repo was clean when I pulled
20:49 _ikke_ Anoia: Do you still have the terminal session?
20:50 Anoia and all my changes were pushed
20:50 Anoia sadly not at the moment, I will do tomorrow though
20:50 Anoia I just wanted to check that my understanding was correct
20:50 _ikke_ Anoia: Did you set something up to rebase on pull instead of merge?
20:50 _ikke_ Anoia: By default, git pull merges, which would merge the old history with the new history
20:51 Anoia would it still do that if I didn;t have any local only history?
20:51 Anoia everythign I had was on the server already
20:51 _ikke_ Yes, because of the rewriting you think happened
20:52 _sjs_ joined #git
20:52 mikecmpbll joined #git
20:52 Anoia rewrite? of the branch/bookmark
20:52 _ikke_ bookmark is an hg term :)
20:52 Guest55 joined #git
20:53 Anoia yeah, I'm an hg user normally :)
20:53 Anoia new job uses git
20:53 _ikke_ 6right
20:53 Anoia (sorry!)
20:53 _ikke_ np
20:54 Anoia we have some customisations to the workflow, but I don;t know to what extent
20:54 dances-with-cats joined #git
20:55 mibr0 joined #git
20:55 Anoia if there is a merge between my, and what is the new branch, is there a way to reinstate it?
20:55 irco joined #git
20:55 aidalgol joined #git
20:55 osse the reflog can help
20:55 Anoia if I check it out, it becomes detached
20:56 _ikke_ Anoia: It helps to look at the history to see what actually happened
20:56 alansaul joined #git
20:57 Anoia git log shows a number of merges from what is now the branch and what I thought it should have been (only if I do --all)
20:57 Anoia I'll get more info when back in work though
20:57 abyx joined #git
20:57 nidr0x joined #git
20:57 _ikke_ ok
20:57 Anoia if the git admins haven;t worted it by then
20:57 Anoia (admin gits? :)
20:58 _ikke_ Anoia: like osse said, the reflog keeps track of HEAD and branches for 90 days
20:58 Anoia thanks though, it gives me a bit more info
20:58 _ikke_ So everything is still in your local repository
20:59 Anoia yeah, I can see it all in git show and in another branch
20:59 Rodya_ joined #git
20:59 Anoia just not the one I;m working on :)
21:00 Anoia git reflog looks useful, I see what I can dig out of that too
21:00 sin3t joined #git
21:00 mohabaks joined #git
21:01 NeXTSUN joined #git
21:02 Captain_Ramius joined #git
21:02 Captain_Ramius OK, I give up.
21:03 Captain_Ramius *Hi, how is everyone?
21:03 dsdeiz joined #git
21:03 Captain_Ramius I'm trying to push my code to github for peer review but I don't want to include certain parts of a file.
21:03 _ikke_ Those keys are like next to eachother
21:03 _ikke_ :P
21:04 Captain_Ramius Is there an easy way to do that? Or should I put it in a separate file and include it (in PHP)?
21:04 _ikke_ Captain_Ramius: Yes, the latter
21:04 vassagus joined #git
21:04 rubyonrailed joined #git
21:04 _ikke_ If you don't want to share certain information, don't commit it
21:04 Anoia Captain_Ramius: bear in mind that it'll still be in the history
21:04 Captain_Ramius OK. It just occurred to me as I was asking the question. I did that with my DB credentials.
21:04 _ikke_ Right, that's the best way
21:04 Captain_Ramius Yeah, I just reset the push and now I need to rollback the commit right?
21:04 lugzer joined #git
21:05 Captain_Ramius AHHHH!
21:05 sangy joined #git
21:05 _ikke_ enlightenment
21:05 Captain_Ramius My reset deleted my new files.
21:05 _ikke_ The commits are still there
21:06 Captain_Ramius Yeah, my Notepad++ just said "this file is no longer in this folder; you can't edit it anymore"
21:07 Captain_Ramius So how do I get my files back locally? I see that they're on my Github though.
21:08 _ikke_ use git reflog to find the commit, and reset your branch back to it
21:08 Captain_Ramius OK, I found the ID for the pre-reset commit
21:09 Captain_Ramius What do I do with it? "reset --commitID"?
21:09 _ikke_ git reset --keep <id>
21:10 Captain_Ramius OK
21:10 * Captain_Ramius hopes he doesn't screw it up again
21:10 rubyonrailed joined #git
21:10 Captain_Ramius PHEW! Thanks!
21:10 sin3t joined #git
21:11 Captain_Ramius I have to admit: despite the heart palpitations, it is educational lose several hours of work.
21:11 Captain_Ramius *to lose
21:11 _ikke_ git really makes it hard to loose any comitted work
21:12 Captain_Ramius I like git reflog better than git log: the latter floods my screen.
21:12 _ikke_ Captain_Ramius: git log --oneline -10
21:13 Captain_Ramius Boy, they thought of everything didn't they? It's nice to use tools that don't cut your hand off.
21:13 _ikke_ git reflog is something different though, it shows you the commits where HEAD has been
21:13 Captain_Ramius OK, I just ran "log --oneline" and "reflog" to see the difference.
21:13 Captain_Ramius To be honest, I'm still not sure what a HEAD even is.
21:14 _ikke_ !HEAD
21:14 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
21:14 Captain_Ramius Hmmm.
21:14 _ikke_ You use the reflog when you somehow lost commits
21:14 Captain_Ramius HEAD is like saying "the paper right in front of me on the desk, not the stack over there"?
21:15 _ikke_ git symbolic-ref HEAD
21:15 _ikke_ try to execute that
21:16 Captain_Ramius returns "refs/heads/master"
21:16 _ikke_ right
21:16 _ikke_ That says that master is the currently checked out branch
21:16 _ikke_ Any new commits will be appended to that branch
21:16 johnny56_ joined #git
21:17 Captain_Ramius it's a sym-link, then. That makes sense: like the shortcuts in windows or alias in macOS or whateveritscalled in linux
21:17 _ikke_ Yes, a symbolic ref is how git calls it
21:17 Captain_Ramius got it.
21:17 _ikke_ When pointing to a commit instead of a branch, git calls it that HEAD is detached
21:18 Captain_Ramius OK
21:18 SilNc joined #git
21:19 Captain_Ramius Thanks a bunch. My dull headache indicates I've learned a lot today. :-D
21:19 sonOfRa http://classicprogrammerpaintings.com/post/1446022​05627/git-detached-head-state-gustave-moreau-1876 :)
21:19 _ikke_ :-)
21:20 reim joined #git
21:20 sin3t joined #git
21:25 kbs joined #git
21:25 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
21:26 rivarun joined #git
21:26 _ikke_ The joke actually works
21:26 Eugene Levenshtein functions, how do they work
21:26 * osse checks if its his
21:27 kappy joined #git
21:29 Eugene I believe the git-blame for that one lies with me
21:29 osse it does
21:29 osse initial commit
21:30 sin3t joined #git
21:33 fuchstronaut joined #git
21:33 dunpeal So I can ask about doorbells and it would be ontopic here?
21:33 clinth joined #git
21:34 _ikke_ PRobably, yes
21:35 pwnz0r joined #git
21:35 rik316 joined #git
21:41 sin3t joined #git
21:41 GT4066 joined #git
21:41 Derperperd joined #git
21:41 cjohnson Captain_Ramius: it's called a symlink in linux :P
21:41 cjohnson windows has them too. shortcuts are different
21:42 Samual joined #git
21:42 nevyn are shortcuts first class in windows yet?
21:42 cjohnson windows has first class sym links
21:42 cjohnson has for several versions
21:42 cjohnson shortcuts are something else
21:43 Captain_Ramius cjohnson, that's ironic: I don't know what first class is
21:43 Nugget symlinks with extra legroom and free booze
21:43 _ikke_ Fully supported, native
21:43 cjohnson with a shortcut, you can't make a shortcut to some file called foo, then edit that shortcut in your favorite editor
21:43 cjohnson unless the editor knows how to read teh shortcut
21:43 nevyn right it needs app side support
21:43 cjohnson with a symlink, being first class supported from the OS, the editor doesn't have to know
21:44 cjohnson the OS just transparently links to the true file
21:45 tabrez left #git
21:46 abyx joined #git
21:47 rivarun joined #git
21:49 Guest55 joined #git
21:49 uri joined #git
21:51 sin3t joined #git
21:51 Captain_Ramius Oh yeah, one more question:
21:51 Captain_Ramius I'm trying to add a dummy version of a file to my Github account containing sensitive data.
21:52 Captain_Ramius I think I just figured it out.
21:52 Dougie187 left #git
21:52 Captain_Ramius Maybe not:
21:52 Captain_Ramius How do I add a dummy version of a file like config.php?
21:53 Doginal joined #git
21:53 Captain_Ramius Just name it configDummy.php instead and push it to Github?
21:53 Captain_Ramius (The other projects I see there have config.php but empty values for the credentials variables, like db_user etc.)
21:54 rik316 joined #git
21:54 kadoban Captain_Ramius: !config
21:54 gitinfo Captain_Ramius: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
21:55 kadoban Ignore most of that text, some of the link suggestions should help you out though.
21:55 clinth left #git
21:56 blockzombie joined #git
21:56 Captain_Ramius It's a bit over my head. I'll see if I can slug through it.
21:56 cjohnson Captain_Ramius: for sensitive data I keep a template file like you said and fill it out on the actual machines, if I don't have any other configuration management solution in place
21:56 Spec-Chum joined #git
21:57 cjohnson for insensitive data I try to do as much as I can to ensure sane defaults and environment-selected values
21:57 cjohnson so per-server config files really just contain API keys and the like. anything else should be baked in in some fashion
21:57 Captain_Ramius yeah, that makes sense conceptually. I just have trouble making it happen.
21:58 cjohnson If your difference between prod and dev machines is debug = 1, don't keep debug in your per-machine file, put debug = 1 in dev.php, debug = 0 in prod.php
21:58 cjohnson and include relevant file based on environment
21:58 Captain_Ramius It's not a BIG deal in this case. I'm only using Github to share code with friends for peer review. They don't care if there's a dummy config file because they don't plan to RUN the code.
21:59 Captain_Ramius It's the principle of the matter...and later, when I deploy, the server db credentials will be different than my dev environment.
21:59 lugzer joined #git
21:59 Captain_Ramius So, I don't think I actually need a dummy file right now.
22:00 sin3t joined #git
22:02 rivarun joined #git
22:02 chris2 joined #git
22:03 dances-with-cats joined #git
22:05 csd_ joined #git
22:08 therealGent joined #git
22:08 rahtgaz joined #git
22:08 rahtgaz joined #git
22:09 cjohnson depending on your setup you can also just firewall the DB and have open access to allowed app servers
22:09 cjohnson then you don't have to put any credentials in
22:09 Electrometro joined #git
22:09 cjohnson that's what I try to do: everything I can to make the configuration consistent
22:10 sin3t joined #git
22:12 cjohnson I also use consistent host names between machines
22:12 cjohnson so the db's hostname is always just "percona-cluster" but on dev local, /etc/hosts points percona-cluster to 127.0.0.1
22:16 rubyonrailed joined #git
22:17 workkevin left #git
22:17 dances-with-cats joined #git
22:18 dunpeal What's the closest thing to Github that is OSS?  Gitlab?
22:20 mrpackethead joined #git
22:20 sin3t joined #git
22:21 clemf joined #git
22:25 nitric dunpeal: gitlab calls itself "open core software", but basically yes, they're as close to github as you can get, feature-wise
22:25 hahuang61 joined #git
22:26 dsantiago joined #git
22:26 splud joined #git
22:26 d4rklit3 joined #git
22:27 splud I’m in the process of scripting some corefile processing.  To this end, I need to be able to check out the appropriate commit from a source repository.  This much actually does work - but what I’m having some trouble with is restoring the repo to the commit it was at before the core analysis.
22:28 splud I can get the branch, and the current commit, but if I attempt to checkout the commit (which may in fact be the HEAD of master), I’m left in a detached head state.
22:29 cjohnson splud: why can't you just git checkout original-branch ?
22:29 splud what if the repo wasn’t at that time at the HEAD of original-branch?
22:29 nitric splud: if you're just doing exactly one checkout, "git checkout -" will get you back to the previous HEAD. or, save the output of "git rev-parse HEAD" before you detach
22:30 cjohnson splud: sounds like a weird thing you're doing, this will be run on a dev machine?
22:30 sin3t joined #git
22:32 splud using the commit id from `git rev-parse HEAD` still leaves me wihe detached head.
22:32 splud which is curious, because that commit is HEAD.
22:32 i7c No it’s not.
22:32 nitric you did "git rev-parse HEAD" *before* you checked out "the appropriate commit"?
22:33 splud yes, on dev machine.  Would rather not have to have a separate copy of the repos lingering about - eventually this may be on a server with clones of repos specifically for supporting analysis.
22:34 i7c If you checkout a commit by its commit id you will always be in detached head.
22:34 i7c +mode
22:34 fuchstronaut joined #git
22:34 splud yes, in fact at shell:  git checkout master  then note commit from git rev-parse HEAD then checkout desired commit, then git checkout saved-sha, and still get detached HEAD.
22:34 nitric whoops, i7c is totally right, ignore me
22:35 splud hrm.
22:35 i7c If you have several branches at the same commit, how should git know which one should be pointed to by HEAD if you just specify the commit id.
22:35 jimi_ joined #git
22:35 kadoban You're in "detached HEAD" anytime you've checked out something other than a local branch. The meaning is, when you commit, no branch pointer will be updated to include that new commit. That's why it's even noteworthy.
22:36 i7c Indeed. It does no harm to be in detached head state. :)
22:36 splud I’ll have to use - I guess.
22:36 kadoban (because then if you switch away, you have no real reference to that commit, necessarily, and could lose it)
22:36 durham joined #git
22:37 rkazak joined #git
22:38 IWishIKnew joined #git
22:39 interne7y joined #git
22:39 ash_workz .digraph a->b
22:39 gitinfo .digraph: http://g.jk.gs/dv.png
22:39 ash_workz (sorry git, couldn't remember the url)
22:39 i7c I'm highly offended.
22:39 i7c You used us!
22:40 rlb joined #git
22:40 sin3t joined #git
22:41 ash_workz :P
22:41 ash_workz <3 i7c
22:41 i7c <3 ash_workz
22:41 rubyonrailed joined #git
22:42 dsantiago joined #git
22:42 spudowiar joined #git
22:42 sin3t joined #git
22:43 python903 joined #git
22:44 vktec How can I amend my second to last commit? I've not pushed yet, and I just want to change the message.
22:45 rlb Is there a way to squash together two commits that precede a merge without having to redo the merge resolution (when the resolution was complicated)?  My impression is that --preserve-merges wasn't likely to work, and in practice it doesn't just re-use the existing merge work, so I wondered if there was an alternative.
22:45 ikmaak joined #git
22:45 i7c vktec, git rebase -i HEAD~2, put "reword" in the right line, save and close, edit message, save and close.
22:45 dsantiago joined #git
22:47 i7c vktec, meaning replace "pick" by "reword".
22:47 vktec Okay
22:47 vktec So both instances of "pick" get replaced?
22:47 i7c No
22:47 kadoban rlb: I think --preserve-merges might work, I never use it though. One thing you could do would be, save a reference to the merge, go back in time before the merge and squash the commits, and then redo the merge. When it asks you to fix the conflicts, just checkout the stuff from the saved merge and commit that.
22:48 i7c vktec, the lines represent the recent two commits. Just put reword in the line of the commit whose message you want to edit.
22:48 vktec Okay
22:48 i7c vktec, in your case that should be the upper line.
22:48 rlb kadoban: doh - of course, I should have thought about that.  Thanks!
22:48 vktec Thanks i7c
22:48 i7c If I'm not horribly mistaken. :)
22:48 i7c vktec, you're welcome.
22:49 kadoban 'welcome
22:50 vktec i7c: Thanks, that worked perfectly
22:50 i7c :)
22:50 tvw joined #git
22:50 sin3t joined #git
22:51 pwnz0r_ joined #git
22:54 lugzer joined #git
22:55 red_ joined #git
22:57 abyx joined #git
22:58 corebits joined #git
22:59 inflames joined #git
22:59 YourTheBombNow23 joined #git
23:00 Electrom_ joined #git
23:00 sin3t joined #git
23:01 splud okay, I’m obtaining current branch, and SHAs for HEAD and branch, and if the same, I just checkout the branch, otherwise I check out the branch, then perform a subsequent checkout of the specific commit #
23:01 starkhalo joined #git
23:02 osse splud: unless you're checking out specific files from a commit you don't have to checkout a branch then a commit
23:02 osse splud: you can checkout any commit directly from any other
23:03 splud okay, then if commits == then check out branchname, otherwise checkout SHA ?
23:03 osse where are the values coming from?
23:04 splud parsing ‘git branch
23:04 vassagus joined #git
23:05 splud for the marked line, and performing git rev-parse HEAD and git rev-parse branchname
23:05 osse why?
23:05 beyertech_ joined #git
23:05 veilig2000 joined #git
23:05 rubyonrailed joined #git
23:05 splud so that I can uniquivocally restore the git tree to the state before checking it out for a scripted core analysis.
23:06 splud unequivocally.
23:06 splud damn, can’t type worth ....
23:06 osse splud: I think the shortcut  'git checkout -' will handle all your requirements
23:07 splud assuming there wasn’t some intermediate git operation in there.
23:07 cdown joined #git
23:07 osse splud: if not I suggest you do 'git symbolic-ref HEAD' to get the current branch (if any), store that initially, then check it back out when you're done
23:08 osse parsing 'git branch' is usually the wrong way of going about things
23:08 osse if git symbolic-ref HEAD fails then you're already detached, so store the output of git rev-parse HEAD instead.
23:09 splud Anyway, the SHA of the application repo is in our environment, so can be parsed from a coredump.  I’m using that to establish a suitable snapshot for a cross-compiled gdb with sources and symbols, etc.
23:10 sin3t joined #git
23:10 ResidentBiscuit joined #git
23:12 kbs joined #git
23:12 YourTheBombNow23 joined #git
23:14 durham joined #git
23:15 splud feck.
23:16 splud “HEAD detached at refs/heads/master”
23:16 veilig2000 joined #git
23:17 rubyonrailed joined #git
23:18 splud AND when I run ‘git symbolic-ref HEAD’ in this state, I’m advised HEAD isn’t a symbolic ref
23:18 LeBlaaanc joined #git
23:19 osse splud: Ahhh, forgot about that
23:19 rubyonrailed joined #git
23:19 osse splud: Either strip refs/heads from the string, or use symbolic-ref --short
23:20 theskillwithin joined #git
23:20 BinGOs joined #git
23:20 sin3t joined #git
23:20 osse Not sure why git checkout behaves this way. I find it frustrating
23:21 YourTheBombNow23 joined #git
23:22 splud okay, that’s working.
23:22 netj joined #git
23:24 splud thanks.  Still have a bunch of other stuff to automate (sysroot and symbol grabbing, handling different platforms), but while tedious, that’s what scripting is for.
23:25 splud When done, I’ll be able to either push a corefile to a server, or run the script locally on my workstation and have it belt out a report with stack frames, source and locals.
23:26 splud It’s one thing when a core comes about during ones own testing, but from the field across multiple product versions, or with long term iterative testing, setting everything up to provide a proper core analysis involves a lot of manual steps.
23:26 hahuang61 joined #git
23:26 a3Dman joined #git
23:26 csd_ joined #git
23:27 osse I sense a lack of debug symbols
23:28 d^sh joined #git
23:28 YourTheBombNow23 joined #git
23:28 rkazak joined #git
23:29 _toine joined #git
23:30 sin3t joined #git
23:31 madewokherd joined #git
23:31 cjbrambo joined #git
23:32 splud Debug symbols are stripped from binaries that are packaged, but the symbols are retained for every sanity build.
23:32 ws2k3 joined #git
23:33 _toine joined #git
23:34 osse I suppose you're not in a position to tell them "can you reproduce it with this? <link to a huuge archive>"   :p
23:34 dsdeiz joined #git
23:34 splud So, I have a dir for each bug I handle, and in there are any cores for it, plus symlinks for sysroot, source (which needs to be checked out to the build commit), symbols, and binaries.
23:34 _sjs joined #git
23:35 splud It’s an embedded device.  testers don’t diagnose, just report.  End users don’t see internal workings.
23:35 YourTheBombNow23 joined #git
23:36 haaaay joined #git
23:36 splud Anyway, I have the step-by-step process down, but I want to fully automate it - THEN testers as well as devs who don’t spend much time in gdb would be able to take a corefile and just post it somewhere and have the magic happen.
23:36 l4v2 joined #git
23:37 splud The git part is handled, so moving on.  Thanks again.
23:39 fuchstronaut joined #git
23:40 dsdeiz joined #git
23:40 sin3t joined #git
23:42 haaaay I created a repository, committed a script, made further modifications to the script, want to go back and run old script. I used git checkout <hash> which ( as expected ) put me in a detached head mode. What I don't understand is why the script currently in the directory is the modified one and not the old one...what happened? How do I see the old script so I can run it?
23:42 haaaay Any help that can be provided would be wonderful
23:42 tsteinholz joined #git
23:43 tsteinholz hi
23:43 gitinfo tsteinholz: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
23:43 osse haaaay: !float
23:43 gitinfo haaaay: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
23:43 osse This is probably what happened
23:43 tsteinholz i cant clone from git, because it says my ssl cert :(
23:43 osse If git status reports it as modified you may want to look into git stash
23:45 tsteinholz I get this "curl: (77) error setting certificate verify locations: CAfile: /etc/ssl/certs/ca-certificates.crt CApath: none" error when I try to clone a repository
23:45 a3Dman joined #git
23:45 haaaay I moved to a previous commit using the hash rather than a branch. Does that change the answer at all? Again, only one commit total followed by modifications of the file.
23:46 dsdeiz joined #git
23:47 Mannn joined #git
23:48 osse haaaay: I don't think it does
23:48 osse What does git status say?
23:50 lugzer joined #git
23:50 sin3t joined #git
23:50 haaaay There (I think) should be a conflict between the two files given that git diff is reporting differences. I was able to successfully checkout to that past commit...which sounds like it shouldn't have been possible given that I had a modified file (the only file).
23:51 osse haaaay: Did you commit those changes? Ie.
23:51 haaaay Only one commit was ever made and then modifications made thereafter with no committing or staging.
23:52 haaaay I'd show more detail on here, but I suspect it's probably poor ettiquette to copy and paste git status information on here...
23:52 Rodya_ joined #git
23:53 osse haaaay: Bad etiquette due to lots of text? Use a pastebin. Bad etiquette due to proprietary content? Either redact parts of it or explain ad best as you can
23:54 haaaay just due to lots (not that much though) of text. I'll pastebin then.
23:54 osse haaaay: If you have uncommitted changes and you checkout a different commit git will let it slide if the files with the uncommitted changes in them don't have to change
23:56 osse If you want to get rid of changes git status will tell you how
23:56 a3Dman joined #git
23:57 osse If only one commit was ever made then it still fits
23:57 osse Except that you check out the same commit, not a different one, and thus the files obviously don't have to change
23:58 osse If you want to temporarily get rid of changes, man git-stash
23:58 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
23:58 haaaay What are the rules for "letting it slide"? I have exactly one document here hello.cpp. Pastebin:http://pastebin.com/TtyDRHcc
23:59 osse By letting it slide I mean that the file with still appear modified
23:59 haaaay In this case the goal was just a simple experiment. Create a file, commit file, make modifications to file, go back to old file, run old file, go back to 'current with modifications state'

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