| 2017-12-29 |
| → jcarpenter2 joined | 00:00 |
| ← houami left | 00:02 |
| ← msev- left | 00:03 |
| ← finalbeta left | 00:04 |
| ← Mike11 left | 00:07 |
| → msev- joined | 00:09 |
| → houami joined | 00:09 |
| → __main__ joined | 00:12 |
| → xxMatiasFxx joined | 00:13 |
| → BSaboia joined | 00:13 |
| ← BSaboia left | 00:13 |
| ← xxMatiasxx left | 00:13 |
| ← houami left | 00:14 |
| ← akushner left | 00:16 |
| ← mattcen left | 00:17 |
| ← igemnace left | 00:17 |
| → igemnace joined | 00:18 |
| → pandeiro joined | 00:19 |
| → mattcen joined | 00:19 |
| → overlord_tm joined | 00:21 |
| → houami joined | 00:22 |
| ← tvw left | 00:23 |
| ← houami left | 00:27 |
| ← pkx2 left | 00:29 |
| ← dege left | 00:30 |
| → metts joined | 00:31 |
| → foul_owl joined | 00:34 |
|
foul_owl
| How do I search all branches for a file? | 00:34 |
| → houami joined | 00:34 |
|
foul_owl
| I tried git log --all -- somefile but it doesn't tell me what branch the file is in | 00:34 |
|
| Thanks! | 00:34 |
|
| Plus it looks like you have to know the exact path | 00:36 |
| ← xxMatiasFxx left | 00:38 |
| → cdown joined | 00:38 |
| ← houami left | 00:39 |
| ← pR0Ps left | 00:39 |
| → HuskyApocalypse joined | 00:39 |
|
avar
| foul_owl: you take the commits it lists and feed it to git branch --contains <commit> | 00:42 |
| → pR0Ps joined | 00:42 |
| ← jstein left | 00:42 |
| → houami joined | 00:46 |
| ← manuelschneid3r left | 00:46 |
| ← xcm left | 00:48 |
| → xcm joined | 00:48 |
| ← houami left | 00:51 |
| ← marian1235813 left | 00:52 |
| → ToBeFree joined | 00:54 |
| gitinfo set mode: +v | 00:55 |
| ← ToBeFree left | 00:55 |
| ← xaxxon left | 00:56 |
| ← dsdeiz left | 00:58 |
| → houami joined | 00:58 |
| → dsdeiz joined | 00:59 |
| ← dsdeiz left | 00:59 |
| → dsdeiz joined | 00:59 |
| ← whitby left | 01:02 |
| ← Cabanossi left | 01:03 |
| ← houami left | 01:03 |
| ← Forlorn left | 01:04 |
| → whitby joined | 01:04 |
| → Cabanossi joined | 01:04 |
|
Hello71
| or --decorate | 01:07 |
|
| --graph | 01:07 |
| → houami joined | 01:10 |
| → noobineer joined | 01:11 |
| ← noobineer left | 01:11 |
| ← re1 left | 01:12 |
| ← houami left | 01:15 |
| ← ZyX-I left | 01:16 |
| ← yohnnyjoe left | 01:21 |
| ← aielima left | 01:21 |
| ← shinnya left | 01:21 |
| → awkwardpenguin joined | 01:26 |
| ← dsdeiz left | 01:30 |
| → dsdeiz joined | 01:30 |
| ← clickjack left | 01:31 |
| ← awkwardpenguin left | 01:32 |
| → ok91 joined | 01:32 |
| → maheshpec joined | 01:32 |
| ← overlord_tm left | 01:33 |
| → houami joined | 01:35 |
| ← cdown left | 01:36 |
| ← ok91 left | 01:37 |
|
raynold
| ahh it's a wonderful day | 01:37 |
| → clickjack joined | 01:38 |
| ← houami left | 01:39 |
| → safe joined | 01:40 |
| → bkxd joined | 01:40 |
| ← Shah2 left | 01:44 |
| ← Enphuego left | 01:45 |
| → houami joined | 01:47 |
| → Forlorn joined | 01:50 |
| ← houami left | 01:51 |
| → FoxRocks joined | 01:52 |
| ← notbenh_ left | 01:53 |
| ← Travis-42 left | 01:53 |
| ← sebhoss left | 01:53 |
| ← huhlig left | 01:53 |
| ← stealthii left | 01:53 |
| ← tharuin left | 01:53 |
| → Travis-42 joined | 01:54 |
| → notbenh_ joined | 01:54 |
| → sebhoss joined | 01:55 |
| → tharuin joined | 01:55 |
| → huhlig joined | 01:55 |
| → stealthii joined | 01:55 |
| ← dsdeiz left | 01:55 |
| → dsdeiz joined | 01:55 |
| ← dsdeiz left | 01:55 |
| → dsdeiz joined | 01:55 |
| ← tac-tics left | 01:56 |
| ← Gustavo6046 left | 01:57 |
| ← snits_ left | 01:57 |
| → snits joined | 01:58 |
| ← orbyt_ left | 01:59 |
| ← dsdeiz left | 02:01 |
| ← henriquev left | 02:01 |
| → dsdeiz joined | 02:01 |
| ← dsdeiz left | 02:01 |
| → dsdeiz joined | 02:01 |
|
foul_owl
| How do I find the file if I don't know the exact path though? Thank you! | 02:01 |
| ← bkxd left | 02:01 |
| ← TomyLobo left | 02:02 |
| → orbyt_ joined | 02:03 |
|
Hello71
| dunno. guess you could do git log --all --format=something | xargs git ls-tree | grep | 02:03 |
|
| or something | 02:04 |
| ← snits left | 02:06 |
| → snits joined | 02:06 |
| ← jim left | 02:06 |
| ← snits left | 02:08 |
| ← xD3C left | 02:08 |
| → snits joined | 02:09 |
| → xD3C joined | 02:09 |
| ← phinxy left | 02:11 |
| ← xD3C left | 02:11 |
| → jim joined | 02:12 |
|
b0nn
| foul_owl: I use --stat to list all the files, then search through the output with a /<filename> | 02:15 |
| ← pandeiro left | 02:15 |
| → finalbeta joined | 02:15 |
|
foul_owl
| git --stat? Thanks! | 02:16 |
| ← discopatrick left | 02:16 |
| → ficolas joined | 02:17 |
| ← current_user left | 02:17 |
|
b0nn
| git log --stat, sorry | 02:17 |
|
foul_owl
| Thank you! | 02:19 |
|
| How do you not use the pager? | 02:19 |
|
ficolas
| hello, im trying to download an older version of a git rep to my computer. To do so, I created a fork, and then on the git console I did "git clone myRepp", "git checkout tagName", "git checkout -b newBranchName", but now, how do I download the branch to my computer? | 02:19 |
| → ResidentBiscuit joined | 02:21 |
| ← leeN left | 02:21 |
|
igemnace
| it's all been on your computer since you did git clone | 02:21 |
|
ficolas
| oh | 02:21 |
|
| so how do I access it now? | 02:21 |
|
igemnace
| the branch? you're already on it; git checkout -b newBranchName creates a new branch then checks it out | 02:22 |
|
ficolas
| oh that was fast | 02:23 |
| ← eshlox left | 02:23 |
|
ficolas
| I expected some copying time or something O_o | 02:23 |
|
| thanks! | 02:23 |
| ← Arcaelyx left | 02:26 |
|
igemnace
| welcome to git :) | 02:28 |
|
| ficolas: branches are pointers so they're very cheap. https://git-scm.com/book/en/v2 is a nice read if you have spare time | 02:29 |
| ← Noldorin left | 02:29 |
| ← pR0Ps left | 02:29 |
| → xaxxon joined | 02:29 |
|
ResidentBiscuit
| ^ The first three chapters are all you need for everyday usage | 02:29 |
| → lyxus joined | 02:31 |
| → pR0Ps joined | 02:31 |
|
ficolas
| i'll drop that on the todo learning bookmark folder c: | 02:33 |
| → cdg joined | 02:38 |
| ← dsdeiz left | 02:43 |
| ← robattila256 left | 02:44 |
| ← ilbot3 left | 02:44 |
| → dsdeiz joined | 02:44 |
| ← dsdeiz left | 02:44 |
| → dsdeiz joined | 02:44 |
| → cqi joined | 02:45 |
| ← thiago left | 02:45 |
| → ojdo joined | 02:45 |
| ← ResidentBiscuit left | 02:51 |
| ← IanLiu left | 02:53 |
| → ResidentBiscuit joined | 02:54 |
| ← tombusby left | 02:56 |
| → ilbot3 joined | 02:59 |
| → tombusby joined | 03:00 |
| ← clickjack left | 03:02 |
| ← VoradorPT left | 03:02 |
| → dax joined | 03:03 |
| ← m0viefreak left | 03:04 |
| ← kupad left | 03:05 |
| → clickjack joined | 03:11 |
| ← Dragon092 left | 03:11 |
| → Dragon092 joined | 03:12 |
| → lagothrix joined | 03:13 |
| ← FoxRocks left | 03:16 |
| ← lagothri1 left | 03:17 |
| ← xaxxon left | 03:17 |
| ← clickjack left | 03:21 |
| ← maheshpec left | 03:22 |
| → robattila256 joined | 03:23 |
| ← lyxus left | 03:24 |
| → imack joined | 03:25 |
| ← chachasmooth_ left | 03:28 |
| → chachasmooth joined | 03:28 |
| → awkwardpenguin joined | 03:28 |
| → bkxd joined | 03:29 |
| ← imack left | 03:31 |
| ← awkwardpenguin left | 03:33 |
| → Arcaelyx joined | 03:34 |
| ← webguynow left | 03:35 |
| ← orbyt_ left | 03:35 |
| → webguynow joined | 03:36 |
| ← Forlorn left | 03:37 |
| ← energizer left | 03:40 |
| → energizer joined | 03:41 |
| ← bkxd left | 03:42 |
| ← webdev007 left | 03:43 |
| → jtl_ joined | 03:44 |
| → schooner joined | 03:47 |
| → lyxus joined | 03:47 |
| ← lyxus left | 03:49 |
| ← schooner left | 03:50 |
| → lalomergo joined | 03:50 |
| ← ResidentBiscuit left | 03:50 |
| → xxMatiasFxx joined | 03:52 |
| ← Amanas left | 03:55 |
| ← npgm left | 03:55 |
| ← madewokherd left | 03:56 |
| → Noldorin joined | 03:59 |
| → lyxus joined | 04:01 |
| ← HuskyApocalypse left | 04:06 |
| → madewokherd joined | 04:11 |
| ← xxMatiasFxx left | 04:12 |
| → xxMatiasxx joined | 04:12 |
| → HuskyApocalypse joined | 04:13 |
| → orbyt_ joined | 04:13 |
| → houami joined | 04:14 |
| ← HuskyApocalypse left | 04:15 |
| → mizu_no_oto joined | 04:16 |
| ← dviola left | 04:19 |
| → raijin joined | 04:22 |
| → shripadr joined | 04:23 |
| ← Noldorin left | 04:24 |
| ← drewmcmillan left | 04:25 |
| ← daynaskully left | 04:25 |
| ← lyxus left | 04:28 |
| ← igemnace left | 04:29 |
| → daynaskully joined | 04:30 |
| → HuskyApocalypse joined | 04:31 |
| → bkxd joined | 04:31 |
| ← webguynow left | 04:32 |
| → webguynow joined | 04:33 |
| ← houami left | 04:39 |
| ← madewokherd left | 04:39 |
| → FoxRocks joined | 04:42 |
| → akushner joined | 04:47 |
| → imack joined | 04:47 |
| ← robattila256 left | 04:50 |
| → schooner joined | 04:51 |
| ← MACscr left | 04:52 |
| → igemnace joined | 04:53 |
| ← Cabanossi left | 04:54 |
| ← ficolas left | 04:55 |
| ← dsdeiz left | 04:56 |
| → dsdeiz joined | 04:56 |
| ← dsdeiz left | 04:56 |
| → dsdeiz joined | 04:56 |
| → tunekey joined | 04:56 |
| ← skalpin left | 04:56 |
| → Cabanossi joined | 04:57 |
| ← xxMatiasxx left | 04:57 |
| → madewokherd joined | 04:58 |
| → Claw_wolf joined | 05:01 |
| ← Claw_wolf left | 05:01 |
| → Claw_wolf joined | 05:01 |
| ← pks left | 05:03 |
| ← a3Dman left | 05:04 |
| → pks joined | 05:04 |
| ← Iroha left | 05:05 |
| → Iroha joined | 05:06 |
| → houami joined | 05:08 |
| → clickjack joined | 05:08 |
| ← lalomergo left | 05:10 |
| → yohnnyjoe joined | 05:19 |
| ← orbyt_ left | 05:21 |
| ← yohnnyjoe left | 05:24 |
| justan0theruser → justanotheruser | 05:27 |
| ← FoxRocks left | 05:28 |
| → skalpin joined | 05:30 |
| → a3Dman joined | 05:31 |
| ← stoopkid left | 05:31 |
| → kupad joined | 05:33 |
| ← cdg left | 05:34 |
| ← jcarpenter2 left | 05:35 |
| → jcarpenter2 joined | 05:35 |
| ← whitby left | 05:43 |
| ← mizu_no_oto left | 05:44 |
| ← clickjack left | 05:44 |
| → lyxus joined | 05:45 |
| → FoxRocks joined | 05:51 |
| ← akushner left | 05:53 |
| ← jcarpenter2 left | 05:54 |
| → BenderRodriguez joined | 05:54 |
| → LocaMocha joined | 05:56 |
| → clickjack joined | 05:57 |
| → zumba_addict joined | 05:57 |
| ← Arcaelyx left | 05:57 |
| ← raijin left | 05:59 |
| ← jtl_ left | 06:00 |
| ← foul_owl left | 06:05 |
| ← cdleonard left | 06:07 |
| ← Xiti left | 06:11 |
| ← clickjack left | 06:11 |
| → Xiti joined | 06:12 |
| ← schooner left | 06:15 |
| ← safe left | 06:17 |
| → clickjack joined | 06:18 |
| ← Claw_wolf left | 06:19 |
| → ZyX-I joined | 06:20 |
| → Motoko joined | 06:21 |
| → Claw_wolf joined | 06:21 |
| ← Claw_wolf left | 06:21 |
| → Claw_wolf joined | 06:21 |
| → akushner joined | 06:26 |
| → StOBlind joined | 06:27 |
| ← madewokherd left | 06:27 |
| ← kdragon left | 06:27 |
| → kdragon joined | 06:28 |
| ← clickjack left | 06:28 |
| ← Claw_wolf left | 06:31 |
| → wandering_vagran joined | 06:34 |
| → clickjack joined | 06:36 |
| → Claw_wolf joined | 06:36 |
| ← clickjack left | 06:38 |
| ← khisanth_ left | 06:39 |
| ← dsdeiz left | 06:40 |
| → dsdeiz joined | 06:40 |
| → coumbole joined | 06:42 |
| ← Claw_wolf left | 06:44 |
| ← ShekharReddy left | 06:44 |
| → Claw_wolf joined | 06:48 |
| ← Claw_wolf left | 06:48 |
| → Claw_wolf joined | 06:48 |
| → clickjack joined | 06:52 |
| → khisanth_ joined | 06:54 |
| → lordjancso joined | 06:55 |
| ← clickjack left | 06:56 |
| ← Claw_wolf left | 06:58 |
| ← dsdeiz left | 06:58 |
| → dsdeiz joined | 06:59 |
| ← dsdeiz left | 07:00 |
| → dsdeiz joined | 07:00 |
| ← bergice_ left | 07:01 |
| → awkwardpenguin joined | 07:03 |
| ← FoxRocks left | 07:06 |
| → clickjack joined | 07:06 |
| ← awkwardpenguin left | 07:07 |
| → Claw_wolf joined | 07:09 |
| ← Claw_wolf left | 07:09 |
| → Claw_wolf joined | 07:09 |
| → dec0n joined | 07:10 |
| → zmt00 joined | 07:10 |
| ← zmt00 left | 07:11 |
| ← clickjack left | 07:12 |
| ← Wetmelon left | 07:13 |
| → KeyJoo joined | 07:15 |
| → JeroenT joined | 07:17 |
| ← boombatower left | 07:17 |
| → yohnnyjoe joined | 07:20 |
| → notnull joined | 07:22 |
| ← yohnnyjoe left | 07:25 |
| ← Claw_wolf left | 07:26 |
| ← StOBlind left | 07:26 |
| ← JeroenT left | 07:26 |
| → JeroenT joined | 07:26 |
| → StOBlind joined | 07:27 |
| → eduardas_m joined | 07:29 |
| → re1 joined | 07:30 |
| → d0hboy joined | 07:31 |
| → Claw_wolf joined | 07:33 |
| ← Claw_wolf left | 07:33 |
| → Claw_wolf joined | 07:33 |
| → clickjack joined | 07:34 |
| ← d0hboy left | 07:35 |
| ← duderonomy left | 07:35 |
| ← clickjack left | 07:38 |
| ← Looper left | 07:43 |
| ← lyxus left | 07:48 |
| ← zumba_addict left | 07:49 |
| → abba joined | 07:50 |
| ← ZyX-I left | 07:56 |
| → YuGiOhJCJ joined | 07:59 |
| ← YuGiOhJCJ left | 07:59 |
| → YuGiOhJCJ joined | 08:01 |
| ← Claw_wolf left | 08:01 |
| → Claw_wolf joined | 08:02 |
| ← Claw_wolf left | 08:02 |
| → Claw_wolf joined | 08:02 |
| McKraken → McKraken_zzzzz | 08:02 |
| ← YuGiOhJCJ left | 08:10 |
| → YuGiOhJCJ joined | 08:11 |
| → Elephantenna joined | 08:13 |
| → masuberu joined | 08:14 |
| ← rkta left | 08:15 |
| ← lordjancso left | 08:15 |
| → bessamatic joined | 08:15 |
| ← HElephant left | 08:17 |
| ← goweol1 left | 08:19 |
| → duderonomy joined | 08:20 |
| ← bessamatic left | 08:21 |
| → ilyaigpetrov joined | 08:22 |
| → t0adst00l joined | 08:24 |
| → Xiti` joined | 08:27 |
| → MACscr joined | 08:28 |
|
amosbird
| Hello | 08:28 |
| → lordjancso joined | 08:29 |
|
amosbird
| how can I make submodule checkout to the latest commit after i did submodule update? | 08:29 |
|
| https://la.wentropy.com/vAij | 08:29 |
|
| it doesn't move the master branch | 08:29 |
| ← Xiti left | 08:29 |
| ← Xiti` left | 08:32 |
| → ShekharReddy joined | 08:32 |
| → Xiti joined | 08:32 |
| ← dsdeiz left | 08:35 |
| ← skylite left | 08:35 |
| → dsdeiz joined | 08:35 |
| ← Motoko left | 08:40 |
| ← ghost43 left | 08:41 |
| ← kadoban left | 08:41 |
| ← Claw_wolf left | 08:42 |
| → Claw_wolf joined | 08:42 |
| ← Claw_wolf left | 08:42 |
| → Claw_wolf joined | 08:42 |
| → ghost43 joined | 08:43 |
| → marian1235813 joined | 08:44 |
| ← katiex7 left | 08:49 |
| → robattila256 joined | 08:50 |
| → skylite joined | 08:52 |
| → phinxy joined | 08:52 |
| → SteffanW joined | 08:55 |
| → goweol joined | 08:56 |
| → Lyqyd joined | 08:58 |
| → ShapeShifter499 joined | 09:01 |
| ← Claw_wolf left | 09:01 |
| → Darcidride joined | 09:02 |
| ← bket left | 09:03 |
| → awkwardpenguin joined | 09:04 |
| ← t_robotham left | 09:05 |
| → clickjack joined | 09:05 |
| ← SteffanW left | 09:06 |
| ← masuberu left | 09:07 |
| → jorth joined | 09:08 |
| ← awkwardpenguin left | 09:09 |
| → bket joined | 09:09 |
| → nitemare joined | 09:09 |
| ← cqi left | 09:10 |
| nitemare → Guest22890 | 09:10 |
| ← PioneerAxon left | 09:11 |
| ← goweol left | 09:12 |
| → goweol joined | 09:14 |
| gitinfo set mode: +v | 09:14 |
| ← Guest22890 left | 09:14 |
|
jorth
| Hi. `git am` refuses to apply a patch: `error: patch failed: ...`. But `git apply` applies the patch without a comment. What's going on here and how do I get `git am` to apply the patch? | 09:14 |
|
| I'm using `git am 0001-patch.patch` and `git apply 0001-patch.patch` | 09:15 |
| → howdoi joined | 09:15 |
| → PioneerAxon joined | 09:16 |
| ← beerdrop left | 09:18 |
| ← CheckDavid left | 09:19 |
|
jorth
| looks like it works if I pass `--ignore-whitespace` to `am`. | 09:20 |
| ← jorth left | 09:20 |
| → Floflobel joined | 09:21 |
| → yohnnyjoe joined | 09:21 |
| ← Lyqyd left | 09:23 |
| ← bcc left | 09:24 |
| → bcc joined | 09:25 |
| ← bcc left | 09:25 |
| → bcc joined | 09:25 |
| ← yohnnyjoe left | 09:25 |
| → czart joined | 09:28 |
| ← b0nn left | 09:29 |
| ← goweol left | 09:29 |
| → beerdrop joined | 09:32 |
| → masuberu joined | 09:34 |
| → overlord_tm joined | 09:34 |
| → shinnya joined | 09:37 |
| → babyflakes joined | 09:42 |
| ← notnull left | 09:43 |
| → phluks joined | 09:46 |
| → discopatrick joined | 09:48 |
| ← marian1235813 left | 09:49 |
| → bergice_ joined | 09:52 |
| → SteffanW joined | 09:52 |
| ← fatalhalt left | 09:53 |
| ← duderonomy left | 09:53 |
| ← re1 left | 09:56 |
| → mosab joined | 09:57 |
| → chaosruler joined | 09:57 |
| → duderonomy joined | 09:58 |
|
amosbird
| Hi, is git ls-files affected by .gitignore ? | 10:09 |
| mosab → mos3abof | 10:09 |
| ← shripadr left | 10:14 |
| ← robattila256 left | 10:16 |
|
grawity
| there are --options for that | 10:17 |
|
_ikke_
| --exclude-standard | 10:17 |
| ← Kaisyu left | 10:19 |
| → guideline_ joined | 10:20 |
| ← guideline left | 10:22 |
| → marian1235813 joined | 10:23 |
| ← kozy left | 10:24 |
| → vilez joined | 10:24 |
| → kozy joined | 10:25 |
| → cdown joined | 10:26 |
| ← cdown left | 10:27 |
| → cdown joined | 10:28 |
| ← phluks left | 10:29 |
| → thiago joined | 10:32 |
| ← YuGiOhJCJ left | 10:33 |
| → MarioBranco joined | 10:34 |
| → schleppel joined | 10:35 |
| → jceb joined | 10:35 |
| → re1 joined | 10:36 |
| ← bkxd left | 10:45 |
| → IanLiu joined | 10:48 |
| → wxg joined | 10:51 |
| → bkxd joined | 10:56 |
| ← chaosruler left | 10:56 |
| → chaosruler joined | 10:56 |
| ← Murr left | 10:57 |
| → Murr joined | 10:57 |
| ← wxg left | 11:06 |
| → awkwardpenguin joined | 11:06 |
| ← awkwardpenguin left | 11:11 |
| ← imack left | 11:12 |
| ← DevAntoine left | 11:14 |
| ← Copenhagen_Bram left | 11:16 |
| → imack joined | 11:17 |
| ← Dewin left | 11:18 |
| → juv joined | 11:18 |
| ← ShapeShifter499 left | 11:18 |
| → Copenhagen_Bram joined | 11:21 |
| → yohnnyjoe joined | 11:22 |
| ← bkxd left | 11:23 |
| → wxg joined | 11:23 |
| → notnull joined | 11:24 |
| → LogicAside joined | 11:24 |
| → bkxd joined | 11:25 |
| LogicAside → ThatOtherGuy | 11:25 |
| ← yohnnyjoe left | 11:27 |
| ← nanga left | 11:28 |
| ← cdown left | 11:31 |
| ← t0adst00l left | 11:31 |
| ← Copenhagen_Bram left | 11:32 |
| → navidr joined | 11:32 |
| → nanga joined | 11:33 |
| ← nanga left | 11:33 |
| → nanga joined | 11:33 |
| ← KeyJoo left | 11:42 |
| ← enkrypt left | 11:42 |
| → Dewin joined | 11:43 |
| → Milijus joined | 11:49 |
| → Copenhagen_Bram joined | 11:49 |
| ← coumbole left | 11:50 |
| → leeN joined | 11:51 |
| ← bkxd left | 11:51 |
| ← igemnace left | 11:54 |
| ← wxg left | 11:56 |
| → enkrypt joined | 11:56 |
| → [ADN] joined | 11:56 |
| → JeroenT_ joined | 11:57 |
| → TomyLobo joined | 11:57 |
| → wxg joined | 11:57 |
| ← JeroenT left | 12:00 |
| → jnavila joined | 12:02 |
| → linus1 joined | 12:06 |
| ← bket left | 12:06 |
|
linus1
| Hi all. If I've done git cherry-pick foo bar baz, and encountered a conflict with bar which led me to decide that bar shouldn't be included after all, is there a way to skip bar (like with git rebase --skip)? | 12:07 |
|
thiago
| git cherry-pick advertises a --skip option but I've never got it to work | 12:13 |
|
| abort and run it again | 12:14 |
|
linus1
| that would cause me to lose some previous conflict resolutions that I'd rather not :( | 12:14 |
|
| I don't see the --skip option in the manpage | 12:15 |
|
thiago
| first of all, that's what rerere is for | 12:16 |
|
linus1
| although I suppose I could make a branch from the current HEAD | 12:16 |
|
thiago
| second, don't cherry-pick the original commits. Cherry-pick the commits you've just made, with the fixes | 12:16 |
|
| HEAD is always current | 12:17 |
| ← energizer left | 12:17 |
|
linus1
| yeah I mean as opposed to the HEAD after aborting the cherry-pick | 12:18 |
|
| That did it, thanks for the help :) | 12:18 |
|
| so for future reference for myself: cherry-pick one commit at a time or just use rebase | 12:20 |
| ← raynold left | 12:20 |
| → cdown joined | 12:26 |
| → ShapeShifter499 joined | 12:27 |
| ← metts left | 12:27 |
| ← JeroenT_ left | 12:30 |
| ← NightMonkey left | 12:31 |
| ← imack left | 12:31 |
| → m0viefreak joined | 12:32 |
| ← Milijus left | 12:35 |
| → Milijus joined | 12:36 |
| ← mos3abof left | 12:39 |
| → mos3abof joined | 12:39 |
| → xxMatiasxx joined | 12:41 |
|
TomyLobo
| hi, i need to programmatically check for changes to the worktree and index | 12:41 |
|
| basically i'd like to have the same check in my script that "git rebase" does before doing anything | 12:42 |
| → ok91 joined | 12:42 |
| ← phinxy left | 12:43 |
|
TomyLobo
| i've seen all kinds of strange solutions on SO | 12:43 |
|
| the most promising is "git diff --quiet HEAD" | 12:43 |
|
| would that work? | 12:43 |
| ← mooasaurus left | 12:44 |
| → mooasaurus joined | 12:44 |
| ← houami left | 12:46 |
| → drewmcmillan joined | 12:46 |
| → houami joined | 12:46 |
| ← PioneerAxon left | 12:47 |
|
_ikke_
| yes | 12:49 |
|
| Or diff-tree, which is more suited for scripts in general | 12:50 |
| ← xxMatiasxx left | 12:50 |
|
_ikke_
| or what you want is diff-files | 12:51 |
| ← houami left | 12:51 |
| → PioneerAxon joined | 12:52 |
| → Gustavo6046 joined | 12:53 |
|
TomyLobo
| hmm, next problem: git ls-tree doesnt have a --exclude parameter and i dont fancy breaking file name integrity by throwing a grep in there (grep can't deal with \0-separated records on the input side) | 12:54 |
| → NightMonkey joined | 12:54 |
|
TomyLobo
| i remember seeing a script with exclude patterns, but i can neither remember nor google what exactly they looked like | 12:55 |
|
| basically i want it to skip .gitignore | 12:55 |
|
| the big picture is, i want to remove and replace all files that were present in a certain commit, minus .gitignore | 12:56 |
| → houami joined | 12:59 |
|
_ikke_
| TomyLobo: :!<filename> or :(exclude)<filename> | 12:59 |
| ← PioneerAxon left | 13:00 |
| ← ok91 left | 13:01 |
| ← houami left | 13:03 |
|
TomyLobo
| fatal: :!.gitignore: pathspec magic not supported by this command: 'exclude' (mnemonic: '!') | 13:04 |
|
| i guess grep it is, then | 13:04 |
| → PioneerAxon joined | 13:05 |
| → kvik joined | 13:07 |
| → coumbole joined | 13:08 |
| → houami joined | 13:09 |
|
TomyLobo
| oh, looks like grep -z *does* affect input | 13:09 |
| → pbrewczynski joined | 13:11 |
| → CheckDavid joined | 13:12 |
| ← houami left | 13:13 |
| ← kvik left | 13:17 |
| → mikecmpbll joined | 13:18 |
| → staafl joined | 13:18 |
| → misosoup joined | 13:18 |
| → houami joined | 13:18 |
| → yohnnyjoe joined | 13:23 |
| ← howdoi left | 13:23 |
| ← houami left | 13:23 |
| ← yohnnyjoe left | 13:27 |
| → houami joined | 13:28 |
| ← |ifei5g00d left | 13:28 |
| ← Darcidride left | 13:29 |
| → |ifei5g00d joined | 13:30 |
| → Darcidride joined | 13:30 |
| ← wxg left | 13:31 |
| ← houami left | 13:33 |
| ← d^sh left | 13:37 |
| → d^sh joined | 13:38 |
| → houami joined | 13:38 |
| → Tobbi joined | 13:40 |
| ← mikecmpbll left | 13:40 |
| ← Copenhagen_Bram left | 13:41 |
| ← misosoup left | 13:41 |
| ← chaosruler left | 13:41 |
| → chaosruler joined | 13:42 |
| → misosoup joined | 13:43 |
| ← houami left | 13:43 |
| ← m0viefreak left | 13:44 |
| → Copenhagen_Bram joined | 13:48 |
| → houami joined | 13:48 |
| ← bergice_ left | 13:51 |
| ← houami left | 13:53 |
| ← coumbole left | 13:54 |
| → bket joined | 13:55 |
| → wxg joined | 13:56 |
| → houami joined | 13:58 |
| ← eduardas_m left | 13:58 |
| ← MarioBranco left | 14:00 |
| ← houami left | 14:03 |
| → KeyJoo joined | 14:05 |
| ← webguynow left | 14:06 |
| → webguynow joined | 14:07 |
| → houami joined | 14:08 |
| → mikecmpbll joined | 14:10 |
| ← houami left | 14:12 |
| → karelk joined | 14:13 |
| ← daynaskully left | 14:14 |
| → Himanshujha19964 joined | 14:14 |
| → yates joined | 14:16 |
|
yates
| i'm confused, please help | 14:16 |
| ← bket left | 14:17 |
|
yates
| i accidently deleted some files in a working tree, using the operating system "rm -r" command | 14:17 |
|
| yates sips his coffee | 14:17 |
| ← Copenhagen_Bram left | 14:17 |
| → daynaskully joined | 14:18 |
|
yates
| i should say i deleted a directory and all files under it. | 14:18 |
| → houami joined | 14:18 |
|
yates
| i then performed a "git checkout --" thinking that would restore the working directory and files. | 14:19 |
|
| it did not | 14:19 |
|
| now when i do a "git status" i see all these files maked with a "D". | 14:19 |
|
Himanshujha19964
| Hello everyone, i have a patchset with a cover letter and wish to send each patch in the set to different maintainers using git send-email, could someone please help me ? | 14:19 |
|
yates
| i do not want to delete these. how do i get from this state to a working tree with my directory and files restored? | 14:20 |
| → Es0teric joined | 14:20 |
|
bremner
| Himanshujha19964: use git-send-email with multiple --to arguments | 14:21 |
|
| and --compose | 14:21 |
| ← azerus left | 14:22 |
|
yates
| ? | 14:22 |
| ← houami left | 14:22 |
|
_ikke_
| yates: "git checkout -- ." | 14:23 |
|
| yates: or instead of the ".", you can also specify the dir name | 14:23 |
|
| yates: the dot is significant | 14:23 |
|
yates
| _ikke_: oh. | 14:24 |
|
| so if i do "git checkout -- ." NOW (with all the files i want restored marked with a "D"), the directory/files will be restored? | 14:24 |
| ← staafl left | 14:25 |
| → azerus joined | 14:26 |
|
yates
| i should ask "(with all the files i want restored marked with a "D" when i do a git status)"? | 14:27 |
|
| ? | 14:27 |
| ← yates left | 14:28 |
| → houami joined | 14:28 |
|
Himanshujha19964
| <bremner> Could you please elaborate more on this ? git-send-email --to [email@hidden.address] --to [email@hidden.address] 000-scsi-cover.patch 001-scsi-qla4xx.patch 002-scsi-qla2xx.patch so on to 009-scsi-mvsas.patch ? | 14:30 |
| ← drewmcmillan left | 14:30 |
|
Himanshujha19964
| Would this go as a patch set ? | 14:31 |
|
| Also, note every patch has different maintainers! | 14:31 |
| → awkwardpenguin joined | 14:32 |
|
bremner
| well, if you want to send only patch 1 to maintainer 1, and so one, you'll have to call git-send-email a bunch of times | 14:32 |
| → mosab joined | 14:32 |
|
Himanshujha19964
| I have also used --thread=shallow for formatting | 14:32 |
|
bremner
| note that git-send-email can generate the patches itself. | 14:32 |
| ← houami left | 14:32 |
| ← mos3abof left | 14:33 |
|
infinisil
| Whoa, git can send emails? :O | 14:34 |
| → VoradorPT joined | 14:35 |
|
Himanshujha19964
| Yes, ql4xxx patch should be sent to only qla4xxx maintainers and not qla2xxx maintainers! And the whole should be a patchset. | 14:36 |
| ← awkwardpenguin left | 14:36 |
| → Amanas joined | 14:36 |
| ← overlord_tm left | 14:36 |
|
Himanshujha19964
| bremner: I hope now you can understand my situation better. | 14:37 |
| → houami joined | 14:38 |
| ← jceb left | 14:40 |
| ← lordjancso left | 14:41 |
| ← Tobbi left | 14:41 |
| → Tobbi joined | 14:41 |
| ← Darcidride left | 14:42 |
| ← houami left | 14:42 |
| ← navidr left | 14:42 |
| ← re1 left | 14:42 |
|
Himanshujha19964
| Anyone ? _ikke_ ? | 14:43 |
| → drewmcmillan joined | 14:43 |
| ← Milijus left | 14:44 |
| ← jimmyrcom left | 14:48 |
| → houami joined | 14:48 |
| → tsglove joined | 14:50 |
|
_ikke_
| Himanshujha19964: I don't see --thread=shallow in the man pages | 14:51 |
|
tsglove
| Hello. Beginner here. I am reading this link, and I´m wondering. After merging secondaryBranch into mainBranch... is it normal or do imperative to delete the secondaryBranch?? --> https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging | 14:51 |
|
_ikke_
| Himanshujha19964: I think you have to do something with --to-cmd | 14:51 |
| → jceb joined | 14:52 |
|
tsglove
| On that link I posted, it´s specifically where it states: git branch -d hotfix Do I have to delete that secondaryBranch? | 14:52 |
| ← houami left | 14:53 |
|
Himanshujha19964
| _ikke_: man git format-patch has this --thread[=<style>] | 14:53 |
|
gitinfo
| _ikke_: the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html | 14:53 |
|
_ikke_
| right, was looking at git send-email | 14:54 |
| → str joined | 14:55 |
| → Mike11 joined | 14:56 |
|
Himanshujha19964
| _ikke_: So what do you suggest now ? | 14:58 |
| → houami joined | 14:58 |
| ← wxg left | 14:58 |
| ← dec0n left | 15:00 |
| ← houami left | 15:02 |
| → cdg joined | 15:04 |
| → yopiji joined | 15:05 |
| gitinfo set mode: +v | 15:05 |
|
yopiji
| Hello, I'd need some help with git | 15:05 |
| → madewokherd joined | 15:06 |
| → ResidentBiscuit joined | 15:06 |
|
_ikke_
| !just_ask | 15:07 |
|
gitinfo
| You can just ask your question. If anybody knows the answer, they will answer soon (most of the time) | 15:07 |
|
yopiji
| We're moving our git repo to a new server. I've looked how to do it, but most guides I saw seem to use an intermediary repo, and don't specify on which server which command should be executed. So I'm a bit confused. | 15:07 |
| → houami joined | 15:08 |
|
yopiji
| I have access to both the new and old server. Once migrated, the old repo will be deleted, is there a simple way to move the repo ? | 15:08 |
|
| I thought about sshing in the new server and trying git clone --mirror oldurl, but I'm not sure if that will work | 15:09 |
|
_ikke_
| yopiji: easiest is to just scp / rsync the repos | 15:09 |
| ← chaosruler left | 15:10 |
|
yopiji
| Just copy the whole directory, without needing to edit any config files or something ? | 15:11 |
| → chaosruler joined | 15:11 |
| ← shinnya left | 15:12 |
| → imack joined | 15:12 |
| ← houami left | 15:12 |
| ← imack left | 15:12 |
|
infinisil
| yopiji: yup, a git server is really just a directory you have ssh access to | 15:13 |
|
_ikke_
| yopiji: correct | 15:13 |
| ← notnull left | 15:13 |
|
yopiji
| ok, thanks for the info, we'll try that | 15:14 |
|
_ikke_
| yopiji: everything is contained in the .git dir, and the configuration contains no host / location specific data | 15:14 |
| ← hunterlabs left | 15:14 |
|
yopiji
| ok | 15:14 |
|
Hello71
| although the clients do | 15:14 |
|
_ikke_
| sure | 15:14 |
| → Raed|Laptop joined | 15:15 |
| → Looper joined | 15:15 |
| → hunterlabs joined | 15:16 |
| ← vilez left | 15:17 |
| → houami joined | 15:18 |
| → imack joined | 15:18 |
| → al-damiri joined | 15:18 |
| → vilez joined | 15:19 |
| → drewmcmi_ joined | 15:19 |
| ← drewmcmillan left | 15:20 |
| ← houami left | 15:22 |
| → yohnnyjoe joined | 15:24 |
| ← lamont left | 15:24 |
| ← CheckDavid left | 15:26 |
| ← enkrypt left | 15:27 |
| → houami joined | 15:28 |
| → kadoban joined | 15:28 |
| ← yohnnyjoe left | 15:28 |
| → rosco_y joined | 15:31 |
| ← houami left | 15:32 |
|
rosco_y
| I made a new, unmodified branch in my github. How do I fetch the new, empty branch to my cloned repository? | 15:32 |
| → lamont joined | 15:33 |
| ← KeyJoo left | 15:34 |
| ← abba left | 15:34 |
|
rosco_y
| in github desktop I can see the new branch, but I'd prefer to be able to do it from the command line. | 15:34 |
| → Noldorin joined | 15:35 |
| ← LichtMacher left | 15:36 |
| → houami joined | 15:37 |
| ← masuberu left | 15:38 |
| ← Raed|Laptop left | 15:38 |
| → bket joined | 15:38 |
| → linuxmodder joined | 15:39 |
| → p4trix joined | 15:39 |
|
kadoban
| rosco_y: 'git fetch' typically | 15:42 |
| ← houami left | 15:42 |
|
kadoban
| Or if you actually want a local branch to track it you mean, 'git fetch' and then 'git checkout the_branch' will work as a shortcut (leave off the origin/ part) | 15:43 |
| ← Gustavo6046 left | 15:45 |
| ← konsolebox left | 15:47 |
| ← cdg left | 15:47 |
| ← Sleepy63 left | 15:47 |
| → cdg joined | 15:47 |
| → houami joined | 15:47 |
| ← lamont left | 15:48 |
| ← nikheizen left | 15:49 |
| ← mooasaurus left | 15:49 |
| → mooasaurus joined | 15:49 |
|
rosco_y
| kadoban: ty -- I did run "git fetch", but didn't see my new branch. I'm wondering if "git fetch" will only get the branch if it's not empty? | 15:49 |
| → lamont joined | 15:50 |
|
rosco_y
| I'm a total newb here in git and github. I'm reading "Pro Git" and trying to get up to speed because I want to start using it in my everyday development flow | 15:51 |
|
kadoban
| I'm not sure what an empty branch is on github. Orphan branches behave a little strangely in git, but it sounded like you made a copy of some other branch and that's what you mean by empty? That should behave normally certainly with fetch. | 15:51 |
| → Raed|Laptop joined | 15:51 |
| ← houami left | 15:52 |
|
rosco_y
| In github, I created a new branch, and It doesn't yet contain any files, so I was thinking of that as an empty branch--is that incrorrect? | 15:52 |
| → sarp joined | 15:53 |
|
kadoban
| The part about fetch (and this sort of thing) that tends to confuse people is that 'git fetch' only modifies the "remote tracking" branches. So if your remote is named origin and you create/push a branch there named foo, it won't create a local branch for you named foo when you fetch. You'll have origin/foo available though, which will show you the current state of foo as it existed on origin the last time you fetched/pulled | 15:53 |
| ← cdg left | 15:53 |
| → konsolebox joined | 15:53 |
|
kadoban
| rosco_y: Honestly I'm not sure how you create branches on github, I don't think I've ever done that. So I'm unsure exactly what it does. | 15:53 |
|
rosco_y
| ok, I created the branch in the github webpage. It's sounding like I should have just created the branch locally, worked in it and then pushed it to github. Does that sound about right? | 15:55 |
| ← misosoup left | 15:55 |
|
rosco_y
| I think I've tried created a local branch, and pushing it to github, and it seems as though it complained that "the branch doesn't exist in github." | 15:56 |
|
kadoban
| That's what I do. I typically avoid doing much on github.com that I can possibly do elsewhere, but I think creating branches on github.com is a rare thing anyway. I'm actually not seeing where you even do it in the UI either | 15:56 |
|
| rosco_y: Yeah, you might have to do something extra the first time. Usually it's like 'git push -u origin the_branch' once, and then you can just 'git push' after the first time. | 15:57 |
| → rorro joined | 15:57 |
| → houami joined | 15:57 |
|
rosco_y
| Thank You kadoban, I'll approach it from that direction for a while. I'm a little hazy on the use of "origin" in my git commands. | 15:58 |
|
| Thank you again, I hope everything goes your way! | 15:59 |
| ← PaulCapestany left | 15:59 |
|
kadoban
| Anytime. Pro Git will probably explain it better than I'd manage, the origin part. But it's just an alias for a remote essentially. | 15:59 |
| ← mikecmpbll left | 15:59 |
|
fxfitz
| j416: I landed up getting distracted yesterday and not finishing... does ls-tree give the hash of the file? It doesn't seem like it does... | 16:00 |
| → pburns joined | 16:00 |
| ← pburns left | 16:00 |
| → PaulCapestany joined | 16:02 |
| ← houami left | 16:02 |
| → cdg joined | 16:05 |
| → houami joined | 16:07 |
| ← thallada left | 16:08 |
| ← cdg left | 16:10 |
| ← chaosruler left | 16:11 |
| → pkx2 joined | 16:11 |
| ← houami left | 16:12 |
| → schooner joined | 16:13 |
| → chaosruler joined | 16:14 |
| ← ojdo left | 16:14 |
| → kvik joined | 16:14 |
| ← kvik left | 16:14 |
| → kvik joined | 16:14 |
| → chachasmooth_ joined | 16:15 |
| ← schooner left | 16:15 |
| ← chachasmooth left | 16:16 |
| ← hunterlabs left | 16:17 |
| → schooner joined | 16:17 |
| → houami joined | 16:17 |
| ← StOBlind left | 16:18 |
| → db8093246 joined | 16:18 |
| → cdg joined | 16:18 |
| → hunterlabs joined | 16:18 |
| ← SteffanW left | 16:20 |
| → ojdo joined | 16:21 |
| → thallada joined | 16:21 |
| ← houami left | 16:22 |
| ← mosab left | 16:24 |
| → nidr0x joined | 16:27 |
| → houami joined | 16:27 |
| ← Raed|Laptop left | 16:29 |
| ← houami left | 16:31 |
| → awkwardpenguin joined | 16:33 |
| ← p4trix left | 16:34 |
| ← lamont left | 16:35 |
|
rosco_y
| I just pushed a new branch from my local repo to github, where I merged and then deleted the new Branch. How do I merge the new branch in my local repo to my master before deleting the new branch locally? | 16:35 |
| → rkta joined | 16:35 |
|
rosco_y
| (I've never merged branches in git) | 16:36 |
| ← hunterlabs left | 16:37 |
|
rosco_y
| do I 1) "git checkout master", and then 2) "git merge NewBranch"? | 16:37 |
| → houami joined | 16:37 |
| → lamont joined | 16:37 |
| ← awkwardpenguin left | 16:38 |
|
rosco_y
| Would "git fetch" synchronize my local repo to match the state of github? | 16:38 |
| → hunterlabs joined | 16:38 |
|
grawity
| in a way | 16:39 |
|
rosco_y
| ? | 16:39 |
|
polyzen
| not the working tree | 16:39 |
|
grawity
| that is, it'd just update the "origin/<whatever>" pseudo-branches | 16:39 |
| ← yopiji left | 16:41 |
| ← houami left | 16:41 |
| → staafl joined | 16:43 |
| ← imack left | 16:43 |
| ← volestorm left | 16:44 |
| → Gustavo6046 joined | 16:44 |
| → volestorm joined | 16:46 |
| → houami joined | 16:47 |
| ← hunterlabs left | 16:47 |
| ← staafl left | 16:50 |
| ← houami left | 16:51 |
| → houami joined | 16:51 |
| → hunterlabs joined | 16:52 |
| ← albel727 left | 16:53 |
| ← rosco_y left | 16:53 |
| → Phylock joined | 16:54 |
| ← Himanshujha19964 left | 16:58 |
| → fission6 joined | 17:00 |
| → Arcaelyx joined | 17:01 |
| → kus_ joined | 17:01 |
| ← hunterlabs left | 17:02 |
| → hunterlabs joined | 17:05 |
| → invisbl joined | 17:08 |
| → orbyt_ joined | 17:09 |
| → hotpancakes joined | 17:10 |
|
j416
| fxfitz: tias™ | 17:13 |
|
fxfitz
| j416: Eh? | 17:14 |
|
| tias? | 17:14 |
|
| Not familiar with that... | 17:14 |
|
jast
| !tias | 17:18 |
|
gitinfo
| Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS. | 17:18 |
|
jast
| a bit laconic, I guess, but... it works ;) | 17:18 |
| ← madewokherd left | 17:19 |
|
jast
| fxfitz: anyway, you probably already saw that ls-tree outputs hashes for each object, so I guess maybe you were expecting straight up SHA1 hashes of the file contents and finding that you aren't getting those? | 17:20 |
|
fxfitz
| jast: Ah yeah, totally correct. | 17:21 |
|
| TIL tias :-D | 17:21 |
|
jast
| :) | 17:21 |
|
fxfitz
| Already did tias :-P | 17:21 |
| → KeyJoo joined | 17:21 |
|
jast
| not sure anyone else uses "tias", to be honest | 17:21 |
|
| anyway. the hashes in git are hashes of the *git objects* | 17:22 |
| ← Es0teric left | 17:22 |
|
fxfitz
| Darn, so no easy way to find what point in history a given hash of a file is. :-( | 17:23 |
|
jast
| in the case of a file's contents, the git object type is "blob". blobs consist of a small header and the file contents | 17:23 |
|
fxfitz
| For the record, this is what I'm trying to do: given a file, determine when in git history that file exists. | 17:23 |
|
| Essentially, I want to find out how old this file is. :-P | 17:23 |
|
| And how far away from HEAD it is. | 17:23 |
|
jast
| I heard there's an upcoming option for 'git log' and friends to find that kind of thing | 17:24 |
|
fxfitz
| Ah, that would be nice. :-D | 17:24 |
|
jast
| anyway, you can easily convert a candidate file into a blob object and get the hash that way: git hash-object <path/to/file> | 17:24 |
|
fxfitz
| OH! Ok! That's super easy. | 17:24 |
| → yohnnyjoe joined | 17:25 |
| ← duderonomy left | 17:27 |
| → maks_ joined | 17:28 |
| ← maks_ left | 17:29 |
| ← chaosruler left | 17:29 |
| ← yohnnyjoe left | 17:29 |
| → chaosruler joined | 17:30 |
| → zivester joined | 17:30 |
| ← lamont left | 17:30 |
| ← wandering_vagran left | 17:31 |
| → SteffanW joined | 17:31 |
| ← schooner left | 17:33 |
| → xaa joined | 17:33 |
| ← hunterlabs left | 17:34 |
| → lamont joined | 17:38 |
| → hunterlabs joined | 17:38 |
| ← cdg left | 17:38 |
| → sanscoeur joined | 17:38 |
| → cdg joined | 17:39 |
|
fxfitz
| jast: So, I don't think I can get a base case working. For example, getting it to run with what is at HEAD right now. | 17:40 |
|
| WAIT | 17:40 |
|
| I think I may have just got it. | 17:40 |
| ← because left | 17:40 |
|
fxfitz
| jast: yeah, got it. THANKS | 17:40 |
|
jast
| great | 17:41 |
|
| side note, if you're not doing this already, save yourself some work and use ls-tree with -r :) | 17:41 |
|
fxfitz
| Yup, that's what i got, based on recommendations from yesterday | 17:42 |
|
| Well, here it is for rev in $(git log --format=%H --follow myri10ge.c); do git ls-tree -r $rev | grep -q d73bebb0d7c6828ea21b22a339332df8ede366fe && git log -1 --oneline $rev; done | 17:42 |
|
jast
| ah, right. I'm just way late, then, as usual | 17:42 |
|
fxfitz
| This whole experience shows me that I need to learn waaay more about git. | 17:42 |
|
jast
| if you only want the hash from 'git log', you may as well use 'git rev-list' instead which defaults to outputting hashes (but needs a commit arg, e.g. HEAD) | 17:43 |
| ← cdg left | 17:43 |
|
jast
| hmm, but rev-list possibly doesn't support --follow... | 17:43 |
| ← armyriad left | 17:43 |
|
jast
| never mind | 17:43 |
| → because joined | 17:43 |
|
fxfitz
| Hehe yeah, I started with rev-list, but it seemed to be faster if I already knew the file. | 17:43 |
|
jast
| yeah, makes sense | 17:44 |
|
fxfitz
| Well damn, base case found something which means its all set up right, but when searching for my actual hash of what I want, it found nothing. Must mean they must have a modified it. :-/ | 17:44 |
|
| hash-object can work with any file, even if it's not in the git repository? | 17:44 |
|
jast
| yes | 17:44 |
|
fxfitz
| Gotcha. Okay. Strange, seems like that kernel module in Centos isn't in the mainline kernel history... | 17:45 |
| → phinxy joined | 17:45 |
| ← tombusby left | 17:47 |
| → tombusby joined | 17:47 |
| → roler joined | 17:47 |
| ← cdown left | 17:48 |
| → madewokherd joined | 17:49 |
| ← tombusby left | 17:50 |
| ← rkta left | 17:50 |
| → tombusby joined | 17:51 |
| ← neunon left | 17:51 |
| ← SteffanW left | 17:51 |
| → duderonomy joined | 17:53 |
| ← roler left | 17:53 |
| → SteffanW joined | 17:53 |
| → pts92 joined | 17:53 |
| → neunon joined | 17:53 |
| → Wetmelon joined | 17:56 |
| → ok91 joined | 17:58 |
| → cdg joined | 17:58 |
| → schooner joined | 17:59 |
| ← Floflobel left | 17:59 |
| → Lyqyd joined | 18:01 |
| ← thallada left | 18:02 |
| ← ok91 left | 18:02 |
| ← sarp left | 18:03 |
| → thallada joined | 18:03 |
| ← duderonomy left | 18:03 |
| ← Tobbi left | 18:03 |
| → armyriad joined | 18:03 |
| ← str left | 18:05 |
| → str joined | 18:06 |
| → jcarpenter2 joined | 18:08 |
| ← thallada left | 18:08 |
| → NightStrike joined | 18:09 |
| → albel727 joined | 18:10 |
| ← hotpancakes left | 18:10 |
| → thallada joined | 18:11 |
| → raynold joined | 18:13 |
| → yohnnyjoe joined | 18:14 |
| → staafl joined | 18:17 |
| → clickjac_ joined | 18:23 |
| → katiex7 joined | 18:23 |
| → dimi1947 joined | 18:25 |
| → brainproxy joined | 18:25 |
| ← clickjack left | 18:26 |
| ← Lyqyd left | 18:26 |
| ← brainpro1 left | 18:27 |
| → Tobbi joined | 18:28 |
| ← thallada left | 18:30 |
| → xxMatiasxx joined | 18:31 |
| → thallada joined | 18:31 |
| → cdown joined | 18:33 |
| → awkwardpenguin joined | 18:35 |
| → hotpancakes joined | 18:36 |
| ← nidr0x left | 18:37 |
| → rkta joined | 18:39 |
| ← staafl left | 18:39 |
| → staafl__ joined | 18:39 |
| ← awkwardpenguin left | 18:39 |
| → Es0teric joined | 18:42 |
| ← schooner left | 18:42 |
| ← kus_ left | 18:44 |
| ← mns left | 18:44 |
| → schooner joined | 18:44 |
| → mns joined | 18:44 |
| → Darcidride joined | 18:45 |
| → duderonomy joined | 18:45 |
| ← hunterlabs left | 18:46 |
| → brainpro1 joined | 18:47 |
| ← Tobbi left | 18:47 |
| ← daveomcd left | 18:49 |
| ← brainproxy left | 18:50 |
| ← discopatrick left | 18:50 |
| → hunterlabs joined | 18:51 |
| ← Es0teric left | 18:51 |
| ← cdown left | 18:53 |
| → nidr0x joined | 18:53 |
| → Es0teric joined | 18:53 |
| → paul424 joined | 18:53 |
| ← pts92 left | 18:54 |
| → namstdnsk joined | 18:55 |
| ← namstdnsk left | 18:57 |
| ← hunterlabs left | 18:57 |
| → hunterlabs joined | 18:59 |
| → Tobbi joined | 19:01 |
| ← Es0teric left | 19:02 |
| ← rorro left | 19:03 |
| → Es0teric joined | 19:05 |
| ← voker57 left | 19:05 |
| → voker57 joined | 19:06 |
| ← voker57 left | 19:06 |
| → voker57 joined | 19:06 |
| → clickjack joined | 19:08 |
| ← clickjac_ left | 19:09 |
| → sat-aton joined | 19:11 |
| ← sat-aton left | 19:11 |
| → sat-aton joined | 19:11 |
| ← czart left | 19:11 |
| → czart joined | 19:12 |
| ← hunterlabs left | 19:12 |
| ← kvik left | 19:13 |
| → hunterlabs joined | 19:13 |
| → kvik joined | 19:14 |
| ← satifant left | 19:16 |
| → opalepatrick joined | 19:16 |
| → dviola joined | 19:16 |
| ← hunterlabs left | 19:16 |
| ← staafl__ left | 19:17 |
| → staafl joined | 19:18 |
| ← houami left | 19:19 |
| ← mattcen left | 19:19 |
| → houami joined | 19:20 |
| → kvik_ joined | 19:20 |
| → randomstrangerb joined | 19:23 |
| ← kvik left | 19:23 |
| → staafl__ joined | 19:23 |
| ← staafl left | 19:24 |
| → mattcen joined | 19:24 |
| ← houami left | 19:24 |
| ← randomstrangerb left | 19:27 |
| ← nidr0x left | 19:28 |
| ← LocaMocha left | 19:29 |
|
j416
| fxfitz: try it and see? | 19:31 |
| → nd joined | 19:33 |
| → kp__ joined | 19:34 |
| ← schooner left | 19:35 |
| → randomstrangerb joined | 19:35 |
| ← kp__ left | 19:35 |
| ← nd_ left | 19:35 |
| → kp__ joined | 19:35 |
| → adamretter joined | 19:35 |
| ← nevodka left | 19:35 |
| → nevodka joined | 19:36 |
|
adamretter
| Halfway through a rebase, I accidentally `git rebase --abort`, I then undid that by consulting the reflog and running `git reset --hard HEAD@{1}`. I finsihed working through all the commits in my rebase, but when I got to the last one `git rebase --continue` reports: "fatal: cannot resume: .git/rebase-apply/final-commit does not exist.". Is there someway I can resolve this? | 19:37 |
| ← staafl__ left | 19:42 |
| → staafl joined | 19:42 |
| ← staafl left | 19:43 |
| → staafl joined | 19:43 |
| ← invisbl left | 19:43 |
| → nidr0x joined | 19:44 |
| ← staafl left | 19:44 |
| → staafl joined | 19:44 |
| → schooner joined | 19:45 |
| → energizer joined | 19:46 |
| ← yohnnyjoe left | 19:48 |
| → ZyX-I joined | 19:49 |
| → houami joined | 19:49 |
| ← Xiti left | 19:50 |
| ← adamretter left | 19:52 |
| → cdown joined | 19:53 |
| → Xiti joined | 19:53 |
| ← houami left | 19:54 |
| ← SteffanW left | 19:56 |
| → Gurrz joined | 19:57 |
|
polyzen
| ouch lol | 19:58 |
| → houami joined | 19:59 |
| ← staafl left | 19:59 |
| → staafl__ joined | 19:59 |
| ← cdown left | 19:59 |
| ← staafl__ left | 20:02 |
| → staafl__ joined | 20:02 |
| ← hotpancakes left | 20:03 |
| ← averell left | 20:03 |
| → hotpancakes joined | 20:03 |
| ← hotpancakes left | 20:04 |
| → hotpanca_ joined | 20:04 |
| ← houami left | 20:04 |
| → rosco_y joined | 20:05 |
| ← ilyaigpetrov left | 20:05 |
| → yohnnyjoe joined | 20:05 |
|
rosco_y
| I have an entry in my .gitigore that reads | 20:06 |
|
| oops | 20:07 |
|
| \/[Ll]ibrary/ | 20:07 |
|
| shoot, it reads: /[Ll]ibary/ | 20:07 |
|
| my question is, is this telling git to ignore Library/ contents in the root diirectory? | 20:08 |
| ← linuxmodder left | 20:08 |
| ← Gustavo6046 left | 20:08 |
|
tang^
| yes | 20:09 |
| ← fission6 left | 20:09 |
| → houami joined | 20:09 |
|
rosco_y
| tang^ thank you. This is the way .github delivers the .gitignore if you specify a "Unity" .gitignore. I am a little confused as to why they would have it specify ignore directories in the root. | 20:10 |
|
tang^
| because Unity will download Libraries only to the root of the project and you don't need those binaries in your repo | 20:11 |
|
rosco_y
| Maybe I have to run the git commit command from the directory in which the Libary folder exists....I'll try that | 20:11 |
| ← schooner left | 20:12 |
|
rosco_y
| I'm obviously doing something wrong, because all the directories specified in the .gitignore get included in my commits | 20:13 |
| ← randomstrangerb left | 20:13 |
| ← staafl__ left | 20:13 |
|
rosco_y
| So that was my question tang^--Thank You :) | 20:13 |
| → randomstrangerb joined | 20:13 |
| → Gustavo6046 joined | 20:13 |
| ← rosco_y left | 20:13 |
| ← houami left | 20:14 |
|
tang^
| rosco_y: did you have the .gitignore file at start of your project? it won't affect files already committed. | 20:14 |
| → staafl joined | 20:14 |
|
tang^
| oh, gone | 20:14 |
| → staafl__ joined | 20:16 |
| ← staafl left | 20:16 |
| → hunterlabs joined | 20:19 |
| → houami joined | 20:19 |
| ← Es0teric left | 20:20 |
| ← kp__ left | 20:20 |
| ← cebor_ left | 20:20 |
| → kp__ joined | 20:20 |
| → cebor joined | 20:20 |
| → Es0teric joined | 20:21 |
| → fstd_ joined | 20:22 |
| → hattkunskapz joined | 20:22 |
| ← Darcidride left | 20:23 |
| ← houami left | 20:23 |
| → Sasazuka joined | 20:23 |
| ← hunterlabs left | 20:24 |
| ← fstd left | 20:25 |
| fstd_ → fstd | 20:25 |
| → cust joined | 20:27 |
| → boombatower joined | 20:29 |
| → houami joined | 20:29 |
| ← houami left | 20:34 |
| → mikecmpbll joined | 20:34 |
| → CheckDavid joined | 20:38 |
| ← paul424 left | 20:38 |
| → brainproxy joined | 20:39 |
| → houami joined | 20:39 |
| → Darcidride joined | 20:40 |
| ← dimi1947 left | 20:40 |
| ← Darcidride left | 20:41 |
| ← chaosruler left | 20:41 |
| ← brainpro1 left | 20:41 |
| → hunterlabs joined | 20:41 |
| → chaosruler joined | 20:42 |
| ← houami left | 20:43 |
| ← chaosruler left | 20:45 |
| → VG234 joined | 20:45 |
| → chaosruler joined | 20:46 |
| → houami joined | 20:49 |
| → brainpro1 joined | 20:50 |
|
VG234
| How do you handle configuration files with git? For example, say I want to store .bashrc in a remote. The home directory you clone to on each machine would be different. I know I can check out the file, but I'd like to be able to update it to remote from each machine. | 20:50 |
|
bremner
| !vcsh | 20:51 |
|
gitinfo
| https://github.com/RichiH/vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -- abusing fake bare Git repositories for fun and profit | 20:51 |
| → schooner joined | 20:51 |
| ← brainproxy left | 20:52 |
| ← houami left | 20:53 |
| ← juvenal_lunch left | 20:56 |
| → bergice_ joined | 20:56 |
|
VG234
| bremner: Thanks. The, "on the author's talk page" times out. Is this a shell? | 20:58 |
| ← schooner left | 20:58 |
| → houami joined | 20:59 |
| ← houami left | 21:04 |
| ← ZyX-I left | 21:05 |
| → averell joined | 21:05 |
| ← duderonomy left | 21:08 |
| → houami joined | 21:09 |
| ← hunterlabs left | 21:11 |
| ← houami left | 21:13 |
| → hunterlabs joined | 21:14 |
| ← str left | 21:15 |
| → houami joined | 21:19 |
| ← mattcen left | 21:21 |
| ← houami left | 21:23 |
| ← pelegreno left | 21:23 |
| → pelegreno joined | 21:25 |
| → mattcen joined | 21:26 |
| ← staafl__ left | 21:27 |
| → houami joined | 21:29 |
| → staafl joined | 21:29 |
| ← houami left | 21:33 |
| ← Sasazuka left | 21:35 |
| ← Es0teric left | 21:36 |
| ← EternalEclipse left | 21:37 |
| → jimmyrcom joined | 21:38 |
| → houami joined | 21:38 |
| ← jceb left | 21:40 |
| → duderonomy joined | 21:40 |
| → MaximusColourum joined | 21:43 |
| ← houami left | 21:43 |
| → m0viefreak joined | 21:43 |
| → Es0teric joined | 21:43 |
| ← kvik_ left | 21:45 |
| → Teremy joined | 21:46 |
| → kvik_ joined | 21:46 |
| ← kvik_ left | 21:46 |
| → kvik joined | 21:46 |
| → houami joined | 21:48 |
| ← selckin left | 21:51 |
| → gugah joined | 21:51 |
| → selckin joined | 21:51 |
| ← houami left | 21:53 |
| → ZyX-I joined | 21:53 |
| ← duderonomy left | 21:55 |
| ← hotpanca_ left | 21:57 |
| → mlopezviedma joined | 21:57 |
| → hotpancakes joined | 21:57 |
| → bkxd joined | 21:58 |
| → anjen joined | 21:58 |
| → houami joined | 21:58 |
| ← njbair left | 21:59 |
| → ok91 joined | 21:59 |
| → shinnya joined | 22:01 |
| ← jcarpenter2 left | 22:01 |
| ← houami left | 22:03 |
| ← ok91 left | 22:04 |
| ← hotpancakes left | 22:04 |
| → njbair joined | 22:05 |
| ← karelk left | 22:08 |
|
Seveas
| vcsh is awesome | 22:08 |
| → houami joined | 22:08 |
| ← staafl left | 22:10 |
| ← kozy left | 22:11 |
| → kozy_ joined | 22:11 |
|
TomyLobo
| this vcsh sounds interesting | 22:12 |
|
| how does it keep the other repos from appearing as untracked files? | 22:12 |
| ← houami left | 22:13 |
| → dege joined | 22:13 |
|
TomyLobo
| or does it, even? | 22:13 |
| → belmoussaoui joined | 22:13 |
| ← bkxd left | 22:14 |
| ← Gustavo6046 left | 22:15 |
| → Gustavo6046 joined | 22:15 |
| ← Gustavo6046 left | 22:15 |
| ← belmoussaoui left | 22:16 |
| ← anjen left | 22:16 |
| → belmoussaoui joined | 22:17 |
| ← Amanas left | 22:18 |
| → houami joined | 22:18 |
| → Gustavo6046 joined | 22:18 |
| ← Gustavo6046 left | 22:19 |
| ← VG234 left | 22:21 |
| → Gustavo6046 joined | 22:22 |
| ← houami left | 22:22 |
| → phluks joined | 22:23 |
| → ZexaronS joined | 22:23 |
| ← Es0teric left | 22:26 |
| ← nidr0x left | 22:27 |
| → houami joined | 22:28 |
| ← boutcher left | 22:32 |
| ← houami left | 22:33 |
| → Amanas joined | 22:35 |
|
Seveas
| TomyLobo: I do that by simply having * in the .gitignore for each of the repos :) | 22:36 |
|
TomyLobo
| ah | 22:37 |
| → nidr0x joined | 22:37 |
|
TomyLobo
| so it doesnt do that by itself? | 22:37 |
| → dimi1947 joined | 22:37 |
|
Seveas
| nope | 22:37 |
|
TomyLobo
| and it also manages .gitignore (and i presume .gitattributes)? | 22:38 |
| → houami joined | 22:38 |
|
Seveas
| it doesn't manage them, but it does set core.excludefile to ~/.gitignore.d/$name_of_repo, and you can simply track that file | 22:38 |
| → in1t3r_ joined | 22:38 |
|
Seveas
| not sure about gitattributes/gitmodules, I don't use those | 22:39 |
| ← pkx2 left | 22:39 |
| → shiva__ joined | 22:40 |
| ← in1t3r left | 22:40 |
|
Seveas
| .gitattributes is handled like .gitignore, .gitmodules is not handled specially so it would be a pain to have multiple repos with submodules | 22:41 |
| → masuberu joined | 22:41 |
| → stoopkid joined | 22:41 |
| ← dimi1947 left | 22:42 |
| ← randomstrangerb left | 22:42 |
| ← houami left | 22:43 |
| ← in1t3r_ left | 22:43 |
| → randomstrangerb joined | 22:43 |
| ← tonyj left | 22:44 |
| ← chaosruler left | 22:46 |
| → houami joined | 22:48 |
| ← PaulCapestany left | 22:51 |
| → cdown joined | 22:52 |
| ← houami left | 22:52 |
| ← mikecmpbll left | 22:53 |
| ← marian1235813 left | 22:53 |
| ← jnavila left | 22:53 |
| ← cdg left | 22:53 |
| ← CheckDavid left | 22:56 |
| → PaulCapestany joined | 22:57 |
| ← Murr left | 22:57 |
| → Murr joined | 22:57 |
| → houami joined | 22:58 |
| ← ResidentBiscuit left | 22:59 |
| ← houami left | 23:02 |
| ← KeyJoo left | 23:04 |
| → ok91 joined | 23:04 |
| → houami joined | 23:08 |
| → maqbool_ joined | 23:09 |
| → bkxd joined | 23:09 |
| ← houami left | 23:13 |
| ← phluks left | 23:16 |
| → houami joined | 23:18 |
| ← leeN left | 23:18 |
| → leeN joined | 23:19 |
| ← thallada left | 23:19 |
| ← Gustavo6046 left | 23:20 |
| → thallada joined | 23:21 |
| ← randomstrangerb left | 23:21 |
| → randomstrangerb joined | 23:22 |
| ← houami left | 23:22 |
| → spacefan2 joined | 23:24 |
| ← Amanas left | 23:25 |
| ← spacefan2 left | 23:25 |
| → The_Woodsman joined | 23:26 |
| ← cdown left | 23:26 |
| → spacefan2 joined | 23:26 |
|
The_Woodsman
| i'm running git bundle verify {my bundle} and getting {my bundle} is okay , but when i try to pull from that bundle, i'm unable to. any ideas on that? strikes me as weird that the bundle would be okay, but i'm told "{my bundle} does not appear to be a git repository" | 23:27 |
| ← tunekey left | 23:27 |
| → houami joined | 23:28 |
| ← johnlage left | 23:29 |
| → johnlage joined | 23:29 |
| ← HuskyApocalypse left | 23:31 |
| ← houami left | 23:32 |
| ← [ADN] left | 23:33 |
| → _ADN_ joined | 23:33 |
| → hotpancakes joined | 23:35 |
| ← nidr0x left | 23:35 |
| dsnow_ → dsnow | 23:36 |
| → HuskyApocalypse joined | 23:36 |
| → houami joined | 23:38 |
| ← dsnow left | 23:39 |
| ← hunterlabs left | 23:39 |
| → awkwardpenguin joined | 23:39 |
| → dsnow joined | 23:40 |
| ← nevodka left | 23:41 |
| → hunterlabs joined | 23:41 |
| → Dodgy-Debaser joined | 23:41 |
| ← houami left | 23:42 |
| ← Bajax left | 23:43 |
| ← MoziM left | 23:45 |
| ← bkxd left | 23:45 |
| → bkxd joined | 23:45 |
|
avar
| you don't pull it, you run git bundle unbundle on it | 23:45 |
| ← ZyX-I left | 23:46 |
| ← awkwardpenguin left | 23:46 |
| ← HuskyApocalypse left | 23:46 |
| ← dave0x6d left | 23:46 |
| → nevodka joined | 23:47 |
| → houami joined | 23:47 |
| ← schleppel left | 23:48 |
| ← TinkerTyper left | 23:48 |
| ← kvik left | 23:49 |
| → TinkerTyper joined | 23:50 |
| → kvik joined | 23:50 |
| ← MaximusColourum left | 23:51 |
| ← Phylock left | 23:51 |
| ← houami left | 23:52 |
| → Bajax joined | 23:53 |
| ← chachasmooth_ left | 23:53 |
| → spongedob joined | 23:53 |
| → chachasmooth joined | 23:54 |
| → cdown joined | 23:54 |
| ← shinnya left | 23:55 |
| → houami joined | 23:57 |