Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-16

| 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:00 geoid joined #git
00:03 johnny56 joined #git
00:05 BSaboia joined #git
00:07 cqi joined #git
00:07 holodoc joined #git
00:08 cqi joined #git
00:09 ismithers joined #git
00:11 howitdo joined #git
00:12 Timvde joined #git
00:13 Noodlewitt joined #git
00:13 nikivi joined #git
00:17 howitdo joined #git
00:17 Gsham joined #git
00:23 watabou joined #git
00:24 jimi_ joined #git
00:25 danslo joined #git
00:26 axisys_ joined #git
00:29 romerocesar joined #git
00:32 mischat joined #git
00:32 mostlybadfly joined #git
00:33 _28_ria joined #git
00:35 bronson joined #git
00:37 madewokherd joined #git
00:39 _28_ria joined #git
00:42 nikivi joined #git
00:44 ^7heo the hardest part of using git definitely is the commit messages
00:45 Noodlewitt joined #git
00:47 thiago ^7heo: yeah, very often
00:49 pwnz0r joined #git
00:51 krillr joined #git
00:54 Keridos joined #git
00:57 Gsham joined #git
01:02 troyt joined #git
01:03 geoid joined #git
01:03 romerocesar joined #git
01:04 kier joined #git
01:05 cqi joined #git
01:05 raspado joined #git
01:07 dirtyroshi joined #git
01:08 re1 joined #git
01:08 DolphinDream joined #git
01:09 robattila256 joined #git
01:10 nukeu666 joined #git
01:13 Lyqyd joined #git
01:14 ixjlyons joined #git
01:15 aarobc joined #git
01:19 LaydMoniCa joined #git
01:21 _28_ria joined #git
01:23 nettoweb joined #git
01:23 jaguarmagenta joined #git
01:24 watabou joined #git
01:24 Sasazuka joined #git
01:25 breezy_ joined #git
01:25 cyberz joined #git
01:26 b3kN joined #git
01:32 Orbitrix joined #git
01:34 romerocesar joined #git
01:35 jnewt joined #git
01:36 Sasazuka joined #git
01:36 jw4242 joined #git
01:38 JLat joined #git
01:41 Noodlewitt joined #git
01:42 jstimm joined #git
01:42 Orbitrix joined #git
01:42 _28_ria joined #git
01:44 JrdLtmr joined #git
01:47 King_Hual joined #git
01:47 Orbitrix joined #git
01:52 nickabbey joined #git
01:52 Orbitrix joined #git
01:54 dirtyroshi joined #git
01:57 Orbitrix joined #git
01:58 King_Hual joined #git
01:58 Sasazuka joined #git
02:00 pwnz0r_ joined #git
02:00 bronson joined #git
02:02 ToBeCloud joined #git
02:03 Orbitrix joined #git
02:05 geoid joined #git
02:07 raspado joined #git
02:08 Orbitrix joined #git
02:13 d^sh joined #git
02:14 Orbitrix joined #git
02:15 austin987 joined #git
02:17 durham joined #git
02:19 Orbitrix joined #git
02:21 _28_ria joined #git
02:22 finalbeta joined #git
02:23 joshsyn joined #git
02:24 pwnz0r joined #git
02:24 Orbitrix joined #git
02:25 danslo joined #git
02:27 salad joined #git
02:27 JamesBaxter joined #git
02:28 romerocesar_ joined #git
02:29 Orbitrix joined #git
02:29 Noodlewitt joined #git
02:31 hahuang61 joined #git
02:31 diogenese joined #git
02:33 Orbitrix joined #git
02:37 JanC_ joined #git
02:38 diogenese joined #git
02:41 Orbitrix joined #git
02:46 lanking joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:51 zhenq my local branch commits are like (master) —> (c1) —> (c2) —> (c3) I want to discard commits c1 and c2 but keeps c3. Is there any way to do it?
02:51 Orbitrix joined #git
02:52 nukeu666 joined #git
02:53 Vampire0_ joined #git
02:55 Nilesh_ joined #git
02:59 bruce_lee joined #git
02:59 bruce_lee joined #git
02:59 Orbitrix joined #git
03:01 Goplat joined #git
03:02 phroa zhenq: man git-rebase 's interactive section
03:02 gitinfo zhenq: the git-rebase manpage is available at http://jk.gs/git-rebase.html
03:03 zhenq phroa: thanks. Yes, that looks good. git rebase c1, then remove c1 and c2 from the pick.
03:05 phroa if you want to remove the very latest commit(s), there's another way; git rebase --hard @~ (one ~ per commit)
03:05 phroa or any other commit spec really
03:05 Orbitrix joined #git
03:06 nickabbey joined #git
03:06 zhenq no, I don't want to remove the latest one:-) rebase works, just need to add ^ after the commit I want to remove, like git rebase -i (c1)^
03:06 geoid joined #git
03:07 buffal0 joined #git
03:08 sunri5e joined #git
03:08 romerocesar joined #git
03:10 Orbitrix joined #git
03:11 dreiss joined #git
03:11 aavrug joined #git
03:12 aavrug joined #git
03:14 aw1 joined #git
03:14 rchavik joined #git
03:14 brent__ joined #git
03:15 fahadash joined #git
03:16 Orbitrix joined #git
03:21 hendry is there a configuration option i can use to git pull --rebase by default, in order to avoid merge commits ?
03:21 hendry [6~[6~[6~[6~[6~[6~[6~[6~[6~
03:22 Emperor_Earth joined #git
03:22 hendry the merge commits trigger unneccessary CI builds in my workflow
03:22 Orbitrix joined #git
03:24 jaguarmagenta joined #git
03:25 dsantiago joined #git
03:25 watabou joined #git
03:26 safe joined #git
03:26 shams joined #git
03:27 Orbitrix joined #git
03:29 chachasmooth joined #git
03:32 Orbitrix joined #git
03:34 bronson joined #git
03:35 Raed joined #git
03:38 Orbitrix joined #git
03:38 hendry or do I alias pull to pull --rebase maybe?
03:43 Orbitrix joined #git
03:43 romerocesar joined #git
03:44 ki0 joined #git
03:48 Orbitrix joined #git
03:48 curiousmansi joined #git
03:51 cdg joined #git
03:51 hexagoxel joined #git
03:52 Random832 phroa, @?
03:53 Orbitrix joined #git
03:53 Random832 also what's the difference between repeated ~ and repeated ^
03:53 venmx joined #git
03:55 regedit joined #git
03:55 Doginal joined #git
03:57 hahuang61 joined #git
03:58 Orbitrix joined #git
03:59 Samual joined #git
04:02 sbulage joined #git
04:03 aavrug joined #git
04:05 Orbitrix joined #git
04:07 thiago Random832: none
04:07 thiago since ~ is the same as ^, then ~~ is the same as ^^
04:08 Random832 hmm, ~ without a number isn't mentioned in man git-rev-parse
04:08 gitinfo the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html
04:08 blackwind_123 joined #git
04:08 raspado joined #git
04:10 Orbitrix joined #git
04:10 fstd_ joined #git
04:10 thiago ~1 and ^1 are the same
04:10 thiago ~2 and ^2 are not the same
04:13 blackwind_123 joined #git
04:15 Orbitrix joined #git
04:15 Vortex34 joined #git
04:16 a_thakur joined #git
04:18 romerocesar joined #git
04:19 geoid joined #git
04:19 breezy_ joined #git
04:20 Orbitrix joined #git
04:20 sunri5e joined #git
04:22 robotroll joined #git
04:24 Doginal left #git
04:24 phroa Random832: man gitrevisions
04:24 gitinfo Random832: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
04:25 Orbitrix joined #git
04:25 pwnz0r joined #git
04:25 Random832 yeah that's the same content, it doesn't actually say <n> is optional or what happens if you omit it
04:26 phroa " I.e. <rev>~3 is equivalent to <rev>^^^" under <rev>~<n>
04:26 phroa it's pretty well buried in there
04:26 Random832 yeah but that doesn't say <rev>~ is equivalent to <rev>~1
04:27 Random832 like there's nothing in there to suggest that the number isn't mandatory, or to say it defaults to 1
04:29 blackwind_123 joined #git
04:29 Orbitrix joined #git
04:31 watabou joined #git
04:31 alex1a_ joined #git
04:34 mizu_no_oto joined #git
04:34 hahuang65 joined #git
04:35 Orbitrix joined #git
04:35 bronson joined #git
04:35 aruns joined #git
04:38 diogenese joined #git
04:39 subhojit777 joined #git
04:39 gfixler joined #git
04:40 Orbitrix joined #git
04:40 anonymuse joined #git
04:40 blackwind_123 joined #git
04:41 nickabbey joined #git
04:44 steven_a_s joined #git
04:44 Orbitrix joined #git
04:45 diogenese joined #git
04:45 steven_a_s joined #git
04:45 ExeciN joined #git
04:46 breezy_ joined #git
04:47 Sample joined #git
04:50 Orbitrix joined #git
04:51 blackwind_123 joined #git
04:52 diogenese joined #git
04:54 BrAsS_mOnKeY joined #git
04:55 Orbitrix joined #git
04:56 howdoi joined #git
04:56 albel727 joined #git
04:57 xall joined #git
04:58 hahuang61 joined #git
05:00 donught joined #git
05:00 Orbitrix joined #git
05:03 rbern joined #git
05:04 mattp_ joined #git
05:06 steeze joined #git
05:07 diogenese joined #git
05:07 Mowgli joined #git
05:08 tmg joined #git
05:10 Orbitrix joined #git
05:10 blackwind_123 joined #git
05:10 ochorocho__ joined #git
05:14 e14 joined #git
05:15 Orbitrix joined #git
05:20 geoid joined #git
05:21 Orbitrix joined #git
05:23 javster joined #git
05:24 blackwind_123 joined #git
05:25 xall joined #git
05:25 javster left #git
05:25 jaguarmagenta joined #git
05:26 Orbitrix joined #git
05:27 Mowgli joined #git
05:29 bernardio joined #git
05:29 anonymuse joined #git
05:29 shams joined #git
05:32 Orbitrix joined #git
05:33 oskarkv joined #git
05:33 raspado joined #git
05:35 Siegfried joined #git
05:36 bronson joined #git
05:36 howitdo joined #git
05:37 Orbitrix joined #git
05:40 duderonomy joined #git
05:41 e14_ joined #git
05:43 Orbitrix joined #git
05:46 Cabanossi joined #git
05:48 blackwind_123 joined #git
05:48 FabTG joined #git
05:49 Orbitrix joined #git
05:53 venmx joined #git
05:54 Orbitrix joined #git
05:55 govg joined #git
05:59 Orbitrix joined #git
06:00 moei joined #git
06:00 justan0theruser joined #git
06:01 jaguarmagenta joined #git
06:05 Orbitrix joined #git
06:10 Orbitrix joined #git
06:10 shams joined #git
06:11 OOPMan joined #git
06:13 mmattice joined #git
06:14 overlord_tm joined #git
06:15 Orbitrix joined #git
06:16 _28_ria joined #git
06:17 rscata joined #git
06:17 Anja joined #git
06:18 tgy joined #git
06:22 Orbitrix joined #git
06:22 snthsnth joined #git
06:23 BlessJah joined #git
06:23 Dazzyp joined #git
06:23 inflames joined #git
06:24 inflames joined #git
06:24 syg_ joined #git
06:24 GodGinrai joined #git
06:25 pwnz0r joined #git
06:27 danslo joined #git
06:27 Orbitrix joined #git
06:29 blackwind_123 joined #git
06:31 jaguarma_ joined #git
06:32 lordjancso joined #git
06:32 hyperair joined #git
06:35 zzz joined #git
06:35 Orbitrix joined #git
06:36 geoid joined #git
06:36 bronson joined #git
06:38 svm_invictvs joined #git
06:39 romerocesar_ joined #git
06:40 Orbitrix joined #git
06:42 ogny joined #git
06:43 zzz_ joined #git
06:44 ki0 joined #git
06:44 ki0 joined #git
06:45 ThomasLocke joined #git
06:45 ThomasLocke joined #git
06:46 upenox joined #git
06:47 markus3 joined #git
06:48 KtoTo joined #git
06:48 a_thakur joined #git
06:49 romerocesar joined #git
06:49 Orbitrix joined #git
06:53 raspado joined #git
06:54 xall joined #git
06:54 shams joined #git
06:55 Orbitrix joined #git
06:59 Mowgli joined #git
07:00 Orbitrix joined #git
07:00 hahuang61 joined #git
07:01 Raging_Hog joined #git
07:07 qt-x joined #git
07:07 vdv joined #git
07:07 Orbitrix joined #git
07:14 Orbitrix joined #git
07:17 jaguarmagenta joined #git
07:19 Shentino joined #git
07:20 pks joined #git
07:20 freimatz joined #git
07:21 theoceaniscool joined #git
07:22 Flowinho joined #git
07:25 jnavila joined #git
07:26 chele joined #git
07:27 dreiss joined #git
07:27 xall joined #git
07:28 Sceorem joined #git
07:29 diogenese joined #git
07:29 dreampwnzor joined #git
07:34 a_thakur joined #git
07:34 Mowgli joined #git
07:35 venmx joined #git
07:37 fatalhalt joined #git
07:38 Orbitrix joined #git
07:39 snthsnth joined #git
07:41 elect joined #git
07:41 sea-gull_ joined #git
07:42 markus3 joined #git
07:43 JeroenT joined #git
07:43 dersand joined #git
07:44 Orbitrix joined #git
07:44 sbulage joined #git
07:48 Gloomy joined #git
07:49 Orbitrix joined #git
07:49 mischat joined #git
07:50 steeze joined #git
07:50 diogenese joined #git
07:52 Gloomy joined #git
07:52 minikN joined #git
07:52 eduardas_m joined #git
07:55 Orbitrix joined #git
07:55 mazert joined #git
07:58 mahendratech joined #git
08:00 finalbeta joined #git
08:01 Derderderd joined #git
08:02 Orbitrix joined #git
08:03 finalbeta joined #git
08:07 PioneerAxon joined #git
08:12 danslo joined #git
08:13 xall joined #git
08:13 overlord_tm joined #git
08:13 dminuoso left #git
08:14 Orbitrix joined #git
08:14 dcpc007 joined #git
08:18 Singmyr joined #git
08:19 Orbitrix joined #git
08:21 TomyWork joined #git
08:23 neunon joined #git
08:24 NathanI__ joined #git
08:24 Orbitrix joined #git
08:25 bernardio joined #git
08:26 eduardas_m joined #git
08:28 jknetl joined #git
08:31 xall joined #git
08:32 TomyWork joined #git
08:33 diogenese joined #git
08:35 tematibr joined #git
08:37 jaguarmagenta joined #git
08:37 bronson joined #git
08:41 bernardio joined #git
08:43 willlondon joined #git
08:43 Balliad joined #git
08:45 mns joined #git
08:46 ahmedelgabri joined #git
08:47 Vampire0 joined #git
08:48 Orbitrix joined #git
08:50 hahuang61 joined #git
08:50 govg joined #git
08:51 aidalgol joined #git
08:53 _Cyclone_ joined #git
08:54 mns joined #git
08:55 netj joined #git
08:55 ki0 joined #git
08:57 sparetire joined #git
08:58 tematibr left #git
08:59 encod3 joined #git
09:03 roelmonnens joined #git
09:03 Derderderd joined #git
09:04 byte512 joined #git
09:05 Shashikant86 joined #git
09:05 QuestionTime joined #git
09:09 mathematic-alpha joined #git
09:10 finalbeta joined #git
09:15 mikecmpbll joined #git
09:18 zeroed joined #git
09:18 venmx joined #git
09:19 bongjovi joined #git
09:23 NimeshNeema joined #git
09:26 metachr0n joined #git
09:26 clmsy joined #git
09:28 gisli joined #git
09:28 mischat joined #git
09:34 marcogmonteiro joined #git
09:34 mischat joined #git
09:36 diogenese joined #git
09:37 nettoweb joined #git
09:37 JeroenT joined #git
09:38 chll_ joined #git
09:39 shams joined #git
09:40 yaewa joined #git
09:42 xall joined #git
09:43 WaReZ joined #git
09:44 Balliad joined #git
09:45 Shashikant86 joined #git
09:47 blackwind_123 joined #git
09:48 corpsicle joined #git
09:49 corpsicle does github do any deeper conflict resolving than git in itself does?
09:50 bremner probably not, bit ask #github?
09:50 corpsicle will do! thanks.
09:51 grift joined #git
09:53 Gloomy joined #git
09:53 Gloomy joined #git
09:54 xall joined #git
09:55 _August_ joined #git
09:56 Glooomy joined #git
10:00 cdown joined #git
10:02 kurkale6ka joined #git
10:03 subhojit777 joined #git
10:04 Derderderd joined #git
10:06 tvw joined #git
10:06 nickabbey joined #git
10:08 vuoto joined #git
10:10 howitdo joined #git
10:10 Serpent7776 joined #git
10:14 mablae joined #git
10:20 venmx joined #git
10:26 GT4066 joined #git
10:27 FilipNortic joined #git
10:28 diogenese joined #git
10:29 hahuang61 joined #git
10:35 irqq joined #git
10:35 GavinMagnus joined #git
10:37 Cavallari joined #git
10:37 jaguarmagenta joined #git
10:37 buffal0 joined #git
10:38 bronson joined #git
10:43 cdown joined #git
10:44 romerocesar joined #git
10:45 buffffal00 joined #git
10:46 Shashikant86 joined #git
10:48 WhiskerBiscuit joined #git
10:48 elsevero joined #git
10:50 publio joined #git
10:50 tvw joined #git
10:54 unilovelight[m] joined #git
10:56 nanga joined #git
10:58 jaggz left #git
11:00 subhojit777 joined #git
11:00 cyphase_eviltwin joined #git
11:01 shams joined #git
11:01 theoceaniscool joined #git
11:03 YuGiOhJCJ joined #git
11:04 willlondon joined #git
11:05 Derderderd joined #git
11:08 d0nn1e joined #git
11:12 cyphase_eviltwin joined #git
11:13 buffal0 joined #git
11:14 aw1 joined #git
11:15 joshsyn joined #git
11:17 romerocesar joined #git
11:18 nukeu666 joined #git
11:18 cdown joined #git
11:18 rnsanchez joined #git
11:21 venmx joined #git
11:22 dimi1947 joined #git
11:23 diogenese joined #git
11:24 afuentes joined #git
11:26 a_thakur_ joined #git
11:27 ThomasLocke joined #git
11:28 PCatinean joined #git
11:32 MacGyver joined #git
11:33 djb-irc joined #git
11:35 ThomasTang joined #git
11:45 metachr0n joined #git
11:51 spacelord_ joined #git
11:52 Sample joined #git
11:52 nettoweb1 joined #git
11:53 Mir4g3 joined #git
11:54 nickabbey joined #git
11:57 onmeac joined #git
11:57 Shashikant86 joined #git
11:59 Derderderd joined #git
12:02 jknetl joined #git
12:04 cdown joined #git
12:07 romerocesar_ joined #git
12:07 re1 joined #git
12:10 Shashikant86 joined #git
12:12 YuGiOhJCJ joined #git
12:12 JeroenT_ joined #git
12:14 hramrach hello
12:14 roxlu joined #git
12:14 hramrach how come a commit I see in a git log does not have any tags but the following does?
12:15 moritz probably because one has been tagged, and the other hasn't
12:16 phanimahesh joined #git
12:18 hramrach in Linux tree I see d894be57ca92c8a8819ab544d550809e8731137b which is below 8d7533e5aaad1c94386a8101a36b0617987966b7 in log. git tag --contains gives several vX.X tags for the latter but none for the earlier
12:19 hramrach so how can a tag contain a commit but not its ancestor?
12:19 ochorocho__ joined #git
12:20 moritz hramrach: contains explicitly looks for the tagged commits and their ancestors
12:20 moritz hramrach: whereas git log --decorate only shows the tags next to the commits that were actually tagged
12:20 netj joined #git
12:20 manuel_ joined #git
12:20 grawity also `git log` kinda flattens the graph
12:20 grawity and linux.git has a lot of mergse
12:20 grawity merges*
12:20 moritz !lol
12:20 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
12:21 grawity maybe a tag covers commit X, but then a merge of old commits happens
12:21 moritz hramrach: ^^ try this command, it might make things clearer
12:21 moritz or gitk
12:21 grawity and even though those commits are older in time, they don't follow the same path
12:22 venmx joined #git
12:23 mikecmpb_ joined #git
12:26 hramrach the graph shown is this: http://paste.debian.net/902528/
12:26 Noldorin joined #git
12:26 metachr0n joined #git
12:27 rossome joined #git
12:27 buffal0 joined #git
12:28 hramrach so d894be5 was added to master before 8d7533e was merged to master through 27058af
12:29 hramrach so any master tags that apply to 8d7533e should also apply to d894be5, should they not?
12:29 hahuang61 joined #git
12:30 grawity only if those tags also apply to the merge
12:30 hramrach if they did not how would they propagate to the side branch on which 8d7533e was authored?
12:31 jknetl joined #git
12:32 diogenese joined #git
12:35 spacelord_ joined #git
12:37 encod3 joined #git
12:38 sdothum joined #git
12:38 sbulage joined #git
12:38 jaguarmagenta joined #git
12:39 mindfart joined #git
12:39 bronson joined #git
12:41 Cavallari1 joined #git
12:41 mizu_no_oto joined #git
12:46 romerocesar joined #git
12:49 Gsham joined #git
12:51 xall joined #git
12:53 iron_houzi joined #git
12:55 rossome joined #git
12:55 johnnyfive joined #git
12:55 iron_houzi Hi. Does anybody know the details of how the merkle tree hashing works for a node with multiple parents? How do you guarantee the same hash, when AFAICT the order should matter which parent you hash before the other.. ?
12:55 subhojit777 joined #git
12:56 ojdo joined #git
12:56 alcohol blockchain?
12:56 rossome joined #git
12:56 hardenedapple joined #git
12:57 iron_houzi alcohol: I think that response is a bit too terse for my understanding..
12:58 _ikke_ alcohol: git's hashing scheme is also a merkle tree
12:59 _ikke_ iron_houzi: The order of the parents is defined
12:59 iron_houzi _ikke_: Do you know how?
12:59 _ikke_ The first parent is always the current branch
12:59 _ikke_ But in the end, it doesn't matter, it's just two fields in a commit object
13:00 Derderderd joined #git
13:00 davimore joined #git
13:00 tmsmith joined #git
13:01 irqq joined #git
13:01 DolphinDream joined #git
13:03 sevenearths2 joined #git
13:04 denisMone joined #git
13:05 sevenearths2 If I want to ignore all 'static' folders in a repo do I just use '*/static/*' in my '.gitignore'?
13:06 johnmilton joined #git
13:08 synthroid joined #git
13:08 Cavallari1 joined #git
13:14 dilfridge joined #git
13:16 GavinMagnus joined #git
13:16 cyphase joined #git
13:18 shams joined #git
13:20 jaguarmagenta joined #git
13:21 Gloomy joined #git
13:21 ThomasTang joined #git
13:22 dreiss joined #git
13:23 venmx joined #git
13:25 shams left #git
13:29 King_Hual joined #git
13:30 mentazoom joined #git
13:30 PioneerAxon joined #git
13:30 overlord_tm joined #git
13:31 ispn joined #git
13:34 bongjovi joined #git
13:35 unbalanced joined #git
13:35 sbulage joined #git
13:35 Nilesh_ joined #git
13:36 JeroenT_ left #git
13:42 shams joined #git
13:44 JeroenT joined #git
13:46 cyphase joined #git
13:48 jimi_ joined #git
13:49 anonymuse joined #git
13:49 sevenearths2 I'll take that as a no then
13:49 Vampire0 sevenearths2, how do you define ignore?
13:49 Vampire0 sevenearths2, do you want to ignore changes to tracked files, or do you want to prevent new files being tracked?
13:50 sevenearths2 i just want all folder called static not to be included in the repo
13:50 sevenearths2 folders
13:51 dimi1947 joined #git
13:51 ivegotasthma joined #git
13:51 ivegotasthma hello, I want to rebase a branch on top of another
13:52 ivegotasthma there are a crap ton of commits that are in conflict
13:52 sevenearths2 Vampire0, i just want all folders called static not to be included in the repo
13:52 ivegotasthma I want to figure out where they diverge and squash one of the branches to one commit and rebase on the other, that way I rebase only one
13:52 ivegotasthma commit, any idea how to find the point where they diverge?
13:52 Vampire0 sevenearths2, well, then just putting 'static/'  to your .gitignore should be sufficient
13:53 sevenearths2 Vampire0, will that also exclude 'somefolder/static/'?
13:53 Vampire0 sevenearths2, If it does not start with a slash it is applied on each directory level and not only to root, having the slash in the end matches only the directories, not the files and then all files and folders contained are automatically ignored
13:53 Vampire0 sevenearths2, yes
13:54 sevenearths2 Vampire0, cool, thanks mate
13:54 Vampire0 sevenearths2, yw
13:54 geoid joined #git
13:54 Khisanth joined #git
13:54 Vampire0 ivegotasthma, do you mean the mergebase of branch x and y, so where one was branched off the other?
13:55 sevenearths2 left #git
13:55 Vampire0 ivegotasthma, if so,      git merge-base x y
13:55 hramrach ivegotasthma: what are the branches? sometimes if you have a dev branch and a release branch with same commits slightly modified they won't rebase on each other although the code is basically the same
13:56 ivegotasthma hramrach: we have a branching structure that makes things FUBAR, and there are heavy modifications
13:56 ivegotasthma Vampire0: thanks
13:58 hramrach ivegotasthma: I was working with a tree where the developer would make minor fixes by rewriting the commits so you got minimal changes but huge conflict on rebase
13:59 Vampire0 ivegotasthma, yw
13:59 nowhere_man joined #git
14:01 Derderderd joined #git
14:01 xall joined #git
14:01 noecc joined #git
14:02 rnsanchez_ joined #git
14:04 ki0_ joined #git
14:05 willlondon joined #git
14:08 synthroid joined #git
14:09 ghostlight joined #git
14:09 chele joined #git
14:10 _rnsanchez_ joined #git
14:10 ki0 joined #git
14:12 synthroi_ joined #git
14:12 ki0_ joined #git
14:13 ki0__ joined #git
14:18 porsche944 joined #git
14:19 Gsham joined #git
14:19 Sheogorath[m] joined #git
14:20 kba I screwed up my reposistory or something and I don't understand what's wrong. Long story short, when I do `git fetch --all` followed by `git reset --hard HEAD`, it says I'm now at a commit that no longer exists, and I'm most definitely not on the recent commit on github
14:20 kba How can I fix this?
14:21 grawity first of all look up what HEAD means
14:21 kba Fuck sake, it's that `git reset --hard origin/HEAD` thing
14:21 kba I feel like I've never had to do that, but now I suddenly have to all the time
14:21 grawity it doesn't mean "the commit I just fetched" (that's FETCH_HEAD)
14:21 GavinMagnus left #git
14:21 kba so I should use FETCH_HEAD in the future?
14:21 grawity and it doesnn't mean "the latest commit on github" (that's origin/master)
14:21 kba I see
14:22 ^7heo grawity: not necessarily.
14:22 grawity "HEAD" just means the commit you aready have checked out
14:22 ^7heo grawity: people commit to dev branches sometimes.
14:22 CEnnis91 joined #git
14:22 grawity so resetting to HEAD doesn't do anything other than throw away uncommitted changes
14:22 kba grawity: I see! Thanks
14:22 kba So what's the difference between origin/HEAD and FETCH_HEAD?
14:22 rwb joined #git
14:23 grawity origin/HEAD is more or less an alias to origin's "default branch", usually origin/master
14:23 grawity FETCH_HEAD is... well, with `git fetch origin master` it'd contain the stuff you just fetched
14:23 moritz if you git fetch <url>, FETCH_HEAD might point to something that's not even in origin
14:23 grawity but with `git fetch origin`, I have no idea.
14:23 venmx joined #git
14:23 kba So it just remembers what the last thing I fetched was?
14:23 grawity pretty much
14:24 ^7heo kba: AFAIK, FETCH_HEAD is the HEAD of what you have just fetched.
14:24 ^7heo kba: it can be anything.
14:24 grawity so, anyway, you'd usually want to reset to origin/master, or origin/somebranch, or @{upstream}
14:24 ^7heo kba: while origin/HEAD is the HEAD of origin.
14:24 nowhereman joined #git
14:24 _ikke_ ^7heo: HEAD is a symbolic ref, FETCH_HEAD is a file which contains all kinds of refs
14:24 kba It all comes together now. Thanks a lot!
14:24 _ikke_ They're not comparable
14:24 ^7heo but also, AFAIK, the origin tree will be the LOCAL origin tree, i.e. it won't magically sync with the remote.
14:25 moritz if you 'git pull <url> <branch>', pull calls fetch, and the tip of the remote <branch> ends up in FETCH_HEAD, which pull then merges
14:25 qqx HEAD isn't always a symbolic ref. It's not symbolic when it's detached.
14:25 ^7heo moritz: fetches then merges (or rebases)
14:26 ^7heo qqx: right
14:26 fahadash joined #git
14:26 Derderderd joined #git
14:26 ^7heo _ikke_: their implementation is different, right.
14:26 ExoUNX joined #git
14:26 ^7heo _ikke_: but semantically they're close.
14:26 nickabbey joined #git
14:26 theoceaniscool joined #git
14:27 romerocesar_ joined #git
14:27 grawity don't open the nitpicker's corner if you can't handle being on the receiving end of the same
14:27 diogenese joined #git
14:28 ^7heo grawity: saying that people commit to dev branches really isn't nitpicking...
14:28 john___ joined #git
14:28 ^7heo grawity: it's not a corner case at all.
14:30 hahuang61 joined #git
14:32 geoid joined #git
14:34 swift1 joined #git
14:34 qwerty2 joined #git
14:37 GodGinrai joined #git
14:40 bronson joined #git
14:42 snowkidind joined #git
14:42 griffindy joined #git
14:43 bsanford joined #git
14:44 geoid joined #git
14:48 mizu_no_oto joined #git
14:48 salamanderrake joined #git
14:51 robics joined #git
14:52 nowhereman joined #git
14:52 boombatower joined #git
14:55 kineticrootkit[m joined #git
14:55 monomon[m] joined #git
14:55 mtso[m] joined #git
14:55 M-shine joined #git
14:55 kikijiki[m] joined #git
14:55 M-nated joined #git
14:55 enjunear[m] joined #git
14:55 unclechu joined #git
14:55 samwise[m] joined #git
14:55 am2on joined #git
14:55 saintaquinas[m] joined #git
14:55 warrantyvoid joined #git
14:55 M-meznak joined #git
14:55 Tiaan[m] joined #git
14:55 Dhanya[m] joined #git
14:55 WillianPaiva[m] joined #git
14:55 alaeri[m] joined #git
14:55 srkrishna[m] joined #git
14:55 Ineentho[m] joined #git
14:55 Mher[m] joined #git
14:55 Start[m] joined #git
14:55 aviraldg joined #git
14:55 M-mistake joined #git
14:55 musicmatze[m] joined #git
14:55 Remramm joined #git
14:55 mei[m] joined #git
14:55 malo[m] joined #git
14:55 patrickr[m] joined #git
14:55 unilovelight[m] joined #git
14:55 davix[matrix] joined #git
14:55 daopu[m] joined #git
14:55 hallogallo[m] joined #git
14:55 scrambo[m] joined #git
14:55 timlyo[m] joined #git
14:55 eltopo[m] joined #git
14:55 Carlos[m] joined #git
14:55 M64137[m] joined #git
14:55 kjsage[m] joined #git
14:56 cyphase joined #git
14:56 nettoweb joined #git
14:57 _Vi joined #git
14:58 upenox joined #git
14:58 timothy joined #git
14:59 cyphase joined #git
15:00 cyphase joined #git
15:00 cyphase joined #git
15:04 nowhere_man joined #git
15:06 geoid joined #git
15:06 GodGinrai joined #git
15:07 _rnsanchez_ joined #git
15:07 romerocesar joined #git
15:08 kjsage[m] joined #git
15:08 M64137[m] joined #git
15:09 canton7 joined #git
15:09 aviraldg joined #git
15:09 BackEndCoder joined #git
15:09 dwmw2_gone joined #git
15:09 dviola joined #git
15:10 AndreSomers joined #git
15:10 Levex joined #git
15:10 spb joined #git
15:10 inflames joined #git
15:11 M-meznak joined #git
15:11 samwise[m] joined #git
15:11 Tiaan[m] joined #git
15:11 bouncy joined #git
15:12 ochorocho__ joined #git
15:12 john___ joined #git
15:14 mda1 joined #git
15:15 govg joined #git
15:15 aarobc joined #git
15:16 converge joined #git
15:16 unreal joined #git
15:16 nickabbey joined #git
15:18 dimi1947 joined #git
15:19 ResidentBiscuit joined #git
15:19 troyt joined #git
15:19 ResidentBiscuit joined #git
15:20 ResidentBiscuit joined #git
15:20 Linux-Ninja01_ joined #git
15:20 ResidentBiscuit joined #git
15:21 ResidentBiscuit joined #git
15:21 mirge joined #git
15:21 ResidentBiscuit joined #git
15:22 mirge looking for a sanity check on something that doesn't seem to add up for me on git diff's triple dot notation
15:23 mirge the docs say it's "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
15:23 cdg joined #git
15:23 mirge but when I have changes in my working tree, those commands give different output
15:23 grawity hmm, I thought it's equivalent to "git diff $(git merge-base A B) A B"
15:24 grawity oh wait, that doesn't make sense
15:24 mirge the former only diffs commited changes
15:24 mirge the latter includes changes in my working tree
15:24 venmx joined #git
15:24 mirge I'd expect the latter behavior
15:25 mirge seems like a bug (either in docs or implementation) but I've never encountered a bug before in git and figure I'm missing something
15:25 grawity maybe the latter just ends up running "git diff  B" because git-merge-base is not a valid command
15:25 grawity (it was valid a few years ago, and then everything got moved to `git` subcommands.)
15:26 mirge good point! but the same holds even when I do $(git merge-base A B)
15:26 grawity what does `git merge-base A B` actually output?
15:26 mirge the commit id of the merge base (as expected)
15:26 mirge that's the command that works as expected
15:27 mirge it's the fact that the triple dot version diffs against the B commit instead of the working tree
15:27 mirge that surprises me
15:27 cdg joined #git
15:27 grawity neither of those should diff against the working tree
15:27 jaafar joined #git
15:27 grawity since they both specify two commits to diff
15:28 mirge if you git diff <treeish> it diffs the treeish and your working tree
15:28 grawity but neither of these is "git diff <treeish>"
15:28 Dougie187 joined #git
15:28 mentazoom joined #git
15:28 mirge and the scales fall from my eyes!
15:28 mirge thanks!
15:28 grawity `git diff $(git merge-base A B) B` has *two* commits; it diffs $(git merge-base A B) against B
15:29 grawity likewise A...B
15:29 bongjovi joined #git
15:29 mirge yup yup, everything is illuminated - thanks
15:29 mirge I was leaving off the B when I typed it
15:29 perlpilot joined #git
15:30 sofiero joined #git
15:34 overbyte joined #git
15:34 leeN joined #git
15:35 AaronMT joined #git
15:35 nickabbey joined #git
15:35 sofiero c
15:36 irco joined #git
15:37 WhiskerBiscuit joined #git
15:37 Derderderd joined #git
15:38 Vampire0 java
15:40 sofiero is it possible to name a stash
15:40 joshsyn joined #git
15:41 Vampire0 sofiero, you can give it a message that you can see in the list of stashes and use to apply or pop it and you can tag it.
15:41 achadwick joined #git
15:42 sofiero ok thanks, how? 'git stash somename'?
15:43 Vampire0 yes
15:43 denisMone joined #git
15:47 mentazoom joined #git
15:49 dreampwnzor joined #git
15:49 moei joined #git
15:49 mischat joined #git
15:50 mirge try "git stash save this is a stash name"
15:50 elvin joined #git
15:50 mirge it's more of a message than a name
15:50 mirge it'll show up in git stash list
15:51 nitrospectide joined #git
15:51 elvin Hi all. In git flow I created a feature branch then merged it to develop branch. Now I need this specific feature as a hotfix on our current prod (before current develop gets a release), how do I do that?
15:52 _ikke_ elvin: cherry-pick the commits on the hotfix branch
15:52 elvin wouldn't it cause duplication of commits later when develop gets merged to prod?
15:52 nitrospectide If I issue the command: git checkout 27075fe -- path/to/the/folder/ I should get the full contents of that folder that was in the working copy at that commit - not just the file changed in that commit - right?
15:52 afuentes joined #git
15:53 qwerty2 joined #git
15:55 danslo joined #git
15:56 Limes_ joined #git
15:57 Orbitrix joined #git
15:57 danslo joined #git
15:58 Random832 elvin, yeah, so?
15:58 elvin fair enough ) thanks
15:59 Random832 i mean if your feature branch is off the master branch you could just merge the feature branch to prod
15:59 elvin Are you familiar with git-flow?
15:59 elvin because in git-flow a feature branch is off the develop branch
16:00 jnavila joined #git
16:00 elvin which could be way ahead of master
16:00 Random832 ah then yeah do the cherry-pick
16:01 Vampire0 nitrospectide, yes
16:01 e14 joined #git
16:01 nitrospectide Vampire0: Thanks
16:04 mizu_no_oto joined #git
16:04 synthroid joined #git
16:05 Vampire0 nitrospectide, yw
16:05 lvns joined #git
16:05 nitrospectide Vampire0: I only see that folder checkout anecdotally mentioned here: https://git-scm.com/docs/git-checkout
16:06 nitrospectide Where would I find explicit documentation on it?
16:06 nitrospectide (Sorry, not too familiar with the docs)
16:08 Linux-Ninja01_ joined #git
16:09 synthroi_ joined #git
16:09 Vampire0 nitrospectide, anecdotally? There is a full section with three paragraphs about it. o_O
16:10 Linux-Ninja01 joined #git
16:10 jnavila joined #git
16:10 peeps[lappy] joined #git
16:13 heroux joined #git
16:14 raspado joined #git
16:14 nitrospectide Vampire0: I scanned, didn't read closely, and didn't notice it. Are you referring to this?
16:14 nitrospectide git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>
16:16 e14 joined #git
16:19 dave0x6d joined #git
16:19 chandu20 joined #git
16:19 chandu20_ joined #git
16:20 feodaron joined #git
16:20 elvin even cherry-pick didn't really work. so I have master (prod) and develop (dev). git-flow feature branches from dev. I implement a feature, git-flow feature finish it, it gets merged to develop. Now I need the same feature to be a hotfix. I git-flow hotfix start, cherry-pick the commits from a develop branch, and git-flow hotfix finish - now this tries to push the commit to both master and develop,
16:20 elvin which fails. God I hate git flow.
16:22 mindfart joined #git
16:23 lucianangelus joined #git
16:23 Vampire0 nitrospectide, yes, that's the section in question
16:24 jaguarmagenta joined #git
16:25 venmx joined #git
16:26 blackwind_123 joined #git
16:26 e14 joined #git
16:26 shinnya joined #git
16:26 timnuwin joined #git
16:27 jccn joined #git
16:27 timnuwin hey do you know how to switch the branch that made the last commit in the repo?
16:27 lvns joined #git
16:27 timnuwin switch to the*
16:28 tmk joined #git
16:28 _ikke_ timnuwin: There is nothing in git that records what branch created the last commit
16:29 timnuwin ic
16:29 Remramm joined #git
16:29 Remramm joined #git
16:30 romerocesar joined #git
16:31 hahuang61 joined #git
16:32 Salander27 joined #git
16:33 lvns joined #git
16:34 durham joined #git
16:34 synthroid joined #git
16:35 Vampire0 timnuwin, how do you define "that made the last commit"? You can iterate through the branches, find the commit with the latest commit date and check this branch out if that is what you meant
16:35 durham joined #git
16:35 timnuwin Vampire0: I mean made the last push**
16:36 timnuwin Vampire0: I have a jenkins job that monitors any changes in bitbucket.  I would like to build the branch that just made a push to the repo
16:37 Acip joined #git
16:38 mischat_ joined #git
16:39 lvns joined #git
16:39 lucianangelus joined #git
16:40 Vampire0 timnuwin, a branch does not push, a user pushes one or more branches to a repository
16:41 elvin so here's a plan: imagine that, using a git flow, I have a feature in develop. I now want to do a hotfix of this feature. I git-flow hotfix off master, cherry-pick the commits, git-flow hotfix finish (which causes conflicts in develop), do a "whatever" merge of the develop branch and then manually push master but retain develop; after master is pushed, I revert develop branch to its initial state.
16:41 elvin Will that work? Will that break git-flow?
16:41 bronson joined #git
16:41 Vampire0 timnuwin, maybe make one Jenkins job per branch that fires when there was a change to the respective branch?
16:41 diego2 joined #git
16:42 diego2 joined #git
16:42 emg joined #git
16:44 Derderderd joined #git
16:44 arnoldoree joined #git
16:44 tang^ joined #git
16:49 giraffe joined #git
16:51 emg joined #git
16:52 cdg joined #git
16:55 rath joined #git
16:55 dcpc007 left #git
16:57 lvns joined #git
17:01 steeze joined #git
17:02 Salander27 joined #git
17:02 encod3 joined #git
17:03 robotroll joined #git
17:04 lvns joined #git
17:06 Nilesh_ joined #git
17:06 DrRobotic joined #git
17:07 elvin In "git branch <branchname> [<start-point>]" what is <start-point>? A commit somewhere along the current branches' history of commits?
17:07 _ikke_ any committish
17:08 qqx elvin: That specifies what commit you want the branch to point to when it's created.
17:09 elvin thanks
17:09 howitdo joined #git
17:10 SwingShock joined #git
17:10 SwingShock Is it possible to add a shortcut to desktop with git bash like how it can be done with git gui ?
17:10 bronson joined #git
17:11 tang^ which desktop?
17:11 SwingShock windows.
17:11 tang^ git usually installs a Git Bash shortcut
17:11 canton7 SwingShock, you can go to start menu -> Git Bash, click and drag it onto the desktop
17:12 SwingShock i got git bash. what i meant was to create a shortcut that opens a git project.
17:12 cdg joined #git
17:12 nowhere_man joined #git
17:13 tang^ yeah, you can probably customise the shortcut to specify the startup directory
17:14 SwingShock In Git gui you can create a desktop shortcut in the repository menu. Same can be done with some command line with bash ?
17:14 anonymuse joined #git
17:14 tang^ no.
17:15 tang^ you'll have to do some manual work for command line options
17:15 tang^ however, git for windows also integrates into explorer with a GIt Bash Here option
17:15 SwingShock yes. i am using that.
17:15 pbrewczynski joined #git
17:16 SwingShock I think i will just create a shortcut of the folder that the project is in. So after opening it i will right click to git bash there.
17:16 finalbeta joined #git
17:16 howitdo joined #git
17:18 elvin in git-flow, git flow hotfix start [-F] <version> [<base>] -- what does <version> usually mean? is it used to actually provide a minor version, say, my latest release is 1.5 and this one should be 1.5.1?
17:19 _ikke_ yeah
17:19 blunaxela joined #git
17:19 Cavallari joined #git
17:19 _ikke_ it will call the branch something like hotfix-1.5.1
17:20 publio What's the standard method to update documentation in a master-develop-feature/* workflow? If it's relating to the current commit, I place it on that commit. But how can I handle planning for new (multiple) features?
17:20 Siegfried joined #git
17:21 Limes_ joined #git
17:21 elvin _ikke_: that's basically what I'm trying to understand, if I am expected to provide a meaningful name there explaining the essence of a hotfix or just the next number in line.
17:21 menip joined #git
17:22 GodGinrai publio: "documentation" meaning files in your repo that document your code?
17:22 watabou joined #git
17:22 publio GodGinrai: Yup, the docs folder.
17:23 GodGinrai I just make a commit when I add docs
17:23 GodGinrai for the docs
17:23 publio My docs on the current branch, should match the code on that branch
17:23 lvns joined #git
17:24 publio Which branch do you commit to?
17:24 Cavallari joined #git
17:25 cdg_ joined #git
17:26 venmx joined #git
17:27 GodGinrai publio: I always make a branch for new work or features
17:28 GodGinrai publio: if I am just adding docs, I would create a new branch for adding the docs
17:28 algun joined #git
17:28 GodGinrai publio: expand-docs for example
17:28 cdown_ joined #git
17:29 Cavallari joined #git
17:29 publio GodGinrai: Ok, so if we have feature/expand-docs with changes worth multiple feature/* branches, how would you merge the docs to a feature branch?
17:30 publio Keeping in mind, we don't want unfinished features in the docs for the finished feature
17:30 ToBeCloud joined #git
17:30 durham joined #git
17:32 pwnz0r joined #git
17:33 publio Maybe it's better to make changes to docs in feature-sized pieces, in a feature/* branch?
17:34 jaguarmagenta joined #git
17:35 elvin okay, I have a solution in case anyone was wondering.
17:35 elvin Q: in git-flow, I started a feature, finished it (flow merged it to develop), now I want the same feature to be a hotfix in master, git-flow hotfix and cherry-picking gives me merge errors when git flow tries to push the cherry-picked commits back to develop (because develop is way ahead of master), what do I do?
17:35 elvin A: when starting a hotfix, use git merge-base to look up the last common commit of master and develop, then git-flow hotfix start using that very commit as [BASE]. Cherry-pick your changes from develop to hotfix branch, use git-flow hotfix finish as usual. This will cause no merge issues.
17:35 subhojit777 joined #git
17:35 elvin (and drop git-flow as the last step)
17:36 svm_invictvs joined #git
17:36 aard_ joined #git
17:36 GodGinrai publio: I'd merge the docs into master when the features they document are all merged into master
17:37 hhee joined #git
17:37 GodGinrai publio: you could also have separate branches for each documented feature, but in that case, why not just make the docs changes in the feature branch for the feature they document?
17:37 nikivi joined #git
17:37 hhee guys, add directory in workcopy, tried git add . but it's not added. what i did wrong?
17:38 ntnn joined #git
17:39 publio GodGinrai: Right, I meant that second option. But merging to master seems like a nice, simple solution. The only (minor) issue is code will go without documentation in the feature and develop branches. But that's reasonable
17:39 GodGinrai hhee: are there any files in the directory?
17:39 hhee GodGinrai, yep.
17:39 Gsham joined #git
17:39 hhee and access right is fine
17:40 israelzuniga joined #git
17:40 hhee when i do git clone URL in another place - is cloned with out those files, the just didn't added
17:40 hhee they*
17:40 Darren_ joined #git
17:42 kyan joined #git
17:42 GodGinrai hhee: unless you commit after a git-add and then push, the files added won't be available in a clone
17:42 hhee GodGinrai, got it, i'll try
17:43 elvin left #git
17:43 madewokherd joined #git
17:43 lvns joined #git
17:43 jnavila joined #git
17:44 nicksloan joined #git
17:44 setuid left #git
17:44 hhee GodGinrai, only added empty folder, without files. (in my workcopy they exactly exists)
17:45 hhee it looks like i need reset repo.. dunno.
17:48 GodGinrai hhee: Git doesn't track folders.  You can't add an empty folder without files
17:49 hhee GodGinrai, well. i did
17:50 nowhere_man joined #git
17:50 GodGinrai hhee: you mean you *attempted*
17:50 GodGinrai you can't add an empty folder
17:50 GodGinrai you would have to put a dummy file in it
17:50 Vampire0 hhee, you cannot have done, that is technically impossible
17:51 WhiskerBiscuit joined #git
17:51 SwingShock How to checkout back to a previous commit ?
17:51 xall joined #git
17:52 hhee GodGinrai, Vampire0 guys. i have added directory WITH files in my workcopy. when git commit, git pull, git push. AND there is emplty directory in repo, without file which i have locally
17:52 GodGinrai SwingShock: git checkout previouscommit
17:52 tmsmith joined #git
17:52 SwingShock I am a beginner. Just want to go back to how it was in a previous commit. Want to turn the folder to that version.
17:52 GodGinrai SwingShock: you want to revert your changes?
17:52 hhee SwingShock, i just added them. these file didn't exists in previous commits
17:53 hhee files* and directory*
17:53 nickabbey joined #git
17:53 lvns joined #git
17:54 SwingShock Previous commit is not working. How do show all previous commits ?
17:54 GodGinrai SwingShock: previouscommit was supposed to be the hash for your previous commit.  But don't try that anymore, because I think you want to do something different than what I was telling you
17:54 jimi_ joined #git
17:55 mentazoom joined #git
17:55 GodGinrai SwingShock: answer my question: why do you want to checkout a previous commit?
17:56 SwingShock Yes.
17:56 GodGinrai Yes you want to revert your changes?
17:57 lvns joined #git
17:57 fuchsi joined #git
17:57 SwingShock I want to basically see a list of all the commits or recent commits would be fine to. Then i would like to switch back and forth between then like checking out different past versions.
17:57 thiago joined #git
17:57 GodGinrai ok, seeing the list is easy: `git log`
17:57 SwingShock I just want to check them out. I don't want to permanently go back to that commit.
17:57 SwingShock k
17:58 GodGinrai For switching out between them, grab that long hash that each entry in the log has
17:58 GodGinrai and use `git checkout <thathash>`
17:58 GodGinrai and to checkout your branch tip again, just use `git checkout HEAD`
17:58 Vampire0 SwingShock, or for previous commit (parent of currently checked out), simply `git checkout @~`
17:59 Nac joined #git
17:59 lvns joined #git
17:59 Vampire0 hhee, what does git status say? It is technically not possible that Git tracked an empty directory and created it on pull.
18:00 tmk joined #git
18:00 SwingShock How do i go back to latest commit again ?
18:00 hhee Vampire0, git status didn't see them
18:00 SwingShock It's all working now.
18:00 Boniche joined #git
18:01 jaguarmagenta joined #git
18:02 Vampire0 SwingShock, `git checkout master` if master is the branch you want to checkout
18:02 nettoweb joined #git
18:03 SwingShock Will it automatically take me to the latest commit too in that branch ?
18:03 GodGinrai `git checkout HEAD` is latest commit
18:03 Vampire0 hhee, what does "didn't see them" mean? when didn't it see them where? does it see them now? where?
18:03 GodGinrai SwingShock: see my above comment ^
18:03 Vampire0 GodGinrai, no, it is not. It is a no-op, because HEAD is always where you currently are
18:03 GodGinrai oh wait
18:03 GodGinrai you're right
18:03 GodGinrai hrmm
18:03 hhee Vampire0, when i added them. git status didn't show it.
18:03 SwingShock Yes. The HEAD command didn't work.
18:04 matsaman joined #git
18:04 Vampire0 SwingShock, a branch is just a post-it on a commit. If you checkout the branch, then yes, you will be at the latest commit in that branch, as that is where the post-it sticks
18:04 mario_ joined #git
18:04 Vampire0 hhee,  what *did* git status show then?
18:04 nicoulaj joined #git
18:05 romerocesar joined #git
18:05 SwingShock Now it shows HEAD detached at b5d8229
18:07 Vampire0 SwingShock, "Now" means after you did what? !zombie
18:07 gitinfo SwingShock: Brainzz! More brainzzzz!  For information about detached heads, see !detached
18:08 SwingShock Yes. No problem now. I got it to master again. What is a head really ?\
18:09 GodGinrai SwingShock: well, after you get your detached head problem fixed, I found out that the command for switching back to the last commit you checked out (which would be the most recent one assuming you checked out only once) would be `git checkout -`
18:10 vdv joined #git
18:10 cagedwisdom joined #git
18:10 SwingShock That's useful as well.
18:10 spacelord_ joined #git
18:11 bronson joined #git
18:13 Vampire0 SwingShock, but checking out the parent, then the grand-parent, then checking out - goes back to the parent, not to the last branch you were on and - again goes back to the grand-parent. Just to keep in mind
18:13 GodGinrai and a brute force method of going to the most recent commit in your current branch would be this:
18:13 Vampire0 SwingShock, there is not "a head", there is only *the* HEAD
18:13 mda joined #git
18:14 Vampire0 SwingShock, and HEAD is simply a pointer to where you currently are, meaning what you currently have checked out
18:14 fahadash joined #git
18:14 SwingShock What do you mean by a grand parent ? If all commits are linear and branches are just post-it's on commits.
18:14 GodGinrai `git checkout "$(git branch | awk '/\*/ { print $2 }')"
18:15 Vampire0 SwingShock, if what you currently have checked out is not a branch, but a tag or simple commit (even if the commit happens to be the latest on one or more branches) you have a so-called detached HEAD as it is not attached to a branch
18:15 GodGinrai `
18:15 GodGinrai the backticks are not needed
18:15 GodGinrai but the double and single quotes are
18:15 Vampire0 GodGinrai, what should that do? if you have a detached head, the star is at the detached commit, not at the branch where you last were
18:15 GodGinrai SwingShock: commits aren't linear because git supports merges
18:16 Vampire0 SwingShock, the grand-parent is the parent of the parent
18:16 GodGinrai Vampire0: I said the latest commit in the current branch, which was his original question.  Detached head isn't pointing to a branch
18:16 SwingShock So there is hierarchy when using branches ?
18:16 GodGinrai Vampire0: in other words, I'm not solving his detached head problem.  You seem to be helping him with that already
18:17 Vampire0 SwingShock, parent grand-parent *commit*, not branch
18:17 durham joined #git
18:17 Vampire0 GodGinrai, if there is a current branch, then you ARE at the latest commit. If you are not at the latest commit, you have a detached head and thus you are not on any branch
18:17 SwingShock So each new commit i add is a child of the previous commit ?
18:17 Vampire0 actually you can even be on the latest commit of some branch and still not be on the branch
18:17 Vampire0 SwingShock, yes
18:18 _ikke_ ssh irc
18:18 GodGinrai Vampire0: no, if you are viewing a previous commit in the same branch, you are not in detached head
18:18 Vampire0 SwingShock, it is a DAG
18:18 SwingShock Yes. Now i get it.
18:18 Vampire0 GodGinrai, yes, you are
18:18 GodGinrai Vampire0: no, no you aren't
18:18 GodGinrai https://git-scm.com/docs/git-checkout
18:18 Vampire0 GodGinrai, why do you say this?
18:19 Vampire0 what exactly do you mean GodGinrai?
18:19 GodGinrai oh wait
18:19 Vampire0 ;-)
18:19 GodGinrai I got confused by the diagrams position
18:19 GodGinrai I thought the text referred to the diagram below
18:19 GodGinrai where the commit was made
18:19 GodGinrai :(
18:19 GodGinrai god I'm just off today
18:19 GodGinrai I should go home <.<
18:19 denisMone joined #git
18:20 hahuang61 joined #git
18:20 Vampire0 GodGinrai, me too, sitting too long at work for a friday already
18:20 Vampire0 bye
18:20 GodGinrai cya
18:24 al-damiri joined #git
18:24 nickthetait joined #git
18:25 ki0 joined #git
18:26 hramrach any idea why 'git tag --contains' returns v4.9 for 8bf371e but not for d894be5 http://paste.debian.net/902528/
18:26 hramrach in Linux
18:26 venmx joined #git
18:27 tag joined #git
18:29 davimore joined #git
18:30 Vampire0 hramrach, well, on which commit IS the tag?
18:31 Guest66606 joined #git
18:32 Vampire0 hramrach, If the tag is on 27058af, bb598c1 or 0b42f25, it is strange. If it is on 8bf371e, 6dbcd8f, b7f193d, e1fac0a or 4ee12ef then it is correct
18:32 King_Hual joined #git
18:32 King_Hual joined #git
18:34 mikecmpbll joined #git
18:37 timvisher joined #git
18:39 nowhere_man joined #git
18:43 jstein_ joined #git
18:43 zivester joined #git
18:45 diogenese joined #git
18:45 nowhere_man joined #git
18:47 phroa joined #git
18:47 cdg joined #git
18:49 jaguarma_ joined #git
18:49 Noldorin joined #git
18:49 joshszep joined #git
18:51 joshszep joined #git
18:51 nicoulaj joined #git
18:51 mischat joined #git
18:51 kpraveen joined #git
18:51 [0xAA] joined #git
18:52 Electrometro joined #git
18:52 steven can I somehow tell git to use the official templatedir AND additonally one I set with init.templatedir?
18:52 govg joined #git
18:53 _nwkj86 joined #git
18:54 ochorocho__ joined #git
18:58 duderonomy joined #git
19:00 davimore_ joined #git
19:00 xall joined #git
19:03 kazantip joined #git
19:04 romerocesar joined #git
19:06 TomyLobo joined #git
19:07 Hink joined #git
19:07 mda1 joined #git
19:08 Guest66606 joined #git
19:08 breezy_ joined #git
19:10 mentazoom joined #git
19:10 anonymuse joined #git
19:10 Ldip joined #git
19:11 Singmyr joined #git
19:12 e14 joined #git
19:13 YuGiOhJCJ joined #git
19:14 romerocesar joined #git
19:14 Sasazuka joined #git
19:14 Ahmed90 joined #git
19:15 aw1 joined #git
19:19 hhee guys, one more question
19:20 hhee i tried to add directory with files in my workcopy (and then i want to commit it in remote repo) but git status show me only directory, NOT file within
19:22 Noldorin joined #git
19:24 svm_invictvs joined #git
19:25 ilmari hhee: git status only shows the topmost unknown thing
19:25 ilmari hhee: if you git add the directory it'll add all non-ignored files and directories in it
19:25 hhee ilmari, earlier git status show me and files within folders..
19:26 Jackneill joined #git
19:26 hhee ilmari, yep. i also wrote git add .
19:26 irqq joined #git
19:26 hhee but git status show me only one string with directory
19:26 ilmari once you add them it'll show individual files
19:26 ilmari hhee: under untracked files or changes to be committed?
19:26 lvns joined #git
19:27 venmx joined #git
19:29 freimatz joined #git
19:29 hhee ilmari, well... i have a folder with files in it. i add directory in my workcopy. then git add . then git status, but only one string shown me, without files
19:29 ujp8 joined #git
19:29 hramrach Vampire0: it's the Linux tree and I don't know how to filter commits to include in the graph to make sense of this
19:29 hhee shown oly directory
19:30 hhee only*
19:30 hramrach v4.9 appears to be descendant of 4ee12ef but not 0b42f25
19:31 tag joined #git
19:31 GodGinrai joined #git
19:33 hramrach hm, I guess d894be5 was in some net tree and did not get merged into master before v4.9 but will in time ger some v4.10rc tag
19:34 hramrach and the graph is backwards showing master as the rightmost branch, probably
19:35 ilmari hhee: but what is the header above that directory name?
19:35 hramrach ok, I guess I get it now
19:35 hramrach thanks for help
19:36 jasondockers joined #git
19:37 Orbitrix joined #git
19:39 hhee ilmari, not understood your question. (sorry for my english)
19:39 ilmari hhee: please !paste the entire 'git status' output
19:39 gitinfo hhee: Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
19:40 Zvt joined #git
19:41 mda joined #git
19:42 hhee ilmari, one min
19:42 Balliad joined #git
19:43 kpraveen joined #git
19:44 xall joined #git
19:44 _Vi joined #git
19:45 joshszep joined #git
19:45 ahmedelgabri joined #git
19:49 multi_io_ joined #git
19:49 judson_ joined #git
19:49 judson_ When using commit.gpgSign, is there a way to get git to echo to the terminal a message that it needs a signature?
19:50 judson_ I will sometimes miss the pinentry popup as I wait for git to finish a commit/rebase
19:51 AaronMT joined #git
19:53 ahmed_elgabri joined #git
19:54 nickabbey joined #git
19:54 mischat joined #git
19:55 ResidentBiscuit joined #git
19:55 CheckDavid joined #git
19:55 mischat joined #git
19:55 ResidentBiscuit joined #git
19:56 ResidentBiscuit joined #git
19:57 tmsmith joined #git
19:58 JSharpe joined #git
19:59 LeMike joined #git
19:59 JSharpe joined #git
19:59 Sample joined #git
20:01 dreiss joined #git
20:02 AaronMT joined #git
20:02 invisbl_ joined #git
20:03 Guest55 joined #git
20:03 hhee ilmari, all works fine, i removed one more time directory from workcopy, then add again. and all ok. maybe filesystem issue
20:04 hhee ilmari, maybe ssd glitch
20:05 KV joined #git
20:06 dsantiago joined #git
20:06 romerocesar_ joined #git
20:08 invisbl joined #git
20:12 bronson joined #git
20:13 noecc left #git
20:15 lvns joined #git
20:16 romerocesar joined #git
20:18 finalbeta joined #git
20:22 cdown joined #git
20:28 tang^_ joined #git
20:28 venmx joined #git
20:29 zivester joined #git
20:30 romerocesar joined #git
20:31 chachasmooth joined #git
20:31 sea-gull joined #git
20:33 romerocesar joined #git
20:33 jccn joined #git
20:35 dreiss joined #git
20:36 jasondockers__ joined #git
20:36 jasondockers__ joined #git
20:41 AaronMT joined #git
20:41 astrofog joined #git
20:43 brent__ joined #git
20:44 nd_ joined #git
20:45 dave0x6d joined #git
20:45 nikivi joined #git
20:47 holgersson joined #git
20:50 romerocesar joined #git
20:51 [Saint] joined #git
21:00 romerocesar joined #git
21:00 vuoto joined #git
21:01 finalbeta joined #git
21:01 earth__ joined #git
21:03 ahmedelgabri joined #git
21:05 askb joined #git
21:07 jasondockers__ git is refusing to use my correct email address. I've tried git config --global --replace-all user.email <email>, I've set the environmental variable, and nothing is working.
21:08 jasondockers__ is there something like `git config --remove-all`?
21:08 jasondockers__ to clear the configuration
21:09 pothepanda joined #git
21:10 hanthings joined #git
21:10 corn13read joined #git
21:10 howitdo joined #git
21:11 romerocesar joined #git
21:13 jstimm joined #git
21:14 tmg joined #git
21:16 jasondockers__ the correct address is also specified in my .gitconfig
21:16 khagler joined #git
21:16 denisMone joined #git
21:18 cdg joined #git
21:20 cdown_ joined #git
21:20 ochorocho__ joined #git
21:24 venmx joined #git
21:25 Miika-- joined #git
21:25 dsteplight__ joined #git
21:26 Miika-- Hello, what's the difference between author and commit dates on git log output?
21:26 jaguarmagenta joined #git
21:26 WhiskerBiscuit joined #git
21:28 nettoweb joined #git
21:30 Dougie187 joined #git
21:30 curiousmansi joined #git
21:31 bremner Miika--: you make a patch, send it to me, I wait six months before commiting the patch
21:31 bremner for example
21:31 bremner see also rebase
21:32 WakiMiko_ joined #git
21:32 boombatower joined #git
21:32 mda1 joined #git
21:32 dsantiago joined #git
21:33 howitdo joined #git
21:34 jasondockers__ can I tell git to use a certain email address inline with a git push command? i.e., git push origin master --config user.email <email>?
21:35 cdown joined #git
21:35 venmx joined #git
21:36 jnewt joined #git
21:36 bremner jasondockers__: no, email address is relevant at commit time, not push time
21:36 durham joined #git
21:36 jasondockers__ bremner, to kind of repeat myself above: git keeps using my wrong email address. I've tried `git config --global --replace-all user.email <email>', I've tried `git config user.email <email>' and `git config --global user.email <email>.' I can't even see the email address it's using listed in git config --list
21:37 bremner is this on windows or something weird?
21:37 jasondockers__ and I changed the environmental variable
21:37 jasondockers__ windows
21:37 bremner ok, dunno then. Normally I'd tell you to inspect ~/.gitconfig
21:37 jasondockers__ can I tell git to ignore the gitconfig?
21:37 jasondockers__ or point it to somewhere it doesn't exist?
21:38 jasondockers__ I actually changed the .gitconfig and it's correct
21:38 Miika-- bremner: so my date is author date and when you merge it, it's the commit date?
21:39 bremner Miika--: not merge it, when I commit it.
21:39 Miika-- ok
21:39 Miika-- thanks
21:39 bremner jasondockers__:  what is the output of "git config --list | grep email"
21:40 spacelord_ joined #git
21:40 jasondockers__ bremner, windows doesn't have grep. but there are two emails listed and they're both correct.
21:41 manuel_ joined #git
21:41 nanga joined #git
21:42 bremner jasondockers__: and when you commit now, are those emails used?
21:42 jasondockers__ apparently not
21:42 bremner wtf does that mean?
21:42 jasondockers__ they are not
21:42 bremner and in the git repo, is there an email configured?
21:42 jasondockers__ yes
21:43 jasondockers__ it's the correct one
21:43 bremner no idea then.
21:43 jasondockers__ maybe reinstalling could help
21:44 jasondockers__ bremner, thanks
21:45 jasondockers__ this is insane
21:48 dsantiago joined #git
21:49 tyreld joined #git
21:50 nikivi joined #git
21:51 Darren_ joined #git
21:55 tyreld joined #git
21:57 dsantiago joined #git
22:00 Atm0spher1c joined #git
22:00 dsantiago joined #git
22:01 ash_workz joined #git
22:02 durham joined #git
22:03 mda joined #git
22:06 rwb joined #git
22:07 roygbiv joined #git
22:07 Vampire0 jasondockers__, Windows does have grep if you install it. And actually if you installed Git for Windows, you also already installed one of the grep variants for Windows ;-)
22:08 jasondockers__ Vampire0, ah, okay. well, I can't invoke it since it wasn't added to my PATH
22:09 jstimm joined #git
22:09 jasondockers__ doesn't git for windows ship with a little version of mingw?
22:09 Vampire0 Yes, also
22:09 Vampire0 And if you use the git-bash, grep will be in your path
22:10 diogenese joined #git
22:10 Vampire0 But even if not, you can call it with the full path to it, even if you don't add it to your PATH
22:10 Limes_ joined #git
22:10 Vampire0 If you now make a new commit (*not push*, but commit) it is using the wrong e-mail address?
22:11 moestevens joined #git
22:11 lvns joined #git
22:12 Vampire0 jasondockers__?
22:12 jasondockers__ Vampire0, it is still committing under the wrong name
22:13 jasondockers__ well, email
22:13 bronson joined #git
22:14 thunderbirdtr joined #git
22:15 afuentes joined #git
22:19 Vampire0 jasondockers__, do you have an environment variable where the email is in? Open a cmd.exe, execute "set" and examine the output. Maybe you have set COMMITER_EMAIL or how it is called that Git looks for
22:19 Vampire0 Or AUTHOR_EMAIL if it actually is the author e-mail you talk about
22:20 Vampire0 Also, are both, committer and author e-mail wrong, or only one of them?
22:20 jasondockers__ Vampire0, the environmental variable doesn't show up under set
22:21 dendazen joined #git
22:21 romerocesar joined #git
22:21 jasondockers__ Vampire0, one moment
22:21 King_Hual` joined #git
22:22 jasondockers__ Vampire0, both
22:22 nikivi joined #git
22:23 Vampire0 Really strange. If there is no environment variable, no config setting and no manually given config in the command, then this shouldn't be possible, but I guess I miss something
22:24 Vampire0 Is it at least some e-mail you know about jasondockers__?
22:24 YuGiOhJCJ joined #git
22:24 jasondockers__ yes
22:24 Vampire0 How are you using Git? Which user interface? command line? some GUI tool?
22:24 jstimm joined #git
22:25 jasondockers__ command line interface
22:25 jasondockers__ i've never trusted the GUI tools
22:26 jasondockers__ and by never trusted, I mean that I've never bothered to properly learn the icons.
22:26 Siegfried joined #git
22:27 durham joined #git
22:27 jasondockers__ (so more accurately, I've never trusted myself to use the GUI tools /tangent)
22:27 diogenese joined #git
22:28 astrofog joined #git
22:28 Vampire0 good decision, but then I don't see how this could happen
22:28 Vampire0 Is it the same from git-bash, or only from cmd.exe?
22:29 joshszep joined #git
22:31 durham_ joined #git
22:32 venmx joined #git
22:32 jasondockers__ Vampire0, oh what the hell. when I configure via git-bash it works
22:33 jasondockers__ ...I'll just use git-bash.
22:33 jasondockers__ good enough for me
22:33 jasondockers__ thanks, Vampire0
22:33 davimore__ joined #git
22:33 ProfessorKaos64 joined #git
22:33 Vampire0 jasondockers__, yw, whatever it was
22:34 ProfessorKaos64 Trying to get a single file, but this doesn't seem to be working, any help? git archive --format=tar --remote=git://github.com/ValveSoftware/steamos_kernel.git HEAD:drivers/input/joystick/xpad.c
22:35 buffal0 joined #git
22:35 valize joined #git
22:40 shgysk8zer0 joined #git
22:44 alex1a joined #git
22:46 [0xAA] joined #git
22:46 buffal0 joined #git
22:46 durham joined #git
22:49 elsevero joined #git
22:49 nivag joined #git
22:50 ygeLN joined #git
22:50 dirtyroshi joined #git
22:53 kyan joined #git
22:54 Vampire0 ProfessorKaos64, don't even try. GitHub does not support this.
22:54 ProfessorKaos64 I saw examples for some use cases, but maybe that was strict git not GitHub as you say
22:54 ProfessorKaos64 oh well, I was going to me a -git version of an AUR package, but the repo is 850 MB plus unchecked
22:55 invisbl joined #git
22:56 corn13read joined #git
22:57 invisbl joined #git
23:00 Zarthus The Github API or just plain https supports downloading a single file via wget/curl
23:01 fmeerkoetter joined #git
23:01 upenox joined #git
23:01 durham joined #git
23:03 Zarthus https://api.github.com/repos/valvesoftware/steamos_kernel/contents/drivers/input/joystick/xpad.c  ProfessorKaos64
23:04 theoceaniscool joined #git
23:05 nicksloan joined #git
23:06 holgersson joined #git
23:08 conejita23 joined #git
23:10 holodoc joined #git
23:15 whitby joined #git
23:18 mentazoom joined #git
23:19 conejita23 left #git
23:20 DolpheenDream joined #git
23:22 QualityAddict joined #git
23:22 robics joined #git
23:23 buffal0 joined #git
23:30 xcuv joined #git
23:34 lvns joined #git
23:36 corn13read joined #git
23:36 buffal0 joined #git
23:38 jstimm joined #git
23:39 kenoob joined #git
23:39 King_Hual joined #git
23:39 kenoob joined #git
23:40 peeps[lappy] joined #git
23:40 lvns joined #git
23:42 lvns joined #git
23:42 Darren_ joined #git
23:46 lvns joined #git
23:48 lvns joined #git
23:49 denisMone joined #git
23:51 lvns joined #git
23:54 joshszep joined #git
23:55 mp3 joined #git
23:56 m0viefreak joined #git
23:57 mizu_no_oto joined #git

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