| 2017-12-25 |
| → checkItOut joined | 00:00 |
| ← testnick123 left | 00:01 |
| ← JollyLage left | 00:03 |
| ← finalbeta left | 00:04 |
| ← checkItOut left | 00:04 |
| ← marlinc left | 00:06 |
| → Elon_Satoshi joined | 00:07 |
| → houami joined | 00:11 |
| → cqi joined | 00:12 |
| → scientes joined | 00:14 |
| ← rawste left | 00:16 |
| ← houami left | 00:16 |
| ← xcm left | 00:17 |
| → xcm joined | 00:18 |
| ← vilez left | 00:22 |
| → marlinc joined | 00:23 |
| → swalladge joined | 00:24 |
| → mikecmpbll joined | 00:31 |
| → houami joined | 00:31 |
| ← KeyJoo left | 00:33 |
| ← jstein left | 00:36 |
| ← houami left | 00:36 |
| ← xcm left | 00:40 |
| → xcm joined | 00:40 |
| ← dsdeiz left | 00:41 |
| → dsdeiz joined | 00:42 |
| ← dsdeiz left | 00:42 |
| → dsdeiz joined | 00:42 |
| ← cqi left | 00:43 |
| ← raijin left | 00:44 |
| → cqi joined | 00:46 |
| ← justanotheruser left | 00:49 |
| ← Darcidride left | 00:54 |
| ← Murr left | 00:57 |
| → Murr joined | 00:57 |
|
matthiaskrgr
| hm | 00:58 |
|
| is there anyway way to get git count-objects sizes in bytes instead of kiloybytes ? :/ | 00:58 |
| → jameser joined | 00:58 |
| ← rorro left | 00:59 |
| ← mikecmpbll left | 00:59 |
| → raijin joined | 01:00 |
| → justanotheruser joined | 01:01 |
| → houami joined | 01:01 |
| → varanese joined | 01:02 |
| → HuskyApocalypse joined | 01:04 |
| ← houami left | 01:06 |
| ← cqi left | 01:08 |
| → meadmoon joined | 01:09 |
| → houami joined | 01:11 |
| → zzz joined | 01:13 |
| ← whitby left | 01:14 |
| justanotheruser → justan0theruser | 01:14 |
| → whitby joined | 01:15 |
| → cqi joined | 01:15 |
| ← houami left | 01:16 |
| ← FoxRocks left | 01:17 |
| → FoxRocks joined | 01:18 |
| → jughead joined | 01:20 |
| → houami joined | 01:21 |
| ← jughead left | 01:22 |
| ← houami left | 01:26 |
| ← energizer left | 01:27 |
| → energizer joined | 01:27 |
| ← FoxRocks left | 01:28 |
| → checkItOut joined | 01:31 |
| → houami joined | 01:31 |
| → checkItO_ joined | 01:34 |
| ← checkItOut left | 01:34 |
| ← houami left | 01:35 |
|
bremner
| multiply by 1024? | 01:36 |
| → sz0 joined | 01:38 |
| ← checkItO_ left | 01:38 |
| → checkItOut joined | 01:39 |
| → neil_cn joined | 01:45 |
| → h12o joined | 01:47 |
| ← varanese left | 01:48 |
| ← CheckDavid left | 01:49 |
| → yohnnyjoe joined | 01:49 |
| ← hussam left | 01:50 |
| ← h12o left | 01:51 |
| → PuppyApocalypse joined | 01:52 |
| ← yohnnyjoe left | 01:54 |
| ← dsdeiz left | 01:56 |
| ← meadmoon left | 01:57 |
| → dsdeiz joined | 01:57 |
| → h12o joined | 01:57 |
| ← brainpro1 left | 01:59 |
| → houami joined | 02:01 |
| ← h12o left | 02:02 |
| → linuxmodder joined | 02:04 |
| ← linuxmodder left | 02:04 |
| → linuxmodder joined | 02:04 |
| → finalbeta joined | 02:05 |
| ← linuxmodder left | 02:05 |
| ← houami left | 02:05 |
| → linuxmodder joined | 02:05 |
| ← linuxmodder left | 02:06 |
| → linuxmodder joined | 02:07 |
| ← linuxmodder left | 02:08 |
| → linuxmodder joined | 02:08 |
| ← linuxmodder left | 02:09 |
| ← menip left | 02:11 |
| → linuxmodder joined | 02:11 |
| ← henriquev left | 02:14 |
| ← cdown left | 02:15 |
| → mizu_no_oto joined | 02:17 |
| ← phinxy left | 02:18 |
| ← Tobbi left | 02:20 |
| ← nixdork left | 02:22 |
| → menip joined | 02:24 |
| ← Amanas left | 02:24 |
| ← vush left | 02:25 |
| → shinnya joined | 02:26 |
| → brainpro1 joined | 02:27 |
| → nixdork joined | 02:28 |
| ← scientes left | 02:30 |
| → checkItO_ joined | 02:30 |
| ← checkItO_ left | 02:31 |
| → checkItO_ joined | 02:32 |
| ← menip left | 02:32 |
| ← checkItOut left | 02:33 |
| → vush joined | 02:35 |
| ← Mike11 left | 02:36 |
| ← linuxmodder left | 02:36 |
| ← hash-z3r0 left | 02:36 |
| ← konsolebox left | 02:39 |
| → testnick123 joined | 02:41 |
| → FoxRocks joined | 02:42 |
| → konsolebox joined | 02:42 |
| → linuxmodder joined | 02:44 |
| ← linuxmodder left | 02:44 |
| → linuxmodder joined | 02:44 |
| ← linuxmodder left | 02:45 |
| ← BenderRodriguez left | 02:45 |
| ← dsdeiz left | 02:46 |
| ← ilbot3 left | 02:46 |
| ← _ADN_ left | 02:46 |
| → BenderRodriguez joined | 02:46 |
| → dsdeiz joined | 02:48 |
| ← dsdeiz left | 02:48 |
| → dsdeiz joined | 02:48 |
| → menip joined | 02:49 |
| ← shinnya left | 02:59 |
| → ilbot3 joined | 02:59 |
| ← deltam left | 02:59 |
| → kasual joined | 03:02 |
| xcm → Guest47944 | 03:06 |
| ← Guest47944 left | 03:06 |
| → xcm joined | 03:06 |
| ← kasual left | 03:06 |
| ← mizu_no_oto left | 03:08 |
| → hash-z3r0 joined | 03:11 |
| → houami joined | 03:12 |
| ← leeN left | 03:12 |
| ← dsdeiz left | 03:17 |
| → dsdeiz joined | 03:18 |
| → dreiss joined | 03:19 |
| HuskyApocalypse → ChristmasCat | 03:20 |
| ← testnick123 left | 03:23 |
| McKraken_zzzzz → McKraken | 03:24 |
| → chachasmooth joined | 03:31 |
| → pdp11 joined | 03:32 |
| ← chachasmooth_ left | 03:34 |
| → jameser_ joined | 03:34 |
| ← navidr left | 03:35 |
| → Claw_wolf joined | 03:37 |
| ← Claw_wolf left | 03:37 |
| → Claw_wolf joined | 03:37 |
| ← jameser left | 03:38 |
| → mecasou joined | 03:39 |
|
mecasou
| Hi, is there a command to get all commits that include a given hash from git ls-tree? | 03:40 |
| → Masber_080 joined | 03:40 |
| ← houami left | 03:40 |
| ← masuberu left | 03:42 |
| → g00s joined | 03:48 |
| → yohnnyjoe joined | 03:50 |
| ← Hello71 left | 03:53 |
| → Hello71 joined | 03:54 |
| ← konsolebox left | 03:54 |
| → konsolebox joined | 03:55 |
| ← yohnnyjoe left | 03:55 |
| ← Claw_wolf left | 03:59 |
| → Claw_wolf joined | 04:00 |
| → dviola joined | 04:00 |
| ← lagothrix left | 04:00 |
| ← dviola left | 04:01 |
| → regedit joined | 04:01 |
| ← konsolebox left | 04:02 |
| ← pks left | 04:02 |
| ← jameser_ left | 04:02 |
| → konsolebox joined | 04:03 |
| → jameser joined | 04:03 |
| → pks joined | 04:05 |
| → lagothrix joined | 04:05 |
| ← PuppyApocalypse left | 04:12 |
| ← ToBeCloud left | 04:12 |
| ← checkItO_ left | 04:13 |
| → checkItOut joined | 04:15 |
| ← Claw_wolf left | 04:16 |
| → Claw_wolf joined | 04:16 |
| → h12o joined | 04:18 |
| → dviola joined | 04:19 |
| ← checkItOut left | 04:20 |
| → checkItOut joined | 04:21 |
| ← h12o left | 04:23 |
| ← gugah left | 04:24 |
| ← beco left | 04:25 |
| ← neil_cn left | 04:26 |
| ← checkItOut left | 04:26 |
| ← konsolebox left | 04:28 |
| → konsolebox joined | 04:30 |
| → houami joined | 04:31 |
| ← zzz left | 04:31 |
| ← Gustavo6046 left | 04:35 |
| ← FoxRocks left | 04:36 |
| ← altendky left | 04:39 |
| → _rht joined | 04:44 |
| ← dreiss left | 04:44 |
| → checkItOut joined | 04:45 |
| ← xcm left | 04:46 |
| → xcm joined | 04:46 |
| ← checkItOut left | 04:46 |
| ← nanga left | 04:47 |
| → checkItOut joined | 04:47 |
| ← hash-z3r0 left | 04:48 |
| → nanga joined | 04:49 |
| ← nanga left | 04:49 |
| → nanga joined | 04:49 |
| ← mud left | 04:52 |
| → FoxRocks joined | 04:53 |
| → iamtakingiteasy joined | 04:57 |
|
iamtakingiteasy
| hau do i git gud? | 04:57 |
| ← Murr left | 04:57 |
| → Murr joined | 04:57 |
| → Cabanoss- joined | 05:00 |
| ← Cabanossi left | 05:00 |
| Cabanoss- → Cabanossi | 05:01 |
| ← kus left | 05:02 |
| ← houami left | 05:03 |
| → houami joined | 05:04 |
| → rajat joined | 05:06 |
| ← konsolebox left | 05:07 |
| → |ifei5g00d joined | 05:08 |
| ← houami left | 05:08 |
| ← ShekharReddy left | 05:08 |
| → konsolebox joined | 05:09 |
| ← _xor left | 05:10 |
| → _xor joined | 05:10 |
| ← upperdeck_ left | 05:11 |
| ← |ifei5good left | 05:11 |
| ← energizer left | 05:12 |
| → wxg joined | 05:13 |
| → upperdeck joined | 05:13 |
| christmastime → uptime | 05:13 |
| → houami joined | 05:13 |
| ← Noldorin left | 05:14 |
| → hash-z3r0 joined | 05:16 |
| → energizer joined | 05:16 |
| ← houami left | 05:18 |
| ← pdp11 left | 05:18 |
| ← sz0 left | 05:19 |
| → pdp11 joined | 05:19 |
| ← Claw_wolf left | 05:21 |
| → Claw_wolf joined | 05:21 |
| ← wxg left | 05:21 |
| ← |ifei5g00d left | 05:22 |
| → re1 joined | 05:22 |
| → |ifei5g00d joined | 05:22 |
| → sz0 joined | 05:23 |
| → houami joined | 05:24 |
| → scientes joined | 05:26 |
| ← because left | 05:27 |
| ← houami left | 05:28 |
| → because joined | 05:28 |
| ← hash-z3r0 left | 05:31 |
| → _kk22kk_ joined | 05:33 |
| ← _kk22kk_ left | 05:33 |
| ← noyb left | 05:34 |
| ← Claw_wolf left | 05:36 |
| → Claw_wolf- joined | 05:36 |
| McKraken → McKraken_zzzzz | 05:37 |
| ← treehug88 left | 05:40 |
| → |ifei5good joined | 05:42 |
| ← |ifei5g00d left | 05:45 |
| ← Claw_wolf- left | 05:45 |
| → Claw_wolf joined | 05:45 |
| ← ahrs left | 05:49 |
| ← madewokherd left | 05:49 |
| → ahrs joined | 05:50 |
| → |ifei5g00d joined | 05:51 |
| → yohnnyjoe joined | 05:51 |
| ← |ifei5good left | 05:51 |
| → neil_cn joined | 05:53 |
| → noyb joined | 05:53 |
| ← yohnnyjoe left | 05:56 |
| → hash-z3r0 joined | 05:58 |
| ← Sleepy63 left | 05:59 |
| → h12o joined | 06:06 |
| → Sleepy63 joined | 06:08 |
| ← h12o left | 06:10 |
| ← g00s left | 06:13 |
| → KeyJoo joined | 06:16 |
| ← hash-z3r0 left | 06:17 |
| ← Zamerick left | 06:21 |
| ← scientes left | 06:22 |
| → johnlage joined | 06:31 |
| → ogny joined | 06:33 |
| ← basiclaser left | 06:33 |
| johnlage → JollyLage | 06:37 |
| ← menip left | 06:43 |
| → hash-z3r0 joined | 06:43 |
| → excalith joined | 06:50 |
| ← dviola left | 06:53 |
| ← xeno left | 06:55 |
| → wandering_vagran joined | 06:56 |
| → azri joined | 06:57 |
| ← azri left | 06:59 |
| ← NeXTSUN left | 06:59 |
| → imack joined | 06:59 |
| ← excalith left | 06:59 |
| → Guest3789 joined | 06:59 |
| → hussam joined | 07:00 |
| → raatiniemi joined | 07:01 |
| ← hash-z3r0 left | 07:02 |
| ← imack left | 07:02 |
| ← Guest3789 left | 07:02 |
| → Guest3789 joined | 07:03 |
| → imack joined | 07:05 |
| ← catsup left | 07:06 |
| → xeno joined | 07:06 |
| → catsup joined | 07:06 |
| ← catsup left | 07:07 |
| ← MuffinMedic left | 07:07 |
| → catsup joined | 07:07 |
| ← Guest3789 left | 07:11 |
| ← FoxRocks left | 07:12 |
| → xshumeng joined | 07:12 |
| ← xshumeng left | 07:14 |
| ← imack left | 07:15 |
| → senaps joined | 07:15 |
|
senaps
| i create a file in a branch, it's still present in master. how so? wasn't it supposed to be specific to that branch? | 07:16 |
| → xshumeng joined | 07:17 |
| ← xshumeng left | 07:17 |
| → imack joined | 07:18 |
| → xshumeng joined | 07:18 |
| ← xshumeng left | 07:18 |
| → ShekharReddy joined | 07:18 |
| → xshumeng joined | 07:18 |
| ← xshumeng left | 07:18 |
|
senaps
| okay i should commit them! :) | 07:18 |
| → xshumeng joined | 07:18 |
| ← xshumeng left | 07:18 |
| → xshumeng joined | 07:18 |
| ← xshumeng left | 07:18 |
| → xshumeng joined | 07:19 |
| ← xshumeng left | 07:19 |
| → xshumeng joined | 07:19 |
| ← xshumeng left | 07:19 |
| → xshumeng joined | 07:19 |
| ← xshumeng left | 07:19 |
| → xshumeng joined | 07:19 |
| ← xshumeng left | 07:19 |
| → MuffinMedic joined | 07:20 |
| ← dave0x6d left | 07:22 |
| ← halbeno left | 07:25 |
| → houami joined | 07:27 |
| ← Gurkenglas left | 07:27 |
| ← houami left | 07:28 |
| → halbeno joined | 07:28 |
| → ceda joined | 07:29 |
| → hash-z3r0 joined | 07:29 |
|
ceda
| hi ... how do i list the last commit in any of the branches. git show --all -s didn't work because it showed last commits for each branch. I want to see only the last of last. | 07:30 |
| → mar77i joined | 07:31 |
| → tkore joined | 07:31 |
| ← tkore left | 07:31 |
| → tkore joined | 07:31 |
| → ceda_ei joined | 07:33 |
| ← bket left | 07:34 |
| ← ceda left | 07:35 |
| ← halbeno left | 07:37 |
| → houami joined | 07:38 |
| → halbeno joined | 07:39 |
| ← regedit left | 07:41 |
| ← bobkyle left | 07:41 |
| → ok91 joined | 07:43 |
| ← houami left | 07:43 |
| ← _rht left | 07:43 |
| → almighty joined | 07:45 |
| → bket joined | 07:45 |
| ← bkxd left | 07:45 |
|
_ikke_
| git branch -vv ? | 07:46 |
|
| or just -v | 07:46 |
| ← hash-z3r0 left | 07:46 |
| ← ok91 left | 07:47 |
| → FoxRocks joined | 07:47 |
| ← almighty left | 07:48 |
| → houami joined | 07:48 |
| → mud joined | 07:50 |
| → bkxd joined | 07:51 |
| ← bkxd left | 07:51 |
| → bkxd joined | 07:51 |
| → yohnnyjoe joined | 07:53 |
| ← houami left | 07:53 |
| ← bkxd left | 07:56 |
| ← yohnnyjoe left | 07:56 |
| → bkxd joined | 07:56 |
| ← FoxRocks left | 07:57 |
| ← bkxd left | 07:57 |
| → Sarge9451 joined | 07:59 |
| → bkxd joined | 08:00 |
| ← Sarge945 left | 08:00 |
| → MoziM_ joined | 08:04 |
| → duderono_ joined | 08:04 |
| ← bkxd left | 08:05 |
| → zefferno joined | 08:05 |
| ← duderonomy left | 08:06 |
| ← kculpis left | 08:07 |
| ← mud left | 08:07 |
| → houami joined | 08:07 |
| ← dpower left | 08:08 |
| ← cqi left | 08:09 |
| ← duderono_ left | 08:12 |
| → Mike11 joined | 08:13 |
| → Sarge945 joined | 08:13 |
| → hash-z3r0 joined | 08:13 |
| ← Sarge9451 left | 08:14 |
| ← ceda_ei left | 08:16 |
| → ceda joined | 08:17 |
|
ceda
| _ikke_: this again shows last commits of each branch ... i need the last commit only. So, if the person committed to dev at 10:00:00 and to master at 11:00:00, i only want the commit to master not dev | 08:18 |
| ← sz0 left | 08:19 |
| ← peepsalot left | 08:20 |
| ← safe left | 08:20 |
| → oxzmoron93 joined | 08:21 |
|
_ikke_
| ceda: git log --date-order -1 | 08:24 |
|
| --all | 08:24 |
| ← ephemer0l_ left | 08:29 |
| ← mattcen left | 08:30 |
| ← senaps left | 08:30 |
| → YuGiOhJCJ joined | 08:31 |
| ← hash-z3r0 left | 08:33 |
| → hash-z3r0 joined | 08:33 |
| → bkxd joined | 08:33 |
| → peepsalot joined | 08:34 |
| ← bkxd left | 08:36 |
| → bkxd joined | 08:36 |
| ← YuGiOhJCJ left | 08:38 |
| → mattcen joined | 08:38 |
| → YuGiOhJCJ joined | 08:39 |
| ← houami left | 08:39 |
| ← synthmeat left | 08:39 |
| → ephemer0l_ joined | 08:40 |
| ← webguynow left | 08:40 |
| → webguynow joined | 08:41 |
| ← jameser left | 08:42 |
| → synthmeat joined | 08:43 |
| ← konsolebox left | 08:44 |
|
ceda
| _ikke_: thanks | 08:44 |
| ← webguynow left | 08:45 |
| → webguynow joined | 08:46 |
| → konsolebox joined | 08:46 |
| ← bkxd left | 08:52 |
| ← YuGiOhJCJ left | 08:56 |
| → bkxd joined | 08:57 |
| ← bkxd left | 08:57 |
| → YuGiOhJCJ joined | 08:57 |
| ← Murr left | 08:57 |
| → bkxd joined | 08:57 |
| → Murr joined | 08:58 |
| → opalepatrick joined | 08:59 |
| ← dfas left | 09:00 |
| → houami joined | 09:00 |
| ← houami left | 09:00 |
| ← noyb left | 09:01 |
| → cqi joined | 09:02 |
| ← Claw_wolf left | 09:05 |
| → noyb joined | 09:07 |
| ← YuGiOhJCJ left | 09:10 |
| → YuGiOhJCJ joined | 09:11 |
| → Xtzzr joined | 09:14 |
| → dfas joined | 09:18 |
| → Claw_wolf joined | 09:18 |
| ← konsolebox left | 09:19 |
| ← energizer left | 09:19 |
| ← Xtzzr left | 09:20 |
| → z8z joined | 09:21 |
| → konsolebox joined | 09:26 |
| ← bkxd left | 09:28 |
| ← Claw_wolf left | 09:31 |
| → Claw_wolf joined | 09:31 |
| → bkxd joined | 09:33 |
| ← rajat left | 09:33 |
| → imnothreat joined | 09:37 |
| ← Puffball left | 09:39 |
| ← noyb left | 09:39 |
| → houami joined | 09:39 |
| ← Hi-Angel_ left | 09:39 |
| → Puffball joined | 09:40 |
| → rajat joined | 09:41 |
| → h12o joined | 09:42 |
| ← katiex7 left | 09:43 |
| ← houami left | 09:44 |
| ← zefferno left | 09:45 |
| ← h12o left | 09:47 |
| ← bkxd left | 09:47 |
| → shripadr joined | 09:51 |
| → _ADN_ joined | 09:53 |
| → yohnnyjoe joined | 09:53 |
| → houami joined | 09:53 |
| ← Kestrel-029 left | 09:54 |
| → h12o joined | 09:55 |
| → theoceaniscool joined | 09:56 |
| ← yohnnyjoe left | 09:57 |
| ← Sc0rpius left | 09:58 |
| ← houami left | 09:58 |
| ← hash-z3r0 left | 09:58 |
| ← h12o left | 09:59 |
| ← jnewt left | 10:00 |
| → hash-z3r0 joined | 10:02 |
| → Sc0rpius joined | 10:03 |
| ← hash-z3r0 left | 10:06 |
| → Nicmavr joined | 10:09 |
| Nicmavr → Guest38391 | 10:09 |
| → bkxd joined | 10:13 |
| → SteffanW joined | 10:16 |
| → thiago joined | 10:17 |
| ← Claw_wolf left | 10:19 |
| ← xcm left | 10:19 |
| → xcm joined | 10:20 |
| ← dsdeiz left | 10:20 |
| → dsdeiz joined | 10:20 |
| ← dsdeiz left | 10:20 |
| → dsdeiz joined | 10:20 |
| → houami joined | 10:22 |
| → cdown joined | 10:25 |
| ← bkxd left | 10:28 |
| → senaps joined | 10:28 |
| → hash-z3r0 joined | 10:29 |
| ← cqi left | 10:31 |
| → checkItO_ joined | 10:35 |
| → overlord_tm joined | 10:35 |
| → Tobbi joined | 10:38 |
| ← Guest38391 left | 10:38 |
| → Guest38391 joined | 10:38 |
| Guest38391 → Kestrel-029 | 10:38 |
| ← checkItOut left | 10:39 |
| → duderonomy joined | 10:39 |
| ← imnothreat left | 10:40 |
| ← Tobbi left | 10:40 |
| → Tobbi joined | 10:41 |
| ← Tobbi left | 10:41 |
| ← checkItO_ left | 10:41 |
| → jesst_ joined | 10:46 |
| ← jesst_ left | 10:47 |
| ← cdown left | 10:50 |
| → aielima joined | 10:51 |
| → sarp joined | 10:51 |
| → navidr joined | 10:53 |
| → AndyBlue joined | 10:54 |
| → cdown joined | 10:57 |
| ← Murr left | 10:57 |
| → Murr joined | 10:57 |
| → kus joined | 10:58 |
| → manuelschneid3r joined | 11:02 |
| ← cdown left | 11:04 |
| ← wandering_vagran left | 11:06 |
| → wandering_vagran joined | 11:06 |
| → DaGoaty joined | 11:08 |
| → Sarge9451 joined | 11:09 |
| ← Mike11 left | 11:09 |
| ← houami left | 11:10 |
| ← Sarge945 left | 11:10 |
| ← DaGoaty left | 11:13 |
| → fxrb joined | 11:15 |
| → jnavila joined | 11:15 |
| → houami joined | 11:20 |
| ← SteffanW left | 11:21 |
| ← jimmyrcom left | 11:22 |
| ← hussam left | 11:22 |
| → cdown joined | 11:23 |
| ← YuGiOhJCJ left | 11:24 |
| ← houami left | 11:25 |
| → YuGiOhJCJ joined | 11:26 |
| → hussam joined | 11:26 |
| ← jnavila left | 11:27 |
| ← theoceaniscool left | 11:28 |
| → Bin4ry joined | 11:28 |
| ← hash-z3r0 left | 11:30 |
| → houami joined | 11:30 |
| ← fxrb left | 11:30 |
| ← houami left | 11:35 |
| → checkItOut joined | 11:35 |
| ← YuGiOhJCJ left | 11:36 |
| → YuGiOhJCJ joined | 11:37 |
| ← checkItOut left | 11:40 |
| → houami joined | 11:40 |
| → IanLiu joined | 11:40 |
| ← houami left | 11:44 |
| → ixxie joined | 11:45 |
| → zefferno joined | 11:46 |
| → basiclaser joined | 11:46 |
| → bkxd joined | 11:46 |
| → jnavila joined | 11:47 |
| → SteffanW joined | 11:50 |
| → houami joined | 11:50 |
| → hash-z3r0 joined | 11:51 |
| → Guest3789 joined | 11:52 |
| → ok91 joined | 11:52 |
|
ixxie
| Hello everybody; I have the following problem: there is a large open package repo, lets called it repoX. UserA (me) uses forkA to make PR-A; changes are requested, so UserB uses forkB to make PR-B. Now more changes are requested, and I want to merge the branch corresponding to PR-B back into my copy of the PR-A branch, but I get `error: the follow untracked working tree files would be overwritten by merge: | 11:52 |
|
| [...] Please move or remove them before merge.` | 11:53 |
|
| I guess this is because there are so many other changes on repoX that the forks we took diverged, but I am not sure what to do with it | 11:53 |
| → yohnnyjoe joined | 11:54 |
| ← ephemer0l_ left | 11:55 |
| ← houami left | 11:55 |
|
ixxie
| I wanna take everything not relevant to the PR from repoX, and only the relevant parts of repoA and repoB somehow | 11:55 |
| ← hash-z3r0 left | 11:56 |
| ← a3Dman left | 11:57 |
| ← yohnnyjoe left | 11:58 |
| → a3Dman joined | 11:58 |
|
barteks2x
| does git stash show -p stash@{1} show the diff as if it would be at the moment I created the stash? | 11:58 |
|
| or does it alsom somehow take the current state into account? | 11:59 |
| ← johnflux_ left | 11:59 |
| → houami joined | 12:00 |
| ← YuGiOhJCJ left | 12:00 |
|
barteks2x
| any way to name an existing stash? | 12:00 |
|
| (stash pop/apply and stash save name won't work because it won't apply without major conflicts | 12:02 |
| ← _ADN_ left | 12:02 |
| ← oxzmoron93 left | 12:04 |
| → oxymoron93 joined | 12:04 |
| ← houami left | 12:04 |
|
oxymoron93
| barteks2x: git show -p stash@{n} is ok | 12:05 |
|
barteks2x
| any way to convert stash to a branch, making it actually start at the commit where I made the stash? | 12:06 |
| ← m0viefreak left | 12:06 |
|
barteks2x
| nvm found it | 12:08 |
|
oxymoron93
| well I don't know if that is needed, I just ran command several times with different working dir and got same output | 12:08 |
| ← hanneso_ left | 12:08 |
| ← Guest3789 left | 12:09 |
| → Guest3789 joined | 12:09 |
| → hanneso joined | 12:09 |
| → houami joined | 12:10 |
|
barteks2x
| git stash show -p gives me strange results | 12:12 |
|
| it seems like it show the diff between *current state* and what the state was at the moment I made the stash | 12:12 |
| ← bkxd left | 12:12 |
| → dave0x6d joined | 12:13 |
|
barteks2x
| when what I *want* to see is the diff between HEAD at the moment I made the stash, and working directory at the moment I made the stash | 12:13 |
|
| there is no way noone of the 1000+ people here know how to do it | 12:14 |
| → bkxd joined | 12:14 |
| → in1t3r_ joined | 12:14 |
| ← in1t3r_ left | 12:14 |
| ← houami left | 12:14 |
| → _ADN_ joined | 12:15 |
| ← in1t3r left | 12:15 |
|
oxymoron93
| git stash show : "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created." says in documentation barteks2x | 12:16 |
|
barteks2x
| no way. | 12:16 |
| → in1t3r_ joined | 12:16 |
|
barteks2x
| There is no way I stashed almost exactly the same file 3 times together with unrelated changes, that I know I had replaced with completely different imp,ementation | 12:17 |
| ← _ADN_ left | 12:23 |
| → shiva__ joined | 12:24 |
| → maheshpec joined | 12:25 |
| ← maheshpec left | 12:26 |
| → maheshpec joined | 12:26 |
| ← in1t3r_ left | 12:27 |
| ← maheshpec left | 12:28 |
| → hash-z3r0 joined | 12:31 |
| ← bkxd left | 12:32 |
| → rorro joined | 12:35 |
| → ephemer0l joined | 12:38 |
| ← metts left | 12:38 |
| → johnflux_ joined | 12:39 |
| → houami joined | 12:39 |
| → maheshpec joined | 12:40 |
| ← grzegorz left | 12:40 |
| ← ok91 left | 12:42 |
| → royal_screwup21 joined | 12:42 |
|
royal_screwup21
| say I initialize a git repo locally, make a few files, then delete a file. Is it possible to recover the deleted file? | 12:43 |
| ← houami left | 12:44 |
| ← ShekharReddy left | 12:44 |
| → Foad_NH joined | 12:45 |
| ← maheshpec left | 12:45 |
|
Foad_NH
| Is it possible to follow commit chains if I merge --squash? | 12:46 |
|
_ikke_
| What do you mean with following commit chains? | 12:47 |
|
| merge --squash does not record where the merge came from | 12:47 |
|
| it would just look like any other commit | 12:47 |
|
Foad_NH
| I mean trace the commit tree. | 12:47 |
|
_ikke_
| No | 12:47 |
| → theoceaniscool joined | 12:47 |
|
_ikke_
| It would just look like linear history, no record of what branch was merged in | 12:47 |
|
Foad_NH
| _ikke_: OK. Thanks. | 12:48 |
| ← Guest3789 left | 12:49 |
| → dviola joined | 12:51 |
|
barteks2x
| noooooo... I lost a file that was really hard to get right... | 12:53 |
|
| because git stash doesn't include untracked files by default | 12:53 |
| → maheshpec joined | 12:54 |
| ← jokajak left | 12:54 |
|
barteks2x
| is there any way to search for file by name in all places known by git? | 12:54 |
|
_ikke_
| The only thing that records filenames are trees | 12:54 |
| ← kus left | 12:55 |
|
_ikke_
| and if it's not comitted yet, there is no tree for it | 12:55 |
|
| barteks2x: you can run git fsck --lost-found | 12:55 |
|
| it will place all unreferenced blobs in .git/lost-found | 12:55 |
|
| But no filename, just contents by hash | 12:55 |
| → jokajak joined | 12:55 |
|
barteks2x
| it's java class so I can grep for public class filename | 12:55 |
| → Guest3789 joined | 12:56 |
| ← jnavila left | 12:56 |
| ← xcm left | 12:56 |
| → xcm joined | 12:57 |
| ← Murr left | 12:57 |
| → ShekharReddy joined | 12:57 |
| → Murr joined | 12:57 |
|
barteks2x
| thanks, it worked :D .git/lost-found/other/799d96186ed7790e1201fe16149553cd188b357b:public class UIBlockStateSelect { | 12:58 |
|
_ikke_
| :-) | 12:58 |
|
barteks2x
| so apparently it's harder than it seems to be to lose something with git | 12:59 |
|
_ikke_
| Well, you apparently git added it before | 12:59 |
|
| otherwise, git would not even know about it | 12:59 |
| ← crater2150 left | 13:00 |
| ← ghost43 left | 13:00 |
|
barteks2x
| looks like it was also saved in intellij local history too | 13:02 |
|
_ikke_
| ah, yeah, also | 13:02 |
| ← ephemer0l left | 13:03 |
| ← sarp left | 13:04 |
| → ephemer0l_ joined | 13:05 |
| → cdown_ joined | 13:07 |
| → kus joined | 13:08 |
| → houami joined | 13:09 |
| → domini joined | 13:09 |
| ← cdown left | 13:09 |
| cdown_ → cdown | 13:10 |
| → ghost43 joined | 13:10 |
| ← a3Dman left | 13:10 |
| ← xcm left | 13:11 |
| → xcm joined | 13:12 |
| → shinnya joined | 13:12 |
| ← theoceaniscool left | 13:13 |
| ← neil_cn left | 13:14 |
| ← houami left | 13:14 |
| → AliSSa joined | 13:15 |
| ← raatiniemi left | 13:16 |
| ← AliSSa left | 13:16 |
| → AliSSa joined | 13:16 |
| ← kus left | 13:17 |
| → a3Dman joined | 13:17 |
| ← ephemer0l_ left | 13:18 |
| → houami joined | 13:19 |
| → sarp joined | 13:22 |
| → ephemer0l_ joined | 13:22 |
| ← houami left | 13:23 |
| ← ixxie left | 13:24 |
| → checkItOut joined | 13:25 |
| → jameser joined | 13:29 |
| → houami joined | 13:29 |
| ← checkItOut left | 13:29 |
| → Claw_wolf joined | 13:32 |
| ← Foad_NH left | 13:32 |
| ← houami left | 13:34 |
| ← imack left | 13:34 |
| → crater2150 joined | 13:36 |
| → houami joined | 13:39 |
| ← sarp left | 13:40 |
| → MeiR` joined | 13:40 |
| ← MeiR left | 13:41 |
| ← houami left | 13:43 |
| → wxg joined | 13:44 |
| → phinxy joined | 13:46 |
| → tmm88 joined | 13:48 |
| ← tmm88 left | 13:48 |
| → tmm88 joined | 13:48 |
| → houami joined | 13:49 |
| ← tmm88 left | 13:49 |
| ← houami left | 13:53 |
| → ok91 joined | 13:54 |
| ← johnflux_ left | 13:54 |
| → sarp joined | 13:57 |
| ← rajat left | 13:59 |
| ← senaps left | 13:59 |
| → metts joined | 14:00 |
| → cdown_ joined | 14:01 |
| ← jameser left | 14:01 |
| ← cdown left | 14:04 |
| ← konsolebox left | 14:04 |
| cdown_ → cdown | 14:04 |
| ← hash-z3r0 left | 14:04 |
| → hash-z3r0 joined | 14:05 |
| → Sarge945 joined | 14:05 |
| ← Sarge9451 left | 14:07 |
| → Hi-Angel_ joined | 14:08 |
| → gugah joined | 14:08 |
| → konsolebox joined | 14:10 |
| → houami joined | 14:10 |
| → jnavila joined | 14:13 |
| → checkItOut joined | 14:15 |
| ← houami left | 14:15 |
| ← gugah left | 14:16 |
| ← cdown left | 14:16 |
| ← maheshpec left | 14:19 |
| ← checkItOut left | 14:19 |
| → cdown joined | 14:19 |
| → fission6 joined | 14:19 |
| → Munt joined | 14:20 |
| → houami joined | 14:21 |
| ← hanneso left | 14:25 |
| ← houami left | 14:25 |
| → hanneso joined | 14:26 |
| ← TinkerTyper left | 14:27 |
| → TinkerTyper joined | 14:29 |
| ← Claw_wolf left | 14:29 |
| Hello71 → ChristmasSucks | 14:30 |
| ← tunekey left | 14:33 |
| ← zefferno left | 14:35 |
| → zefferno joined | 14:36 |
| ← Munt left | 14:36 |
| ← Jak_o_Ombroj left | 14:37 |
| → Mike11 joined | 14:39 |
|
royal_screwup21
| I'm trying to build | 14:40 |
|
| oops sorry | 14:40 |
| ← wxg left | 14:40 |
| → Jak_o_Shadows joined | 14:41 |
| → _ADN_ joined | 14:41 |
| → madewokherd joined | 14:45 |
| → Sarge9451 joined | 14:46 |
| ← dviola left | 14:46 |
| ← Sarge945 left | 14:47 |
| ← dave0x6d left | 14:50 |
| → Munt joined | 14:53 |
| → pbrewczynski joined | 14:53 |
| ← cdown left | 14:54 |
| → leeN joined | 14:55 |
| ← shinnya left | 15:00 |
| → cdown joined | 15:00 |
| ← finalbeta left | 15:02 |
| → finalbeta joined | 15:02 |
| McKraken_zzzzz → McKraken | 15:04 |
| ← finalbeta left | 15:04 |
| → finalbeta joined | 15:05 |
| ← fission6 left | 15:05 |
| ← xPucTu4 left | 15:05 |
| ← finalbeta left | 15:05 |
| → xPucTu4 joined | 15:06 |
| → finalbeta joined | 15:06 |
| → xD3C joined | 15:07 |
| ← overlord_tm left | 15:07 |
| ← SteffanW left | 15:13 |
| ← cdown left | 15:14 |
| → cdown joined | 15:15 |
| ← zefferno left | 15:19 |
| ← cdown left | 15:20 |
| → ilyaigpetrov joined | 15:20 |
| ← halbeno left | 15:21 |
| ← manuelschneid3r left | 15:22 |
| ← ogny left | 15:25 |
| ← ceda left | 15:26 |
| ← metts left | 15:28 |
| ← Guest3789 left | 15:28 |
| → Guest3789 joined | 15:28 |
| ← Guest3789 left | 15:30 |
| → metts joined | 15:31 |
| → Zamerick joined | 15:40 |
| ← oxymoron93 left | 15:41 |
| ← domini left | 15:41 |
| → Sarge945 joined | 15:43 |
| → manuelschneid3r joined | 15:44 |
| ← Sarge9451 left | 15:45 |
| ← ketas left | 15:46 |
| → ketas joined | 15:51 |
| ← Guest98352 left | 15:52 |
| → OnceMe joined | 15:55 |
|
OnceMe
| is there a variable inside a hook to get last commit message? | 15:55 |
| → yohnnyjoe joined | 15:55 |
|
OnceMe
| so I commit some file and push, I want to get the commit message which I wrote | 15:56 |
| → NeXTSUN joined | 15:59 |
| ← salamanderrake left | 16:00 |
| ← yohnnyjoe left | 16:00 |
| ← tkore left | 16:00 |
| → salamanderrake joined | 16:01 |
| → cdown joined | 16:02 |
| → DevAntoine joined | 16:09 |
|
_ikke_
| What hook specifically? | 16:11 |
| ← shripadr left | 16:12 |
|
OnceMe
| pre-receive | 16:13 |
|
| or any other way to obtain current commit message when I push | 16:13 |
|
_ikke_
| OnceMe: "This hook executes once for the receive operation. It takes no arguments, but for each ref to be updated it receives on standard input a line of the format:" | 16:14 |
|
| " <old-value> SP <new-value> SP <ref-name> L" | 16:14 |
| ← hash-z3r0 left | 16:14 |
|
OnceMe
| ? | 16:14 |
|
_ikke_
| That's the information you get | 16:14 |
|
| on STDIN, you get one ref per line that is being updated | 16:15 |
|
OnceMe
| well I can get a user which pushed, via $USER | 16:15 |
|
| so I thought I could get commit message as well | 16:15 |
|
_ikke_
| nope | 16:15 |
|
| $USER is not something git sets | 16:15 |
|
OnceMe
| can I get a user from git? | 16:15 |
|
| which is set via git config? | 16:16 |
|
_ikke_
| git itself has no users | 16:16 |
|
| just authors and comitters | 16:16 |
|
OnceMe
| git config --global user.name "my name" | 16:16 |
|
| can I get user.name? | 16:16 |
|
_ikke_
| Only per commit | 16:16 |
|
| this is not communicated when you push as separate data | 16:17 |
|
OnceMe
| ok cool, how do I get a commit then? | 16:17 |
|
_ikke_
| By reading from STDIN | 16:17 |
|
OnceMe
| inside which hook? | 16:17 |
|
_ikke_
| you get information about what references (branches) are being pushed | 16:17 |
|
| you can then use tools like git log or others to traverse the commits and do something | 16:17 |
|
OnceMe
| correct, but I cannot run git log in bare repo | 16:17 |
|
| pre-receive is in bare repo | 16:17 |
|
| I could go with git archive | 16:18 |
|
_ikke_
| you can | 16:18 |
|
OnceMe
| how? | 16:18 |
| ← a3Dman left | 16:18 |
| → raatiniemi joined | 16:18 |
|
OnceMe
| git log shows only for master branch | 16:19 |
| ← raatiniemi left | 16:19 |
|
_ikke_
| hold on | 16:20 |
|
OnceMe
| I figured it out | 16:21 |
|
| git log revID works | 16:21 |
| → raatiniemi joined | 16:21 |
|
OnceMe
| I cna get rev from newrev in pre-receive hook | 16:21 |
|
_ikke_
| if you do that, you will get all commits since the beginning for history | 16:21 |
| → a3Dman joined | 16:22 |
|
_ikke_
| OnceMe: Here is an example http://tpaste.us/v7rO | 16:22 |
|
OnceMe
| git show works | 16:23 |
|
_ikke_
| OnceMe: What if you push more then one commit? | 16:23 |
|
OnceMe
| new revision is generated | 16:23 |
|
| so basically git show revid --summary does the job | 16:23 |
|
| right? | 16:23 |
| ← because left | 16:24 |
|
_ikke_
| Depends on whaty ou actually want to see | 16:24 |
|
| What do you want to achieve with the hook? | 16:24 |
| ← DevAntoine left | 16:24 |
| → because joined | 16:26 |
| → Barrt joined | 16:29 |
| ← Mike11 left | 16:29 |
| → schleppel joined | 16:30 |
| → Sarge9451 joined | 16:31 |
| ← manuelschneid3r left | 16:32 |
| ← Sarge945 left | 16:32 |
| → checkItOut joined | 16:34 |
| ← checkItOut left | 16:39 |
|
OnceMe
| _ikke_: to store some info about a commit after a push | 16:47 |
| ← finalbeta left | 16:48 |
| → hash-z3r0 joined | 16:48 |
| → finalbeta joined | 16:48 |
| → linuxmodder joined | 16:49 |
| → moei joined | 16:51 |
| ← Barrt left | 16:52 |
| → Barrt joined | 16:52 |
| ← metts left | 16:53 |
| → paul424 joined | 16:53 |
| ← pdp11 left | 16:55 |
| → Gurkenglas joined | 16:56 |
| ← wandering_vagran left | 16:57 |
| ← xD3C left | 16:58 |
| ← sarp left | 16:59 |
| → linuxmodder- joined | 17:00 |
| ← linuxmodder left | 17:00 |
| ← linuxmodder- left | 17:01 |
| → linuxmodder- joined | 17:02 |
| ← navidr left | 17:02 |
| ← linuxmodder- left | 17:03 |
| ← peepsalot left | 17:03 |
| → xD3C joined | 17:03 |
| → linuxmodder- joined | 17:03 |
| ← linuxmodder- left | 17:03 |
| → linuxmodder- joined | 17:03 |
| ← xD3C left | 17:06 |
| → mud joined | 17:06 |
| → xD3C joined | 17:06 |
| ← Masber_080 left | 17:08 |
| → Noldorin joined | 17:08 |
| → Sarge945 joined | 17:09 |
| ← Sarge9451 left | 17:11 |
| → checkItOut joined | 17:14 |
| → sarp joined | 17:15 |
| → peepsalot joined | 17:15 |
| ← checkItOut left | 17:19 |
| ← linuxmodder- left | 17:19 |
| ← QualityAddict left | 17:19 |
| → houami joined | 17:20 |
| → QualityAddict joined | 17:23 |
| ← QualityAddict left | 17:23 |
| → QualityAddict joined | 17:24 |
| ← Elon_Satoshi left | 17:26 |
| ← houami left | 17:27 |
| → Tobbi joined | 17:27 |
| ← ok91 left | 17:28 |
| → shynoob joined | 17:29 |
| ← hash-z3r0 left | 17:30 |
| → kculpis joined | 17:31 |
| → metts joined | 17:32 |
| ← xcm left | 17:34 |
| → xcm joined | 17:34 |
| → Darcidride joined | 17:36 |
| → nd joined | 17:37 |
| → houami joined | 17:37 |
| → ArcaTech joined | 17:39 |
| → FoxRocks joined | 17:39 |
| ← nd_ left | 17:40 |
| → FoxRocks_ joined | 17:41 |
| ← FoxRocks left | 17:41 |
| → FoxRocks joined | 17:42 |
| ← FoxRocks_ left | 17:42 |
| ← houami left | 17:42 |
| ← FoxRocks left | 17:42 |
| → FoxRocks joined | 17:43 |
| → FoxRocks_ joined | 17:45 |
| ← FoxRocks left | 17:45 |
| → hash-z3r0 joined | 17:45 |
| ← Noldorin left | 17:45 |
| → houami joined | 17:47 |
| ← sarp left | 17:49 |
| ← FoxRocks_ left | 17:49 |
|
OnceMe
| _ikke_: do you know if post-merge works properly? | 17:50 |
| ← shynoob left | 17:51 |
| → maheshpec joined | 17:52 |
| → sarp joined | 17:52 |
| ← houami left | 17:52 |
| → katiex7 joined | 17:53 |
| ← ZexaronS left | 17:53 |
| → ais523 joined | 17:54 |
| → dviola joined | 17:54 |
| → Sarge9451 joined | 17:55 |
|
ais523
| I currently have a repository A on my local system which has a remote B; B has a branch B/C which doesn't have a corresponding branch in A. I'm now trying to produce a clone of B/C into a new repository, on the same system. Is there a command that will allow me to do this via somehow cloning the remote from A, or the like? | 17:56 |
| → yohnnyjoe joined | 17:56 |
| → kus joined | 17:57 |
| → houami joined | 17:57 |
| ← Sarge945 left | 17:57 |
|
OnceMe
| ais523: git fetch --update does not help? | 17:58 |
|
| git fetch -p should update all branches | 17:58 |
|
ais523
| OnceMe: I'm trying to create an entirely new repository, via cloning an existing one | 17:58 |
|
OnceMe
| clone will just clone the existing repositroy | 17:59 |
|
ais523
| but I'm not sure what to clone; ideally I'd like to avoid touching the network (metered connection) so I don't want to have to clone the original upstream repository | 17:59 |
|
| so I guess I'm trying to clone a subset of a repository, which is normally fairly easy (you can clone a branch) | 17:59 |
|
| but how do you clone a branch that exists only as a locally fetched remote? | 17:59 |
| → theoceaniscool joined | 18:00 |
| ← yohnnyjoe left | 18:01 |
|
ais523
| I'd expect something like "git clone -b B/C A" to work, but I get "Fatal: Remote branch B/C not found in upstream origin" | 18:01 |
|
| "remotes/B/C" doesn't work either | 18:01 |
|
| so either I don't understand the syntax or my mental model of the situation is wrong | 18:01 |
|
grawity
| try refs/remotes/B/C | 18:02 |
| ← houami left | 18:02 |
|
grawity
| as they're not under refs/heads/ like normal branches would | 18:02 |
| → frivol joined | 18:02 |
|
ais523
| same error message | 18:03 |
|
| actually I think what I might need is git clone --reference | 18:03 |
|
| which lets you clone a remote repository but look for objects in a local repository | 18:03 |
|
grawity
| does it show up in git ls-remote at least? | 18:03 |
| → SteffanW joined | 18:03 |
|
grawity
| that'd work | 18:04 |
|
ais523
| yes, looks like --reference works: my command was git clone --reference A -b C http://url/to/B | 18:05 |
|
| although that shares the repositories by mistake, I forgot --dissociate | 18:07 |
| → houami joined | 18:07 |
| → Noldorin joined | 18:08 |
| ← xD3C left | 18:10 |
|
ais523
| thanks for the suggestions, anyway | 18:10 |
|
_ikke_
| OnceMe: post-merge is executed on the local repo | 18:12 |
| ← houami left | 18:12 |
|
OnceMe
| what if I want to run test suite after a merge for that branch? | 18:12 |
| → Mike11 joined | 18:14 |
|
_ikke_
| You can invoke the test suite from the post-commit hook, but note that it does not run when you had conflicts | 18:14 |
| ← Noldorin left | 18:15 |
|
OnceMe
| let me try | 18:16 |
| ← ArcaTech left | 18:16 |
| → houami joined | 18:17 |
|
OnceMe
| _ikke_: in post-commit I have echo "testing post commit" and I never get that echo'd when I push | 18:17 |
|
| which contains commit | 18:17 |
|
_ikke_
| post-commit runs locally, note remotely | 18:18 |
|
| it is executed after you commit, not after you push | 18:18 |
|
OnceMe
| hmm, but when I run test suite in pre-receive and when I merge | 18:18 |
|
| I want to check merged branch | 18:18 |
|
| by running test suite again | 18:18 |
| → ArcaTech joined | 18:19 |
|
_ikke_
| Where do you want the test suite to be run? | 18:19 |
| ← Mike11 left | 18:19 |
|
OnceMe
| locally or on some external server | 18:19 |
|
| not sure yet, im sending out some data | 18:19 |
|
| is post-merge not advisible? | 18:19 |
|
| I think post-commit is not what I need | 18:19 |
| → v4ult joined | 18:21 |
| ← houami left | 18:22 |
| → xD3C joined | 18:22 |
| ← jason237 left | 18:23 |
| ← AliSSa left | 18:23 |
|
_ikke_
| OnceMe: Personally, I would not use hooks for that locally | 18:25 |
|
| remotely, you can use the post-receive hook to initiate a process that runs the suite (make sure it does not block the push process) | 18:25 |
| ← thiago left | 18:27 |
| → Gustavo6046 joined | 18:28 |
| ← hash-z3r0 left | 18:28 |
|
OnceMe
| _ikke_: so for merge to use post-receive | 18:30 |
|
| and pre-receive for testing only a push | 18:30 |
| → fstd joined | 18:30 |
| ← viric left | 18:30 |
| → VoradorPT joined | 18:31 |
|
_ikke_
| OnceMe: post-receive hast nothing to do with merges | 18:31 |
|
| OnceMe: the merge has long happened before the post-receive hook is run | 18:31 |
|
| post-receive runs after you *push* something | 18:32 |
|
OnceMe
| what does pre-receive does then? | 18:32 |
|
_ikke_
| that can be one commit, 10 commits, 0-infinity merges | 18:32 |
|
OnceMe
| pre-receive does not react on merge as I can see | 18:32 |
| ← fistmas left | 18:33 |
|
_ikke_
| OnceMe: post-receive is executed on the remote, after you push something to that remote | 18:34 |
|
| commands like commit and merge are just *local* operations | 18:34 |
|
| the remote does not see them until after you push them | 18:35 |
|
OnceMe
| ok | 18:35 |
|
| so I can use either pre-erceive or post-receive? | 18:35 |
|
_ikke_
| pre-receive is mostly used to check and possibly block something from being pushed | 18:35 |
| ← kus left | 18:36 |
| → navidr joined | 18:36 |
|
_ikke_
| See the link I sent to you earlier | 18:37 |
|
| that is a pre-receive hook that blocks commits that contain binary files from being pushed | 18:37 |
|
OnceMe
| ok Im testing pre-receive hook | 18:37 |
|
| to use for pushs and merges | 18:38 |
|
| when I locally merge and git push, hook is not executed | 18:38 |
|
| because its fast forward | 18:38 |
|
_ikke_
| has nothing to do with it | 18:38 |
| → momomo joined | 18:38 |
|
OnceMe
| ah yes | 18:38 |
|
| can I somehow disable fast for ward when I git pre-receive? | 18:38 |
|
| when I git merge* | 18:39 |
| → thiago joined | 18:39 |
| → energizer joined | 18:39 |
|
_ikke_
| git merge --no-ff | 18:39 |
|
momomo
| hello guys .. i nnnneed some help with pusing this repo .. according to the readme: https://github.com/029/Arbetsprov/blob/master/README.md | 18:39 |
|
| i am done with the task .. however, i am unable to figure out how to pull without embarassaing myself .. do I push first and then pull? | 18:40 |
|
| when I push, i get authentication error: git push -u origin jj-feature-branch | 18:40 |
|
| permission deined for user ... | 18:41 |
|
| or do i pull first without having pushed or committed anything? | 18:41 |
|
ais523
| in general you should pull before pushing; however, if you haven't committed anything, what are you trying to push? additionally you normally need permission from a repository's owner to push to it | 18:41 |
|
_ikke_
| to be ably to push to the repo, you need to have permission | 18:41 |
|
| What you typically do is that you fork the project, so that you can push to your local for, and then make a pull request | 18:42 |
|
momomo
| _ikke_: i am just folloing the guideline ... it doesn't say anything about permissions .. so I add the changes .. commit first.. then pull or push ? | 18:43 |
|
ais523
| momomo: so what a pull does is that it updates your repository by adding changes from someone else's | 18:44 |
|
_ikke_
| momomo: first step: fork the repo | 18:44 |
|
ais523
| and what a push does is that it updates /their/ repository by adding /your/ changes | 18:44 |
|
| most people don't like you changing their repository unless they trust you already | 18:44 |
|
momomo
| already forked | 18:44 |
|
ais523
| so what you do instead is you just make the changes to your own local copy of the repository | 18:44 |
|
_ikke_
| momomo: Did you clone from that fork? | 18:44 |
|
momomo
| yes | 18:45 |
| ← rorro left | 18:45 |
|
momomo
| then created a feature branch according to | 18:45 |
|
| https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow | 18:45 |
|
ais523
| and once you're happy with them, you can send them the changes via email or github or whatever and say "here, I made some changes, do you want them?" | 18:45 |
|
_ikke_
| momomo: What does git remote -v show? | 18:45 |
|
momomo
| ais523: it says how i am supposed to send it though ... a puill request | 18:45 |
|
| origin https://github.com/029/Arbetsprov.git (fetch) | 18:46 |
|
| origin https://github.com/029/Arbetsprov.git (push) | 18:46 |
| → FoxRocks joined | 18:46 |
|
momomo
| now i have committed | 18:46 |
|
_ikke_
| is 029 your username? | 18:46 |
|
momomo
| no | 18:46 |
|
| i think i cloned it without a username or anything like that | 18:46 |
|
| i think it's their user account | 18:46 |
|
_ikke_
| You cloned the original repo, not your fork | 18:46 |
|
momomo
| on github | 18:46 |
|
_ikke_
| You just publicly cloned their repo | 18:46 |
|
| anonymously | 18:47 |
| → houami joined | 18:47 |
|
momomo
| yes, should I not have done so ? | 18:47 |
| ← paul424 left | 18:47 |
|
momomo
| what should I have done ? command ? i did git clone url | 18:47 |
|
_ikke_
| momomo: If you want to push to your fork, you should add your forks repo as a remote | 18:47 |
|
momomo
| aha .. i should have forked it first ? | 18:47 |
|
_ikke_
| yes | 18:47 |
|
| well | 18:47 |
|
momomo
| ok, i will try that | 18:47 |
|
_ikke_
| You can still do | 18:47 |
| → Mike11 joined | 18:48 |
|
_ikke_
| Forking is step one of the guide you posted | 18:48 |
| ← sarp left | 18:48 |
|
momomo
| i will restart and copy my files | 18:48 |
|
_ikke_
| no need to restart | 18:48 |
|
momomo
| can i base the current version on the fork then ? | 18:48 |
|
_ikke_
| yes | 18:48 |
|
momomo
| here is my new fork | 18:49 |
|
| https://github.com/joseph987/Arbetsprov | 18:49 |
|
_ikke_
| git remote add fork https://github.com/joseph987/Arbetsprov | 18:49 |
|
| This will add a new remote (shortcut) to your fork named 'fork' | 18:49 |
|
| You can name it whatever you want | 18:50 |
|
momomo
| and now ? this is already a feature branch ( feature commands has already run prior) | 18:50 |
|
| do I push now ? | 18:50 |
|
_ikke_
| git push -u <remote> <branchname> | 18:50 |
| ← FoxRocks left | 18:50 |
|
_ikke_
| where remote is the name of the remote you just added (fork in my example) | 18:50 |
|
momomo
| do I need to create a new branch first for the fork ? | 18:51 |
|
| also , i aam unable to add the files now | 18:51 |
|
_ikke_
| no, you already have the branch | 18:51 |
|
| momomo: what do you mean, unable to add the files? | 18:51 |
|
momomo
| git add * not adding files | 18:51 |
| ← houami left | 18:52 |
| ← webguynow left | 18:52 |
| → webguynow joined | 18:52 |
| ← xD3C left | 18:52 |
| → xD3C joined | 18:52 |
|
momomo
| never mind .. i htink i have already committed .. it is listing some strange stuff though | 18:53 |
| ← ArcaTech left | 18:53 |
|
momomo
| _ikke_: https://imgur.com/a/uLiEs | 18:53 |
| → checkItOut joined | 18:54 |
|
momomo
| git push -u https://github.com/joseph987/Arbetsprov joseph-seifeddine-feature-branch ? | 18:54 |
| → kus joined | 18:54 |
|
momomo
| ok, i have now pushed | 18:54 |
|
| how do I pull request ? | 18:54 |
|
| just git pull ? | 18:54 |
|
| https://hastebin.com/ayoluwixem.sql | 18:55 |
| ← minionofgozer_ left | 18:55 |
|
momomo
| it says eveyrhing up to date ... have i notified them now ? | 18:55 |
|
_ikke_
| In the web interface | 18:55 |
| → hash-z3r0 joined | 18:56 |
| → djapo joined | 18:56 |
|
momomo
| ok. done | 18:56 |
| → paul424 joined | 18:56 |
|
momomo
| i think i changed a bit too much though .. like the entire structure | 18:57 |
| → houami joined | 18:57 |
| ← Murr left | 18:57 |
|
djapo
| hello I just added a remote address to a project and instead of the url I entered It has the absolute path on the filesystem to the project | 18:57 |
| ← webguynow left | 18:57 |
|
djapo
| whats strange is that I was able to push an update to the server, even tho the path is wrong | 18:57 |
|
momomo
| _ikke_: does it look right? https://github.com/joseph987/Arbetsprov/branches | 18:57 |
| → Murr joined | 18:57 |
|
momomo
| https://imgur.com/a/lqgxZ | 18:58 |
| → rajat joined | 18:58 |
| → webguynow joined | 18:58 |
| ← checkItOut left | 18:58 |
| → Sarge945 joined | 18:59 |
|
_ikke_
| You need to make a pull request | 19:00 |
| ← Sarge9451 left | 19:00 |
|
_ikke_
| I see | 19:00 |
| ← hash-z3r0 left | 19:00 |
|
_ikke_
| yes, that looks alright | 19:00 |
|
| https://github.com/029/Arbetsprov/pull/60 | 19:00 |
|
| momomo: You should give the pull request a more descriptive title though | 19:01 |
|
djapo
| ok, I was able to change the actual url in the module itself .. how do I make it so that the module where it is a submodule has the correct url | 19:01 |
| ← houami left | 19:01 |
|
djapo
| I want it to track the origin url in the submodule | 19:02 |
|
| it is currently set to url = /home/archangel/git/my_projects/apple/frontclient/ | 19:02 |
| ← xD3C left | 19:02 |
| → Snaggle joined | 19:03 |
| → xD3C joined | 19:03 |
| → viric joined | 19:04 |
|
momomo
| _ikke_: thanks for the help | 19:05 |
| → ArcaTech joined | 19:05 |
| ← xeno left | 19:06 |
|
momomo
| fckuing assholes gave me this task to implement over christmas | 19:06 |
|
| to show my capability | 19:06 |
| → houami joined | 19:07 |
|
Snaggle
| If I have a branch on a fork that I keep adding things to that will eventually make it back to upstream/master via github PR, and I branched from origin/master some time ago, and I want to 1) bring the branch up to date with origin/master (which is up to date with upstream) and 2) be able to keep adding commits to it for eventual merging those commits to upstream/master, is it better to 'git rebase origin/master' or 'git merge origin/master' while in my branch | 19:07 |
|
djapo
| found my answer with git config | 19:08 |
|
_ikke_
| Snaggle: I would rebase | 19:09 |
| → xeno joined | 19:09 |
| → sjoshi joined | 19:10 |
| ← houami left | 19:11 |
| ← sjoshi left | 19:13 |
|
Snaggle
| _ikke_: thanks. How will git handle the commits I have in my branch that already made it back into master if I rebase? Won’t they be duplicated? | 19:15 |
| → houami joined | 19:17 |
| ← ArcaTech left | 19:17 |
| ← ais523 left | 19:18 |
| ← rajat left | 19:19 |
| ← mattcen left | 19:20 |
| → m0viefreak joined | 19:21 |
| ← houami left | 19:21 |
| → ArcaTech joined | 19:21 |
| → sarp joined | 19:22 |
| → rorro joined | 19:23 |
| → Lauven joined | 19:23 |
| → houami joined | 19:27 |
| ← ArcaTech left | 19:28 |
| → mattcen joined | 19:28 |
| → hash-z3r0 joined | 19:30 |
| ← houami left | 19:31 |
| → kvik joined | 19:32 |
| ← QualityAddict left | 19:32 |
| ← xD3C left | 19:33 |
| → checkItOut joined | 19:33 |
| → gugah joined | 19:34 |
| ← hash-z3r0 left | 19:35 |
| → houami joined | 19:37 |
| ← theoceaniscool left | 19:38 |
| ← checkItOut left | 19:38 |
| ← rorro left | 19:41 |
| ← houami left | 19:41 |
| → ArcaTech joined | 19:42 |
| ← Darcidride left | 19:44 |
| → theoceaniscool joined | 19:45 |
| → Guest18 joined | 19:46 |
| → FoxRocks joined | 19:46 |
| → shennyg joined | 19:49 |
| ← PtxDK left | 19:49 |
| → PtxDK joined | 19:49 |
| ← cdown left | 19:49 |
| → Sarge9451 joined | 19:50 |
| ← FoxRocks left | 19:50 |
| ← Sarge945 left | 19:52 |
| ← shennyg left | 19:53 |
| → shennyg joined | 19:54 |
| → checkItOut joined | 19:54 |
| → Noldorin joined | 19:54 |
| ← Lauven left | 19:54 |
|
_ikke_
| Snaggle: Everything merged to master is no longer relevant | 19:55 |
|
| If things are merged to master, see your branch as a new branch | 19:55 |
| → vaxcat joined | 19:56 |
| ← theoceaniscool left | 19:56 |
| ← vaxcat left | 19:56 |
| → yohnnyjoe joined | 19:57 |
| ← checkItOut left | 19:58 |
| → cdown joined | 19:59 |
| → dxc joined | 20:01 |
| → hash-z3r0 joined | 20:02 |
| ← dxc left | 20:02 |
| ← yohnnyjoe left | 20:02 |
| → schoggen joined | 20:06 |
| → Lyqyd joined | 20:06 |
| → houami joined | 20:06 |
| ← hash-z3r0 left | 20:06 |
| ← schoggen left | 20:08 |
| → theoceaniscool joined | 20:09 |
| ← Guest18 left | 20:09 |
| → Guest18 joined | 20:10 |
| ← houami left | 20:11 |
| → linuxmodder joined | 20:14 |
| ← linuxmodder left | 20:14 |
| → linuxmodder joined | 20:14 |
| → houami joined | 20:16 |
| ← ahrs left | 20:16 |
| ← luckman212 left | 20:17 |
| → ahrs joined | 20:17 |
| ← Guest18 left | 20:18 |
| → JustMeErazem joined | 20:18 |
| ← theoceaniscool left | 20:18 |
| ← JustMeErazem left | 20:19 |
| ← linuxmodder left | 20:19 |
| → Guest18 joined | 20:19 |
| ← mattcen left | 20:19 |
| → menip joined | 20:20 |
| ← houami left | 20:21 |
| ← Mike11 left | 20:21 |
|
OnceMe
| _ikke_: is merge or rebase better? | 20:22 |
| ← pbrewczynski left | 20:22 |
|
OnceMe
| in which scenario is rebase better? | 20:22 |
|
_ikke_
| OnceMe: They are complementary | 20:22 |
|
oprypin
| OnceMe, merge is simple in the moment, rebase is simpler in the long run due to linear commit history | 20:22 |
| ← ArcaTech left | 20:22 |
|
_ikke_
| it's not one vs the other | 20:22 |
|
OnceMe
| hmm, but which one to use? | 20:23 |
|
| I mean whats the case where you *cant* use rebase | 20:23 |
|
| or merge | 20:23 |
|
_ikke_
| you can alway use a merge | 20:24 |
|
| but too many merges in random directions causes complicated history | 20:24 |
| → luckman212 joined | 20:24 |
|
OnceMe
| if I understood well, rebase will make your git history looks like there were no other branches right | 20:24 |
|
_ikke_
| that's one usecase | 20:24 |
|
| but I often then do git merge --no-ff | 20:24 |
|
OnceMe
| git merge with ff is similar to rebasing? | 20:25 |
| ← re1 left | 20:25 |
|
_ikke_
| no | 20:25 |
| → Jitta joined | 20:25 |
| → mattcen joined | 20:26 |
|
_ikke_
| OnceMe: if you can ff, the history is already linear | 20:26 |
|
OnceMe
| so the same as rebase | 20:26 |
|
_ikke_
| Rebase *makes* the history linear | 20:27 |
| → phluks joined | 20:27 |
|
oprypin
| OnceMe, btw your last 3 messages are correct with minor technicalities which maybe don't let _ikke_ confirm that you're correct | 20:27 |
| ← ilyaigpetrov left | 20:30 |
| ← gugah left | 20:31 |
| → IRPG joined | 20:31 |
| ← IRPG left | 20:32 |
| ← KeyJoo left | 20:32 |
| → dave0x6d joined | 20:32 |
| → hash-z3r0 joined | 20:35 |
| ← |ifei5g00d left | 20:36 |
| ← sarp left | 20:36 |
| ← mud left | 20:37 |
| ← opalepatrick left | 20:37 |
| → |ifei5g00d joined | 20:38 |
| → houami joined | 20:38 |
| ← Guest18 left | 20:38 |
| ← hash-z3r0 left | 20:39 |
| → Guest18 joined | 20:40 |
| ← xcm left | 20:42 |
| → xcm joined | 20:42 |
| ← energizer left | 20:42 |
| → Zamerick_ joined | 20:42 |
| → energizer joined | 20:43 |
| → mda1 joined | 20:43 |
| → knop_ joined | 20:43 |
| ← houami left | 20:43 |
| ← KnoP left | 20:44 |
| ← SteffanW left | 20:45 |
| ← metts left | 20:45 |
| ← Zamerick left | 20:46 |
| ← Neo left | 20:46 |
| ← energizer left | 20:46 |
| → energizer joined | 20:46 |
| ← Noldorin left | 20:47 |
| ← dmj` left | 20:47 |
| → FoxRocks joined | 20:47 |
| ← hegge left | 20:48 |
| → houami joined | 20:49 |
|
_ikke_
| The end result might look the same, but the commands have different goals | 20:50 |
| ← navidr left | 20:51 |
|
_ikke_
| You cannot choose to use git merge --ff-only if history is diverged | 20:51 |
|
| while you *can* choose to use git rebase in that case | 20:51 |
| ← FoxRocks left | 20:52 |
| ← energizer left | 20:52 |
| → dmj` joined | 20:53 |
| ← houami left | 20:53 |
| → hash-z3r0 joined | 20:54 |
| ← Zamerick_ left | 20:55 |
| → bkxd joined | 20:56 |
| → noyb joined | 20:57 |
| ← Murr left | 20:57 |
| → Murr joined | 20:57 |
| ← Jitta left | 20:58 |
| → theoceaniscool joined | 20:58 |
| ← Munt left | 21:00 |
| → GreyO923 joined | 21:00 |
| ← GreyO923 left | 21:01 |
| ← dmj` left | 21:01 |
| → Marvel joined | 21:02 |
| ← xcm left | 21:02 |
| ← Marvel left | 21:04 |
| ← kvik left | 21:04 |
| → kvik joined | 21:05 |
| → aurednekjok joined | 21:07 |
| ← Arcaelyx left | 21:07 |
| ← gtristan left | 21:08 |
| ← aurednekjok left | 21:08 |
| ← kus left | 21:08 |
| ← hussam left | 21:12 |
| → kus joined | 21:12 |
| → hussam joined | 21:13 |
| ← mattcen left | 21:16 |
| → mattcen joined | 21:20 |
|
mac-
| hey | 21:25 |
| → olderbtm70 joined | 21:25 |
|
mac-
| I need to use several ssh keys to use for several repos | 21:26 |
|
| then I asked uncle Booble and found out few solutions | 21:26 |
| → Sarge945 joined | 21:26 |
|
thiago
| use multiple Host entries in ~/.ssh/config | 21:27 |
| ← olderbtm70 left | 21:27 |
|
mac-
| three actually: GIT_SSH_COMMAND, .ssh/config and the latest one with: config core.sshCommand | 21:27 |
|
| the most flexible is GIT_SSH_COMMAND I think - the worst scenario is to use wrong one and get Access Denied | 21:28 |
| ← Sarge9451 left | 21:28 |
| ← paul424 left | 21:29 |
|
mac-
| thiago: but User entry in .ssh/config is relevant to which user? | 21:29 |
|
| OS? git? | 21:29 |
|
thiago
| you tell me | 21:29 |
|
| that depnds on your server | 21:29 |
|
mac-
| I'm talking now about github and bitbucket | 21:30 |
|
thiago
| for github, the User is always git | 21:31 |
|
mac-
| then it is no so flexible as GIT_SSH_COMMAND | 21:31 |
|
grawity
| there's nothing you can do in GIT_SSH_COMMAND that you cannot also do in .ssh/config | 21:32 |
|
| as long as it still involves calling openssh | 21:32 |
|
mac-
| anyway, in man git I found that GIT_SSH and GIT_SSH_COMMAND are same with exception that the latter one has precedence over the first one | 21:32 |
|
gitinfo
| the git manpage is available at https://gitirc.eu/git.html | 21:32 |
|
thiago
| you don't need flexibility | 21:33 |
|
| add multiple Host entries, that's all | 21:33 |
| → energizer joined | 21:33 |
|
mac-
| but when I'm trying to use GIT_SSH I get: fatal: cannot run ssh -i /path/to/private_key: No such file or directory | 21:34 |
|
thiago
| you need a script | 21:35 |
|
| the argument to the variable is the name of a file. *Not* a command. | 21:35 |
|
mac-
| uhm, then GIT_SSH needs wrapper when GIT_SSH_COMMAND not ? | 21:35 |
|
thiago
| because one is the name of an executable, the other is a command | 21:35 |
|
_ikke_
| GIT_SSH_COMMAND is interpreted by a shell | 21:36 |
|
mac-
| oh sh*t, right I missed it: $GIT_SSH on the other hand must be just the path to a program | 21:36 |
|
_ikke_
| "Usually it is easier to configure any desired options through your personal .ssh/config file." | 21:36 |
| → Neo_ joined | 21:37 |
| ← momomo left | 21:37 |
|
mac-
| ok, thx | 21:38 |
| ← staafl__ left | 21:39 |
| → Sarge9451 joined | 21:44 |
| ← webguynow left | 21:45 |
| → webguynow joined | 21:45 |
| ← Sarge945 left | 21:46 |
| → cagomez joined | 21:46 |
| → Acerific joined | 21:46 |
| → FoxRocks joined | 21:48 |
| ← foo left | 21:48 |
| → nchambers joined | 21:49 |
| ← robattila256 left | 21:49 |
|
nchambers
| is there something like `git shortlog` but also shows the commit reference? | 21:49 |
|
thiago
| nchambers: man git-shortlog. See the format option. | 21:50 |
|
gitinfo
| nchambers: the git-shortlog manpage is available at https://gitirc.eu/git-shortlog.html | 21:50 |
|
nchambers
| thanks thiago! | 21:50 |
|
| thank you too gitinfo | 21:50 |
|
gitinfo
| nchambers: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 21:50 |
|
nchambers
| I know you're a bot :) | 21:50 |
| → dmj` joined | 21:51 |
| → robattila256 joined | 21:52 |
| ← FoxRocks left | 21:53 |
|
LVK267
| Well obviously that is wrong since you just said "you're welcome" :) Obviously you *are* programmed to care! | 21:53 |
| → CheckDavid joined | 21:53 |
|
nchambers
| yeah! | 21:53 |
| ← fatalhalt left | 21:55 |
|
qsx
| all complaints go to jast | 21:55 |
| ← cdown left | 21:55 |
| → momomo joined | 21:58 |
| → yohnnyjoe joined | 21:58 |
| ← shennyg left | 21:58 |
| → fatalhalt joined | 21:58 |
| → QualityAddict joined | 21:59 |
|
momomo
| _ikke_: you still there? | 21:59 |
| ← cagomez left | 22:00 |
|
momomo
| I detected an error in my code. I have already fixed it .. but since i already said I wanted to pull / merge my code ... is it possible to add this little change to that pull ? | 22:00 |
|
| can I take that pull request back ? and make a new one ? | 22:00 |
|
Peng_
| You can push the new commit to the branch | 22:01 |
|
thiago
| if you're talking about github, you don't need to take it back. Simply push the updated commits to the same branch. | 22:01 |
|
momomo
| so just commit -m "message"; then git push ? or git push to branch someting ? | 22:02 |
| ← OnceMe left | 22:03 |
| ← yohnnyjoe left | 22:03 |
|
thiago
| that depends on your upstream | 22:03 |
|
momomo
| the pull request was made separately though .. from the github web site | 22:03 |
|
Peng_
| Where did you push before | 22:03 |
|
oprypin
| momomo, oh, well that's tough then | 22:03 |
| → foo joined | 22:03 |
|
thiago
| they may request that you squash the change into an existing commit you're pushing | 22:03 |
|
LVK267
| Provided you take the necessary precautions to backup your repository or likewise, you can always reset back before the merge, then do a "git commit --amend" to fix your bug before pulling. | 22:03 |
|
oprypin
| dont do that next time | 22:03 |
|
LVK267
| Or you can just commit your fix | 22:03 |
|
foo
| git log in a branch *only* shows git log for *that branch* - correct? | 22:03 |
|
oprypin
| thiago, that is in the past | 22:03 |
|
LVK267
| If you have pulled then pushed, then no, you should just commit. | 22:03 |
|
oprypin
| github can squash by itself | 22:03 |
|
| foo, sure | 22:04 |
|
LVK267
| yes, git log by default will start at the tip of the current branch and go backwards. | 22:04 |
|
momomo
| oprypin: here it is https://github.com/joseph987/Arbetsprov/branches | 22:04 |
|
foo
| oprypin: thank you | 22:04 |
| → publio joined | 22:04 |
|
momomo
| the new commit is there | 22:04 |
|
| but the pull has already occurred ? | 22:04 |
|
oprypin
| momomo, did you use github's web interface to edit the file and create a pull request? | 22:04 |
|
| thiago requires contributors to squash and push the update | 22:04 |
|
oprypin
| thiago, that's silly | 22:04 |
|
foo
| If I have a branch that has new files and commits different from master, and if I decide I don't want that feature, I can simply delete the branch - thus removing those files/commits, and they'll be lost. Correct? | 22:04 |
|
LVK267
| @foo, correct. | 22:05 |
|
momomo
| oprypin: no, just to pull with a message after things were pushed .. it seemes they already accepted my first pull ? | 22:05 |
|
thiago
| oprypin: if they send two commits, they mean to send two separate commits | 22:05 |
|
foo
| LVK267: thank you | 22:05 |
|
thiago
| I don't accept "introduce bug" and "fix bug" commits | 22:05 |
| → cagomez joined | 22:05 |
|
oprypin
| thanks for describing but that doesn't change the fact that it's silly | 22:05 |
|
thiago
| yes, it's silly to introduce a mistake and fix it | 22:06 |
|
momomo
| can someone tell me what has happened with this branch ? https://github.com/joseph987/Arbetsprov/tree/joseph-seifeddine-feature-branch | 22:06 |
|
thiago
| just let's not have it in the first place | 22:06 |
| → xD3C joined | 22:06 |
|
oprypin
| then you have to re-review the whole change | 22:06 |
|
momomo
| do I have two branches active ? https://github.com/joseph987/Arbetsprov | 22:07 |
|
| it says 2 branches | 22:07 |
|
LVK267
| @foo The only thing (concept) that keeps a commit alive is a live reference to it. A live reference can be a branch pointer, a tag (or similar) or another commit that points to it. If you delete all live references to a commit, the commit will eventually be garbage collected, and thus a string of commits will be eligible for collection/removal. Almost all git commands will stop considering gits if they're no longer | 22:07 |
|
| referenced, even if they currently exist on disk. | 22:07 |
|
thiago
| oprypin: yes | 22:07 |
|
oprypin
| instead you could review just the tiny fix | 22:07 |
|
LVK267
| So the deletion of the branch will stop almost all commands from referring to/counting those commits, and when garbage collection occurs they'll be gone. | 22:07 |
|
thiago
| oprypin: that's where the web UI fails. Other, good review tools allow to do a patchset-to-patchset comparison | 22:07 |
|
foo
| I did git reset --hard HEAD~1 in a branch - thinking it would show me the differing commits / files, then I could recommit/delete as necessary. Instead, I did that and I do git status and it shows me no new files. I wonder, did I delete those files from the last commit? Now I wonder if there is a way to get them bac, heh | 22:07 |
|
LVK267
| yes, there is a way to get them back, right now | 22:08 |
|
thiago
| they also show where I left comments, so I can tell if everything I asked to be changed was, indeed, changed. | 22:08 |
|
LVK267
| when you did "git reset --hard SOMETHING" you updated both your index and your working folder at the same time. | 22:08 |
|
thiago
| foo: git reset --hard @{1} | 22:08 |
|
momomo
| someone .. did the first (earlier today) pull go through already ? | 22:08 |
|
LVK267
| However, the previous commit still exists on disk. | 22:08 |
|
thiago
| foo: the --hard switch applies the changes to the worktree | 22:08 |
|
LVK267
| git reflog should tell you which commit you switched from | 22:09 |
|
momomo
| the new commits are ok? i can't see that I can make a new pull anywher e.. maybe it's all part of the same ? | 22:09 |
|
foo
| LVK267: aha, ok - will try | 22:09 |
|
momomo
| so I don't need to do antyhing | 22:09 |
|
foo
| thiago: thanks, checking now | 22:09 |
|
LVK267
| The best way to get rid of a commit on a branch is first to create a temporary branch for the current commit, then use reset to go back the requisite number of commits. You won't accidentally lose anything this way. | 22:09 |
|
momomo
| it says 2 commits ahead of master | 22:09 |
|
LVK267
| ie. first. "git branch TEMP", then "git reset --hard WHATEVER". Until you delete the "TEMP" branch you won't lose anything. | 22:10 |
|
oprypin
| momomo, good, just push it? | 22:10 |
|
| momomo, it's already there, what else do you want? https://github.com/029/Arbetsprov/pull/60/commits | 22:10 |
|
momomo
| oprypin: i already pushed .. i think that push is already part of the first earlier pull | 22:10 |
|
| https://github.com/029/Arbetsprov/compare/master...joseph987:joseph-seifeddine-feature-branch?expand=1 | 22:10 |
|
oprypin
| good | 22:10 |
|
momomo
| oprypin: great, yes, now i can see both commits! | 22:11 |
|
foo
| LVK267: thank you (PS. Prefacing messages with foo, or whoever you're speaking to, would help ensure your great advice is received :)) Thank you! | 22:11 |
| ← Barrt left | 22:11 |
| → draget joined | 22:13 |
| → Barrt joined | 22:13 |
|
foo
| git reflog was helpful... I have this: https://bpaste.net/show/cf39a9c718b2 - if I want to get to HEAD@{8} (line 8), I believe I do git reset --hard @{1} in the branch I'm in, and that should then show me the files with changes/new when I do git status - correct? | 22:15 |
| ← energizer left | 22:16 |
| → energizer joined | 22:16 |
| ← energizer left | 22:17 |
| ← theoceaniscool left | 22:17 |
| → energizer joined | 22:17 |
| ← nivag_ left | 22:17 |
| ← dmaian left | 22:17 |
| → dmaian joined | 22:17 |
| → cdown joined | 22:18 |
|
momomo
| guys, i can see previous peoples solutions .. their pull requests .. for instance; https://github.com/029/Arbetsprov/pull/55 .... but how can I actually see his entire solution ? I can only see what he has committed .. | 22:19 |
|
| like I would to see the entire branch | 22:19 |
|
| in a neat file structuere | 22:19 |
| ← cagomez left | 22:20 |
|
LVK267
| @foo then 5b5c70d was your previous commit. | 22:20 |
|
| Before the reset | 22:21 |
|
| to "get it back" issue this command: git branch TEMP 5b5c70d | 22:21 |
|
| This will create a TEMP branch referring to the commit, you can merge it in, cherry-pick it, show it, etc. | 22:21 |
|
| Sorry, that is the sha of the new commit | 22:22 |
|
| e2260d9 is the commit before the reset | 22:23 |
| ← perrier-jouet left | 22:23 |
| ← exotime left | 22:24 |
| → perrier-jouet joined | 22:24 |
| ← draget left | 22:24 |
| ← cdown left | 22:25 |
| ← mattcen left | 22:25 |
| ← a3Dman left | 22:27 |
| → mattcen joined | 22:27 |
|
foo
| LVK267: thank you, it looks like e2260d9 HEAD@{7}: commit: WIP Testing spiders for crawling - this was the first commit in this branch that changed the sha. So, to create a temp branch referring to the pre-commit sha, I do git branch TEMP 5b5c70d - correct? | 22:28 |
|
LVK267
| No, git branch TEMP e2260d9 | 22:28 |
|
| This will create a branch that points to the commit with the sha e2260d9............ | 22:29 |
| ← mel00010 left | 22:29 |
| → exotime joined | 22:29 |
|
foo
| LVK267: nice, thank you. I'm beginning to think the files I added were pre-commit e2260d9. /me checks | 22:31 |
|
| oh, heh, yeah. Nonetheless, this is still helpful. | 22:31 |
| ← phluks left | 22:32 |
|
LVK267
| Rule #1 with git, don't be afraid of experimenting. Rule #0 of git, make sure you have a backup! | 22:32 |
|
foo
| LVK267: ha! I like it. :) | 22:32 |
|
| LVK267: so I believe, from skills-scout I can now do git merge TEMP ... put those files back in here, then be back at where I was | 22:32 |
|
| Correct? | 22:33 |
| → FoxRocks joined | 22:33 |
|
LVK267
| If you merge in that commit, then the files and their changes will be back, yes,. | 22:33 |
| ← Guest18 left | 22:33 |
|
foo
| For having "backups" - I usually cp -R the dir that has the .git repo in it. Are there other suggested options? | 22:34 |
|
LVK267
| If you make a complete copy of your git repository you're golden. | 22:35 |
| → a3Dman joined | 22:35 |
| ← Snaggle left | 22:35 |
| → ArcaTech joined | 22:36 |
|
foo
| Great | 22:36 |
|
| LVK267: Appreciate your help, thank you :) | 22:36 |
| ← Barrt left | 22:36 |
| → theoceaniscool joined | 22:43 |
| ← momomo left | 22:44 |
| ← theoceaniscool left | 22:49 |
| ← Xiti left | 22:49 |
| ← ChristmasCat left | 22:49 |
| → Xiti joined | 22:50 |
| ← mooasaurus left | 22:51 |
| → mooasaurus joined | 22:51 |
| → Barrt joined | 22:52 |
| → HuskyApocalypse joined | 22:53 |
| ← Tobbi left | 22:53 |
| ← ArcaTech left | 22:55 |
| ← Murr left | 22:57 |
| → Murr joined | 22:57 |
| ← thiago left | 22:57 |
| ← xD3C left | 22:59 |
| ← basiclaser left | 23:01 |
| → thiago joined | 23:04 |
| → houami joined | 23:04 |
| ← houami left | 23:09 |
| ← kus left | 23:20 |
| ← exotime left | 23:23 |
| ← giraffe left | 23:23 |
| → pdp11 joined | 23:23 |
| → jagob joined | 23:24 |
| → jimmyrcom joined | 23:26 |
| ← pdp11 left | 23:28 |
| ← jnavila left | 23:28 |
| → exotime joined | 23:28 |
| → pdp11 joined | 23:28 |
| → Guest18 joined | 23:30 |
| ← hash-z3r0 left | 23:32 |
| ← pdp11 left | 23:32 |
| → cdown joined | 23:34 |
| → converge joined | 23:35 |
| ← converge left | 23:35 |
| → converge joined | 23:35 |
| ← royal_screwup21 left | 23:35 |
| ← jagob left | 23:35 |
| → in1t3r_ joined | 23:35 |
| ← in1t3r_ left | 23:35 |
| → in1t3r joined | 23:36 |
| ← cdown left | 23:38 |
| ← shiva__ left | 23:38 |
| → clickjac_ joined | 23:40 |
| ← clickjack left | 23:40 |
| ← grumble left | 23:40 |
| ← aielima left | 23:40 |
| → cdown joined | 23:41 |
| → ArcaTech joined | 23:41 |
| ← cdown left | 23:43 |
| → naiveai joined | 23:44 |
| → Saragog joined | 23:45 |
| → grumble joined | 23:45 |
| → jagob joined | 23:47 |
| → hash-z3r0 joined | 23:47 |
| → cdown joined | 23:48 |
| ← HuskyApocalypse left | 23:51 |
| ← dsdeiz left | 23:53 |
| → dsdeiz joined | 23:53 |
| ← hash-z3r0 left | 23:57 |
| → kus joined | 23:59 |
| → Tobbi joined | 23:59 |