Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-10

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

All times shown according to UTC.

Time Nick Message
00:01 kegster joined #git
00:02 _28_ria joined #git
00:02 sven1 joined #git
00:03 jon-mac joined #git
00:05 alzagros joined #git
00:06 alzagros i did git fetch upstream, but git log is outdated. how to jump there?
00:06 _28_ria joined #git
00:09 agusyc joined #git
00:09 sven1 joined #git
00:10 _28_ria joined #git
00:15 preaction alzagros: fetch doesn't merge. did you want "git log origin/master"?
00:15 alzagros that still hsows me my own stuff
00:16 alzagros see, i made a commit. then i did git fetch. nothing.
00:16 preaction making a commit makes it locally. not remotely
00:16 alzagros i want to merge the git fetch upstream
00:17 preaction fetch grabs from upstream and adds locally. push takes from local and moves upstream
00:17 alzagros git log doesn't show goodies of the upstream
00:18 PresidentBiscuit joined #git
00:23 _28_ria joined #git
00:23 alzagros preaction: do you understand what i want
00:24 preaction no, not at all
00:24 alzagros i git cloned. i edited the code, then i committed locally
00:24 alzagros how, upstream made changes, and i want those goodies.
00:24 alzagros my goal is to bring those goodies down, and merge them locally, so that i have 1) my commit, 2) plus their new goodies
00:25 preaction so you need to fetch, which you did, and then you need to merge, which you didn't
00:25 preaction !sync
00:25 gitinfo [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
00:28 zivester joined #git
00:28 gnixev joined #git
00:30 hahuang61 joined #git
00:34 PresidentBiscuit joined #git
00:36 gnixev joined #git
00:42 scoobertron joined #git
00:42 geek2nerd joined #git
00:43 def_jam joined #git
00:43 Hello71_ joined #git
00:44 eb0t_ joined #git
00:45 nomike31 joined #git
00:47 drodger joined #git
00:48 _28_ria joined #git
00:48 capuk joined #git
00:49 jon-mac joined #git
00:49 d4rkl0rd joined #git
00:50 theiostream joined #git
00:50 dstw joined #git
00:55 DIDAVISION joined #git
00:59 raijin joined #git
01:02 ToBeCloud joined #git
01:08 fstd_ joined #git
01:08 NoOutlet joined #git
01:15 taoqy joined #git
01:16 wxg joined #git
01:18 metachr0n joined #git
01:20 Nilesh_ joined #git
01:21 austin_laptop joined #git
01:24 tnecniv joined #git
01:25 pks joined #git
01:25 scoobertron joined #git
01:32 ankit01ojha joined #git
01:32 finalbeta joined #git
01:33 NoOutlet joined #git
01:39 YottaByte I cloned this repo: https://github.com/angular/angular-phonecat, I made some changes I want to show someone as an example, can I just create an upload the repository or do I need to fork or something?
01:42 Saint_Isadore joined #git
01:46 jokester joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:54 toothe if I add a tag, can I remove it later?
01:54 toothe or is it there for good?
01:57 marianina8 joined #git
01:57 Cabanossi joined #git
01:58 cqi joined #git
01:58 marianina8 joined #git
01:59 DolphinDream joined #git
02:03 sunri5e joined #git
02:05 drodger joined #git
02:08 kadobanana joined #git
02:10 inflames joined #git
02:13 hexagoxel joined #git
02:16 netj joined #git
02:18 svm_invictvs joined #git
02:19 VG234 joined #git
02:19 alexggordon joined #git
02:21 armyriad joined #git
02:22 Kulrak joined #git
02:22 Kulrak joined #git
02:24 alexggordon joined #git
02:25 ojdo joined #git
02:25 chipotle joined #git
02:31 hahuang61 joined #git
02:32 darkmist_ joined #git
02:32 finalbeta joined #git
02:33 Random832 you can remove it - tags are just references
02:34 Random832 https://git-scm.com/book/en/v2/Git-Basics-Tagging
02:35 xall joined #git
02:35 PresidentBiscuit joined #git
02:36 Random832 well, annotated tags are a different kind of object, but they just point at a commit, the commit doesn't know about them
02:38 yaewa joined #git
02:39 yaewa joined #git
02:40 yaewa joined #git
02:41 moei joined #git
02:44 lb1c joined #git
02:54 dodobrain joined #git
02:54 Vortex35 joined #git
02:55 kegster joined #git
02:59 Cabanossi joined #git
02:59 aavrug joined #git
03:03 chachasmooth joined #git
03:04 LeBlaaanc joined #git
03:06 SwiftMatt joined #git
03:06 exotime joined #git
03:08 drodger joined #git
03:15 menip joined #git
03:21 tyrese hey git
03:22 tyrese how can I locally revert back to 1 commit?
03:22 kadoban !revert
03:22 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
03:23 Andrew_K joined #git
03:24 tyrese goodbye fair commit
03:24 tyrese https://youtu.be/MXcLybhbChQ?t=40s
03:26 andrew710 joined #git
03:30 Hello71 joined #git
03:36 dnukem joined #git
03:41 Jaggz joined #git
03:41 Cabanossi joined #git
03:42 nomike31 joined #git
03:43 andrew710 joined #git
03:44 YottaByte left #git
03:44 xall joined #git
03:53 orbyt_ joined #git
03:54 aw1 joined #git
03:59 Emperor_Earth joined #git
04:00 fakenerd joined #git
04:05 mentazoom joined #git
04:06 svm_invictvs joined #git
04:09 mizu_no_oto joined #git
04:15 mda1 joined #git
04:15 flaguy48_ joined #git
04:19 tristanp joined #git
04:20 rchavik joined #git
04:24 diogenese joined #git
04:30 kegster joined #git
04:30 marianina8 joined #git
04:31 JanC_ joined #git
04:31 dsdeiz joined #git
04:31 dsdeiz joined #git
04:32 hahuang61 joined #git
04:34 mbrumbelow joined #git
04:40 Noodlewitt joined #git
04:41 tyrese hey
04:42 tchan joined #git
04:42 tchan joined #git
04:43 VG234 I have git setup on a windows server using a shared drive. On another windows box, I have that drive mounted and I can clone by referring to the mount, in cygwin. I'm thinking of setting up a usb drive off my router. Will I be able to also access the repo if I set it up there?
04:43 valar joined #git
04:46 Guest81707 joined #git
04:46 sbulage joined #git
04:48 am55 joined #git
04:49 mizu_no_oto joined #git
04:51 al-damiri joined #git
04:52 eclecticjohny joined #git
04:56 freimatz joined #git
04:57 Cabanossi joined #git
05:01 kegster joined #git
05:05 eclecticjohny joined #git
05:05 ayogi joined #git
05:05 Guest81707 joined #git
05:05 fakenerd joined #git
05:05 dec0n joined #git
05:09 a3Dman joined #git
05:09 r0ry joined #git
05:10 KB__ joined #git
05:13 KB_9 joined #git
05:14 mda1 joined #git
05:16 Introoter joined #git
05:17 kegster joined #git
05:21 oskarkv joined #git
05:24 ayogi joined #git
05:24 armyriad joined #git
05:28 Saint_Isadore joined #git
05:28 lordjancso joined #git
05:30 bl0w3d_0ut joined #git
05:31 overlord_tm joined #git
05:33 Brski joined #git
05:33 jozwior joined #git
05:33 Guest81707 joined #git
05:36 dersand joined #git
05:37 qt-x joined #git
05:37 carousel joined #git
05:40 diogenese joined #git
05:40 aidalgol joined #git
05:41 Cabanossi joined #git
05:44 dogui joined #git
05:45 Raging_Hog joined #git
05:45 aw1 joined #git
05:47 rchavik joined #git
05:49 dreiss joined #git
05:51 valar left #git
05:57 jfr joined #git
06:00 ThomasLocke joined #git
06:01 yaewa joined #git
06:01 kegster joined #git
06:02 User458764 joined #git
06:02 rscata joined #git
06:03 hhee2 joined #git
06:03 QwertyDragon joined #git
06:04 tyrese howhey
06:04 tyrese hey*
06:04 tyrese is it possible to keep my branch alive but merge my latest update to master?
06:05 robattila256 joined #git
06:05 Guest81707 joined #git
06:06 t-mart joined #git
06:06 kent\n you're going to have to explain that one a bit more clearly
06:07 tyrese i have a branch photoview
06:07 tyrese i want to merge it the master branch. but after the merge, i still want photoview to be separate
06:08 kent\n well, there will still be a branch called "photoview"
06:08 kent\n but this means you have to understand what a "branch" is
06:08 zeroed joined #git
06:08 rominronin joined #git
06:08 tyrese sure
06:08 dreiss joined #git
06:08 kent\n 2 branches can point at the same commit
06:09 kent\n and then if you commit to either of them, they no longer point to the same commit
06:09 Endarked joined #git
06:09 kent\n think of branches not as "things", but as convenient names for humans
06:10 tyrese i see you
06:10 kent\n branch "foo" points at commit 0xdeadbeef, all "git commit" does with branches is say "create a new commit with parent 0xdeadbeef, then make 'foo' reference that new commit"
06:11 kent\n you can delete a branch and then bring it back if you know the commit id's ( assuming git doesn't reap them )
06:12 kent\n think of your history as like a chain, where each commit is a link in that chain
06:12 tyrese is it sort of like a binary tree
06:12 kent\n all branches are is a bunch of nails in a board somewhere you hang the chains off
06:12 tyrese i mean its a tree
06:12 kent\n yeah.
06:13 kent\n this is why I encourage people to read the "internals" chapter of progit ;)
06:13 tyrese so you can link a single link but that doesnt mean the remaining are all contected
06:13 tyrese connected*
06:14 JeroenT joined #git
06:14 kent\n if you have a commit, all its parents are connected to it.
06:14 kent\n because that's how branches work, it just follows the parents.
06:14 freimatz joined #git
06:14 kent\n 2 branches can share parents, but they might not
06:14 zeroed joined #git
06:14 zeroed joined #git
06:14 kent\n usually they do, but ...
06:15 kent\n orphans are a thing :D
06:15 tyrese thats why it always barks at me saying that im ahead of master
06:15 a3Dman joined #git
06:15 QwertyDragon joined #git
06:15 kent\n well, that's just letting you know you've got stuff that needs reintegrating one day :)
06:15 kent\n and may not be replicated yet
06:17 kent\n but I suspect what you're wanting to do  is: `git checkout master; git merge photoview` ( master now contains whatever was on the photoview branch), then `git checkout photoview` and keep working
06:17 tyrese but now i have a question
06:17 _28_ria joined #git
06:17 kent\n though this means changes that were "only on master" won't necessarily be in the photoview branch.
06:17 tyrese i completely redid my program in my branch, and if i send that back to master branch. will that cause a lot of conflict?
06:17 kent\n ( this is why I prefer rebase, history is easier to understand )
06:18 kent\n probably!
06:18 kent\n assuming there were changes on master.
06:18 tyrese there werent any
06:18 tyrese i was the last one to commit to master
06:18 ferr1 joined #git
06:18 kent\n if there were no changes on master while you worked on your branch, merging back in is simply a "fast forward"
06:18 kent\n in that, no actual merges have to happen
06:19 kent\n "master" just gets updated to point at the tip of your branch
06:19 tyrese so it's basically as if I just committed to master?
06:19 kent\n yep.
06:19 tyrese thats pretty neat
06:20 tyrese so in git bash 'git checkout master; git merge photoview' will do this?
06:20 kent\n wait till you discover rebase: its like you had time travel where you started over and re-did your changes from scratch at a different time :D
06:21 kent\n 'git checkout master' will switch the "working branch" to master
06:21 kent\n if that succeeds, "git merge photoview" will ensure the contents of "photoview" are integrated into master ( git will decide how to do that typically, and usually if a fast-forward can be done, it will be )
06:21 kent\n iirc.
06:22 _ng joined #git
06:22 kent\n some people rather it didn't and subvert that though
06:22 kent\n but that doesn't create conflicts either
06:22 kent\n you just end up with a dummy no-change commit with 2 parents.
06:22 MineCoins joined #git
06:23 kent\n new_commit -> [ master,  photoview ] , where "new commit" will have the same tree as photoview.
06:23 tyrese well basically we made an application. i found a better library to use to implement things like zoom and scaling, so i made branch. but nobody added anything while i worked on it
06:23 kent\n only when there are changes on both branches does git have to do something fun :)
06:23 tyrese since it's 'stable' is it right to merge?
06:23 zeroed joined #git
06:23 kent\n if you want a dedicated "merge feature foo" commit, you can force git to do that
06:24 hfp joined #git
06:24 kent\n `git merge --no-ff photoview`
06:24 jagob joined #git
06:24 kent\n this forces git to create a diamond-shaped history instead of a straight line.
06:25 kent\n well, a lop-sided diamond, but you know what I mean  I hope :p
06:26 jnavila joined #git
06:27 kent\n and if worst comes to worse, you can undo a merge just by winding back the branch pointer before it happened
06:27 kent\n ( reset --hard HEAD^ winds you back a commit )
06:29 tyrese thanks for the help man :)
06:31 darkbit joined #git
06:33 hahuang61 joined #git
06:33 JeroenT joined #git
06:34 a3Dman joined #git
06:35 PresidentBiscuit joined #git
06:38 swalladge joined #git
06:39 Oatmeal joined #git
06:41 bannakaffalatta joined #git
06:43 alexggordon joined #git
06:44 griff joined #git
06:45 schleppel joined #git
06:49 chigang joined #git
06:50 dreiss joined #git
06:54 jokester joined #git
06:57 zeroed joined #git
06:57 zeroed joined #git
06:58 Cabanossi joined #git
07:00 karols146 joined #git
07:02 Mysterious_Light joined #git
07:02 rorro joined #git
07:05 Eragon joined #git
07:08 King_Hual joined #git
07:08 King_Hual joined #git
07:08 marianina8 joined #git
07:08 cqi joined #git
07:09 rokups joined #git
07:09 zerow joined #git
07:09 BW^- joined #git
07:09 pietv joined #git
07:09 BW^- I have a backup of a GIT repo, in the form of a .tar.gz file with a .git/* directory in it.
07:09 chardan joined #git
07:10 BW^- I have now unpacked the .tar.gz file, meaning i'm in a directory with a .git/ directory in it, and otherwise the directory is empty.
07:10 tmg joined #git
07:10 BW^- how do I make a checkout or something as to load the .git/ git repo content into files in my local directory?
07:10 selckin git status should show them as removed and tell you to run git checkout -- .
07:10 BW^- "git checkout" prints "D ............" for all files and then Your branch is ahead of 'origin/master' by 762 commits.
07:10 BW^- (use "git push" to publish your local commits)
07:10 BW^- selckin: indeed git status shows all files as removed.
07:11 BW^- "git checkout -- " aha
07:11 selckin include the .
07:11 BW^- yey worked! :D thanks
07:11 BW^- selckin: tell me what did your checkout command actually do?
07:11 a_thakur joined #git
07:12 selckin thats how you undo changes in the work directory and restore from the current commit
07:12 BW^- aha cool. ok thanks! :)
07:13 ispn joined #git
07:13 ispnsn joined #git
07:14 ispn joined #git
07:14 moei joined #git
07:15 a_thakur joined #git
07:15 IRQ` joined #git
07:18 netroxen joined #git
07:19 TomyWork joined #git
07:19 aivkiv joined #git
07:23 star_prone joined #git
07:24 pietv joined #git
07:24 schleppel joined #git
07:27 drodger joined #git
07:28 star_prone joined #git
07:31 ronskisika joined #git
07:32 schleppel joined #git
07:33 kristofferR joined #git
07:37 mehola joined #git
07:40 govg joined #git
07:44 schleppel joined #git
07:44 djb-irc joined #git
07:44 digidog joined #git
07:44 nilg joined #git
07:47 aivkiv joined #git
07:48 PtxDK joined #git
07:49 adamm selckin: git checkout
07:50 selckin adamm: have to read a bit more
07:51 patrickreck joined #git
07:51 adamm selckin: you can checkout (undo) individual files too which can be helpful. :)
07:52 selckin adamm: read even more
07:54 dc5ala joined #git
07:54 patrickreck I am comparing two branches using `git log release1..release2` right now, but would like to compare it with release1 being at a specific revision, like `git log release1@b8925dc828f..release2`. How can I do that?
07:55 grawity literally `git log b8925dc828f..release2`
07:55 sunri5e joined #git
07:56 patrickreck perhaps release0.1 also contains b8925dc828f but a different history other than that. how would it know that release1 is the one to use?
07:57 manuelschneid3r joined #git
08:00 Unbeerable left #git
08:01 j416 patrickreck: perhaps you are misunderstandkng the concept of branches?
08:01 * j416 cant spel
08:01 patrickreck j416 that just crossed my mind as well
08:02 j416 patrickreck: a branch points at one commit. Not several.
08:02 ronny left #git
08:02 grawity a given commit has the same history everywhere
08:02 j416 the commits link to their parent(s)
08:02 telephone joined #git
08:02 telephone joined #git
08:02 j416 ^
08:02 grawity no matter if it's in branch A alone, or branch B with tons of merges
08:02 grawity if you start at b8925dc828f and go backwards you'll get exactly the same result every time
08:03 grawity and if you do b8925dc828f..release2 you'll get exactly the same result regardless of what branches that commit is in
08:03 grawity (it translates to "release2's history minus b8925dc828f's history")
08:04 Mysterious_Light joined #git
08:05 ZyX-I joined #git
08:05 jagob joined #git
08:08 patrickreck j416, grawity: but if i start at b8925dc828f and go forward, i guess branch1 could have edffd973c16 as the next one, and branch2 could have 8f3f4a3cfeb as the next. so if i do b8925dc828f..branch3, i wouldn't want both of them
08:09 grawity git doesn't go forward
08:09 grawity it goes backwards from branch3, and backwards from b8925dc828f
08:09 grawity then returns commits which are in branch3 but not in b8925dc828f
08:11 j416 patrickreck: to reword what grawity already said; there is no way to reach a child commit from a parent commit. The data is not there. The only way to do it is to find all commits with the given one as parent.
08:12 mikecmpbll joined #git
08:12 grawity the data is not kept there for precisely that reason – it could be different between branches and different in people's cloned repos, etc.
08:12 grawity whereas going backwards via parent links is guaranteed to give the same result every time
08:12 j416 patrickreck: it's a directed acyclic graph, if that makes more sense to you
08:13 Eragon joined #git
08:13 tvw joined #git
08:14 Eragon joined #git
08:14 Olipro joined #git
08:14 Eragon joined #git
08:15 marcogmonteiro joined #git
08:18 mindfart joined #git
08:20 jackhum joined #git
08:23 no_gravity joined #git
08:23 no_gravity Good Morning
08:23 elect_ joined #git
08:23 flaviodesousa joined #git
08:23 no_gravity Can "git diff" understand what stuff is moved around in a file?
08:23 rchavik joined #git
08:26 finalbeta joined #git
08:26 Cabanossi joined #git
08:26 digidog joined #git
08:28 notebox joined #git
08:28 Snugglebash joined #git
08:28 nowhere_man joined #git
08:28 drodger joined #git
08:29 patrickreck j416, grawity: thanks, I get it now
08:30 selckin no_gravity: sometimes, see -C -M options etc
08:30 star_prone joined #git
08:30 clmsy joined #git
08:30 grawity no_gravity: if you swap two blocks of code, I guess it just assumes the smaller one was the one that 'moved'
08:30 no_gravity selckin: Isn't that for moved files? I want it to detect moved lines.
08:30 digidog joined #git
08:31 grawity it cannot however represent a move in the diff format
08:31 grawity you'll always get a delete and an addition
08:31 no_gravity Hmm... there is no easy way to mark moved blocks in git diff?
08:32 no_gravity Even just not showing moved blocks would be useful.
08:32 sunri5e joined #git
08:33 elect joined #git
08:34 roby10 joined #git
08:34 hahuang61 joined #git
08:35 drodger joined #git
08:39 flaviodesousa|2 joined #git
08:39 unborn left #git
08:41 rchavik joined #git
08:44 a3Dman joined #git
08:44 sbasso joined #git
08:45 alexggordon joined #git
08:47 Asenar joined #git
08:47 seni joined #git
08:50 elect_ joined #git
08:51 kbeflo joined #git
08:52 ronskisika joined #git
08:54 Chaser joined #git
08:56 ziombelas joined #git
08:56 maks_ joined #git
08:59 Sound joined #git
08:59 ziombelas joined #git
09:01 marianina8 joined #git
09:05 Mir4g3 joined #git
09:08 sbasso joined #git
09:12 Darcidride joined #git
09:13 cqi joined #git
09:13 cqi joined #git
09:14 cqi joined #git
09:14 raspado joined #git
09:16 a3Dman joined #git
09:18 Noodlewitt joined #git
09:22 marcogmonteiro joined #git
09:23 zulutango joined #git
09:25 IndigoTiger_ joined #git
09:26 inovas joined #git
09:28 styx_ joined #git
09:29 telephone joined #git
09:29 telephone joined #git
09:30 dstw joined #git
09:31 drodger joined #git
09:33 Murii joined #git
09:35 bl0w3d_0ut joined #git
09:39 chwy joined #git
09:43 Cabanossi joined #git
09:43 kexmex joined #git
09:45 griff joined #git
09:46 Calinou joined #git
09:48 chwy left #git
09:50 inovas joined #git
09:55 ferr1 joined #git
09:55 kbeflo_ joined #git
09:57 jfr joined #git
09:58 KB_9 joined #git
10:01 masuberu joined #git
10:02 jottr joined #git
10:05 mage_ joined #git
10:11 ronskisika joined #git
10:16 moei joined #git
10:17 re1 joined #git
10:17 rorro joined #git
10:18 blackwind_123 joined #git
10:20 mentazoom joined #git
10:20 raspado joined #git
10:21 raspado joined #git
10:21 Taikibansei joined #git
10:27 Introoter joined #git
10:28 gnixev joined #git
10:29 achadwick joined #git
10:30 ronskisika joined #git
10:32 kent\n joined #git
10:34 hahuang61 joined #git
10:36 PresidentBiscuit joined #git
10:37 ssarah joined #git
10:44 Darcidride joined #git
10:45 bl0w3d_0ut joined #git
10:46 TikityTik joined #git
10:47 sunri5e joined #git
10:49 ethali joined #git
10:55 User458764 joined #git
10:57 ronskisika joined #git
11:01 bouncy joined #git
11:03 ronskisika joined #git
11:08 kbeflo__ joined #git
11:11 Spherical joined #git
11:11 sbasso joined #git
11:12 JeroenT_ joined #git
11:14 ethali joined #git
11:14 JeroenT__ joined #git
11:15 JeroenT_ joined #git
11:18 JeroenT joined #git
11:19 JeroenT__ joined #git
11:20 ShapeShifter499 joined #git
11:22 kent\n joined #git
11:26 bitslip joined #git
11:26 dsdeiz joined #git
11:27 Tobbi joined #git
11:28 ethali joined #git
11:28 YuGiOhJCJ joined #git
11:31 sea-gull joined #git
11:32 fakenerd joined #git
11:33 drodger joined #git
11:33 Ice_Strike joined #git
11:33 Ice_Strike I am getting error when I do git pull
11:33 Ice_Strike Unlink of file '.git/objects/pack/old-bd21d7973898374e0f4ce8cc54bba31aaec7cf29.pack' failed. Should I try again? (y/n)
11:33 Ice_Strike What should i do?
11:34 earnestly joined #git
11:36 _ikke_ Ice_Strike: check the permissiosn of that file
11:38 drodger joined #git
11:39 marcogmonteiro joined #git
11:40 Cavallari joined #git
11:46 King_Hual joined #git
11:46 King_Hual joined #git
11:47 hugdru joined #git
11:47 MineCoins joined #git
11:49 drodger joined #git
11:51 DolphinDream joined #git
11:52 King_Hual joined #git
11:52 King_Hual joined #git
11:54 scottjl joined #git
11:55 drodger joined #git
11:56 Cabanossi joined #git
11:59 stoopkid joined #git
12:02 HoierM joined #git
12:04 dvaske joined #git
12:05 sarri joined #git
12:05 sarri joined #git
12:09 dvaske__ joined #git
12:09 Mysterious_Light joined #git
12:09 User458764 joined #git
12:11 chardan joined #git
12:11 dglambert joined #git
12:11 dglambert yo
12:12 freimatz joined #git
12:13 sbasso joined #git
12:13 gitinfo dglambert: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
12:14 Vampire0 !botsnack
12:14 gitinfo Om nom nom
12:14 miczac joined #git
12:14 sz0 joined #git
12:17 chardan joined #git
12:26 anuxivm joined #git
12:27 LEI joined #git
12:32 cdown joined #git
12:32 balticer joined #git
12:32 sbasso joined #git
12:33 xall joined #git
12:33 balticer hello, i just cloned a repository and if i execute "git status" i get an "Segmentation fault" on git bash @ windows (version 2.12.2.windows.1)
12:33 balticer any idea to find the problem/debug this?
12:34 canton7 balticer, is it this? https://github.com/git-for-windows/git/issues/1111
12:35 tnecniv joined #git
12:35 canton7 here are some snapshots which should fix the issue: https://github.com/git-for-windows/git/issues/1111#issuecomment-291153842
12:36 hahuang61 joined #git
12:36 perlpilot joined #git
12:39 balticer canton7, seems so. thanks for your hint. so i just reinstall from the official website?
12:39 canton7 balticer, see my second link
12:41 balticer canton7, i tried snapshots. it works. is a official release available incluiding this fix?
12:41 canton7 balticer, given that you were running the latest release and you hit the problem, I'm going to guess not :P
12:41 RxMcDonald joined #git
12:41 RxMcDonald left #git
12:41 canton7 ah, no, I stand corrected
12:42 canton7 yeah, the latest version from the site should fix it
12:42 balticer i think i'm running 2.12.2.1. i will try current release.
12:42 balticer thank you very much!
12:44 netj joined #git
12:44 mda1 joined #git
12:45 dendazen joined #git
12:46 alexggordon joined #git
12:46 cyberz joined #git
12:47 thinkpad joined #git
12:48 seni joined #git
12:48 goergen joined #git
12:48 balticer left #git
12:49 gugah joined #git
12:51 _ng joined #git
12:51 ij I want to watch git repos and get "$NAME has pushed '$COMMIT_MSG_HEADER' to $REPO/$BRANCH@$SHA_SHORT". Could someone recommend me some scripts that do that already?
12:51 drodger joined #git
12:53 User458764 joined #git
12:53 fees joined #git
12:54 gnixev joined #git
12:54 goergen left #git
12:56 whitby There are a lot of variables in that :) How do you want to watch a Git repo? Is the repo public? Where do you want those messages to appear?
12:56 theiostream joined #git
12:57 ij I guess just a watcher of a remote would be ok.
12:58 Vampire0 ij, but how do you define "watch"?
12:58 ij Branch's changed.
12:58 Vampire0 ij, as whitby said, where do you want these messages displayed?
12:58 ij Oh, with that in mind, I think I found a tool.
12:58 ij I'll pipe 'em to the next command.
12:59 Vampire0 ij, so you mean you want to set up a cron job that looks into a remote whether it changed, or you want a hook on the remote repo that sends some mail or similar, or what exactly?
12:59 Snugglebash joined #git
13:00 ij Yeah, that. git-notify on github seems to be doing that.
13:00 HoierM joined #git
13:01 Vampire0 ij, what "that", I named two alternatives
13:01 Vampire0 ij, but if you found something already, fine. :-)
13:01 ij Oh, sorry. No hooks.
13:02 marianina8 joined #git
13:05 notebox joined #git
13:14 livingstn joined #git
13:16 theiostream joined #git
13:21 zerow joined #git
13:21 ronskisika joined #git
13:21 ShapeShifter499 joined #git
13:23 strk joined #git
13:23 strk wher'es git-svn configuration about which branch to target saved ?
13:24 strk ie: the SVN branch you pull changes from on "git svn rebase"
13:24 strk that is, the reported by "git svn info"
13:24 onmeac joined #git
13:25 Snugglebash joined #git
13:26 re1_ joined #git
13:26 Vampire0 strk, which branches to fetch is stored in the normal Git config. Which SVN branch to target from a Git branch should be dynamically calculated by looking for the first commit in the history that has git-svn metadata in the commit message I thin
13:26 pietv joined #git
13:28 strk Vampire0: I'm rewriting the history because I made a mess
13:28 strk but this seems to have broken something in that matpping
13:28 DarkPsydeLord joined #git
13:29 strk basically a difference in the authors file made two repositories diverge
13:29 strk and I want one of them to be equal to the other
13:30 strk resetting the Git branch to the remote commit I want looses the SVN branch to target, not finding an hash match (I think)
13:30 mrkake joined #git
13:32 MineCoins joined #git
13:35 gnixev joined #git
13:35 strk it looks like the problem is always with the mismatched authors file
13:36 kexmex joined #git
13:37 Vampire0 strk, maybe you are after `git svn reset`? Look for it in man git svn
13:37 gitinfo strk: the git-svn manpage is available at http://jk.gs/git-svn.html
13:37 strk could git svn reset have a mix of authors in the history ? (same SVN username, different email address over time)
13:38 * strk tries git svn reset
13:39 Vampire0 strk, I don't know, I never actually used git reset, but it sounds like it might help you
13:40 Vampire0 strk, you reset the repo to some former revision and refetch the revisions that were fetched with the wrong authors file, this time with the correct authors file
13:41 kpease joined #git
13:41 strk ok so 1d1c2012e87bf82ee6050e6894af1d349cca5c3e is the last common commit
13:41 strk in commit log I see that's r15314 in svn
13:42 strk I do: git svn reset -r 15314
13:42 alcohol joined #git
13:43 strk ok, it helps, but I guess I should stop using a symlink into the repo for the authors file...
13:43 xall joined #git
13:44 Vampire0 I don't know, I'd guess a symlink should be fine
13:44 strk :(
13:44 strk still fails
13:44 Vampire0 strk, !repro
13:44 gitinfo strk: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
13:44 strk wait, it actually works
13:45 strk it's just that I have an "svn-trunk" Git branch not yet reset to the SVN counterpart
13:45 IRCFrEAK joined #git
13:47 aw1 joined #git
13:48 thebope joined #git
13:48 IRCFrEAK left #git
13:49 fahadash joined #git
13:49 PHPanos joined #git
13:50 gitinfo strk: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
13:50 Vampire0 ok, gread
13:52 xpkill23 joined #git
13:52 Es0teric joined #git
13:53 AaronMT joined #git
13:54 kadoban joined #git
13:56 oaao joined #git
13:56 Vampire0 s/gread/great/
13:56 bannakaffalatta joined #git
13:56 xpkill23 joined #git
13:59 jason237 joined #git
14:00 FeersumEndjinn joined #git
14:01 h12o joined #git
14:01 JeroenT joined #git
14:01 justin2 joined #git
14:01 FeersumEndjinn Hey all - I added some large files and commited them several commits ago.  Now when I go to push to github I hit the filesiez limit of 100mb.  Is there a way I can remove these files from the previous commits, i.e. by squashing?
14:02 _ikke_ FeersumEndjinn: No, squashing is not what you want
14:02 oleo joined #git
14:02 JeroenT joined #git
14:02 _ikke_ FeersumEndjinn: You can either use filter-branch to remove it, or !BFG
14:02 gitinfo FeersumEndjinn: [!bfg] A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
14:03 mizu_no_oto joined #git
14:03 FeersumEndjinn _ikke_ I tried filter-branch (git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch scripts/redis/api_companies.csv') but receive the error:  "Cannot rewrite branches: Your index contains uncommitted changes."
14:03 FF0033 joined #git
14:04 _ikke_ FeersumEndjinn: Well, first solve that then
14:04 _ikke_ (the uncomitted changes)
14:04 FF0033 is there a way to find out where exactly 'git config --global core.excludesfile' is?
14:04 Mysterious_Light joined #git
14:04 _ikke_ FF0033: newer versions of git have --show-origin
14:05 _ikke_ 2.8.0+
14:05 FF0033 thanking you :-)
14:07 thib joined #git
14:08 Mysterious_Ligh1 joined #git
14:10 bannakaffalatta joined #git
14:10 xall joined #git
14:11 zivester joined #git
14:11 i7c I aliased git config --show-origin to git wtf :)
14:12 yehowyada joined #git
14:12 LeBlaaanc joined #git
14:13 tango_ 40
14:14 lavalamp joined #git
14:14 alexandre9099 joined #git
14:14 i7c Is it random number day again?
14:14 Dougie187 joined #git
14:17 tcorneli joined #git
14:17 TbobbyZ joined #git
14:17 tango_ i7c: more like ctrl+g not registering day
14:17 thib joined #git
14:18 zrts_ This branch is 35 commits ahead, 283 commits behind master. <- how can I see the list of only those 35 commits?
14:18 snowkidind joined #git
14:18 i7c tango_, haha
14:19 bannakaf_ joined #git
14:19 i7c zrts_, git log master..HEAD I suppose
14:19 shinnya joined #git
14:19 zrts_ ty!! :)
14:19 i7c + --oneline and whatever options you like
14:20 i7c yw :)
14:20 TbobbyZ_ joined #git
14:20 TbobbyZ_ joined #git
14:21 GodEater joined #git
14:21 boombatower joined #git
14:22 publio joined #git
14:22 raspado joined #git
14:22 digidog joined #git
14:22 govg joined #git
14:24 bannakaffalatta joined #git
14:25 sweatsuit joined #git
14:25 nd joined #git
14:27 dogui left #git
14:27 Mysterious_Light joined #git
14:28 Cabanossi joined #git
14:28 marianina8 joined #git
14:31 xpkill24 joined #git
14:33 XenophonF joined #git
14:34 TbobbyZ joined #git
14:34 User458764 joined #git
14:36 rubyonrailed joined #git
14:37 Introoter joined #git
14:37 hahuang61 joined #git
14:37 cdg joined #git
14:38 seni joined #git
14:39 ash_workz joined #git
14:39 rominronin joined #git
14:40 sweatsuit joined #git
14:40 cdg joined #git
14:41 rominron_ joined #git
14:42 Fallen0223 joined #git
14:42 D092M joined #git
14:44 LionsMane joined #git
14:46 rominronin joined #git
14:47 Karazhan joined #git
14:49 ghormoon joined #git
14:53 acetakwas joined #git
14:54 leeN joined #git
14:54 netj joined #git
14:54 mda1 joined #git
14:59 drodger joined #git
14:59 D092M joined #git
15:00 pbrewczynski_ joined #git
15:01 ExoUNX joined #git
15:03 Karazhan joined #git
15:05 dermoth joined #git
15:07 TbobbyZ joined #git
15:08 mda1 joined #git
15:10 lavalamp joined #git
15:10 Murii joined #git
15:13 delboy1978uk joined #git
15:13 al-damiri joined #git
15:13 luc4 joined #git
15:15 delboy1978uk how do i check if my ticket branch has been merged onto a branch env-acceptance? without trawling the log i mean
15:16 _ikke_ delboy1978uk: git branch --merged env-acceptance would show all branches merged into that branch
15:17 delboy1978uk _ikke_: awesome, and then i can pipe into grep for my specific branch. Cheers!
15:17 snowalpaca joined #git
15:18 Chiko joined #git
15:18 lavalamp joined #git
15:19 Brski joined #git
15:21 fakenerd joined #git
15:21 Chiko hi, what is the "git" way to break up a single large task into multiple subtasks where they can be worked on semi-independently but require all subtasks to be completed before they can be merged back into a develop branch?
15:22 MineCoins joined #git
15:23 i7c Merging many itsy-bitsy branches on a feature branch and merge them into master, when all itsy-bitsies are there?
15:23 cdg_ joined #git
15:23 i7c Merging many itsy-bitsy branches on a feature branch and merge it* into master, when all itsy-bitsies are there?
15:23 i7c fixed
15:23 griff joined #git
15:24 raijin joined #git
15:25 govg joined #git
15:25 cynsia joined #git
15:25 Chiko yeah kinda, i was thinking having a feature branch off develop then a few branches created off that feature and merge them in but it may not be the best approach as some of the sub features may need a bit from each other sub and it'll become a mess of merging forward/backwards; i was considering just commiting and using tags to track commits to certain parts but maybe that's overkill too
15:26 delboy1978uk how do i rebase from 3 commits ago again?
15:26 delboy1978uk -i
15:26 i7c Well for one, you mentioned you can only merge into master, when all is done. So that means you need at least a feature branch for the overall feature.
15:26 delboy1978uk git rebase -i HEAD^^^ ?
15:27 dreiss joined #git
15:27 i7c HEAD~3
15:27 i7c Which is the same, but nicer.
15:27 delboy1978uk ah thanks i7c!
15:27 stoopkid joined #git
15:27 i7c Chiko, how you organize the work on that feature branch is a different story then.
15:27 Chiko "you can only merge into master" me?
15:28 drodger joined #git
15:28 cynsia I have some decade old windows software that I got to work in wine. This software is contained in a wineprefix, and I used git to track all the tweaks I needed to make it work. I have different versions of the software (from mods and patches) in different branches. I would like to distribute this repo on github. I was considering what the best stra
15:28 cynsia tegy would be for removing the copyrighted blobs, but keeping the differences, and have someone who clones it re-add the copyrighted code themselves.
15:28 thiago joined #git
15:28 gnixev joined #git
15:28 cynsia It looks like people have done stuff like this before with some android code
15:28 Chiko i7c i'm still trying to iron out the details it's a relatively new project and i'm trying to use this workflow http://nvie.com/posts/a-successful-git-branching-model/
15:29 i7c Chiko, come again?
15:29 Chiko i7c ah i wasn't sure if you were talking to me or someone else i didn't mention master
15:29 i7c Chiko, oh right, replace master by development branch :)
15:29 Chiko i7c ah yes :D
15:29 cynsia Is there a way that I can replace the copyrighted data with zeros, and keep my diffs, and then rewrite the zeroed files with the original copyrighted data?
15:30 cynsia after it is cloned?
15:30 i7c Chiko, I think if people work in parallel, it makes sense to break it down into further branches.
15:30 i7c Chiko, you might want to review the single small tasks before merging them into the bigger feature branch and then review the whole thing before merging into development branch, I guess.
15:31 Chiko i7c, that's what i would like to do but as each independent feature would break the project i need some way to group them together, i've asked a friend and they stated branches aren't to be used that way so i'm trying to find out why exactly and if so then is there a better approach for this
15:31 _ikke_ cynsia: each commit contains a complete snapshot of the files, so there is no way to keep just the diffs
15:31 i7c Chiko, in the end a branch is nothing but a name for a commit
15:31 cynsia can't you rewrite the commits?
15:32 i7c Chiko, so what you will really need is communication with the team members that work on this
15:32 _ikke_ cynsia: You have to rewrite them all, but you have to manually find a way keep the diffs (perhaps patch files?)
15:32 delboy1978uk left #git
15:32 cynsia FileA contains zeros. I have several differences of it in different commits. I want to go back and rewwrite FileA with something else, keeping the differences.
15:32 i7c Chiko, I cannot see why you should *not* use branches for parts of the work.
15:33 theoceaniscool joined #git
15:33 _ikke_ cynsia: like I said, each commit contains the complete version of the file on that commit
15:33 cynsia My other thought was to just have a script that generates manually a new repo, after extracting the copyrighted blobs from the user supplied iso, and then copies it into the cloned repo
15:33 cynsia _ikke_ I thought that it just contained the difference
15:33 drodger joined #git
15:33 _ikke_ cynsia: nope, it doesn't
15:33 _ikke_ each commit is a snapshot
15:34 _ikke_ People sometime incorrectly imply or assume git only stores differences
15:34 darkmist_ joined #git
15:34 cynsia I assumed that it stored an initial snapshot, plus differences
15:34 _ikke_ cynsia: Nope, thats's not how git works
15:34 strk thank you Vampire0 :)
15:35 cynsia It's funny. My colleagues who have used git for years insisted that it only stored an initial snapshot + diffs.
15:35 i7c Chiko, ofc you can also simply push your commits on the same branch, the problems you will run into are exactly the same ;)
15:35 i7c Chiko, meaning merge/rebase conflicts.
15:35 _ikke_ There is a separate delta pack format, but that still unpacks to all objects getting complete contents
15:35 i7c Chiko, so I’d say you choose whats most intuitive for your team and try to communicate often to organise the work.
15:36 i7c cynsia, many people think that. I once thought that too. ^^
15:36 cynsia I would really like to distribute these changes I made to copyrighted blobs
15:36 Mysterious_Light joined #git
15:36 _ikke_ cynsia: gits object model does not store diffs, each commit refers to a tree, which refer to blobs, which are the complete contents of a file
15:37 _ikke_ cynsia: Then you would have to distribute them as patches
15:37 cynsia And I would like other people to be able to make changes and collaborate
15:37 cynsia Hmm
15:38 Chiko i7c, that's true i'm just trying to do it the "proper" way otherwise i'll go off and create my own mess; for now this is a personal project so it's just me working on this one i haven't yet encountered an issue like this at work but we've only started using git this year; this was the comment i received "when you break stuff up into separate tasks you have to make sure each task when completed will result in a working testable buil
15:38 Chiko d" which makes sense for our workflow at work since each task is tied to an individual branch maybe i didn't explain my self clearly to him that this wasn't work related...; yeah i'll need to sort something out this is just a side project to familiarize my self more with git, i'm happy to work either way just wanted to see what others do and my google fu is failing me today.
15:39 Chiko sorry about delay had to check logs :), thanks for the input i'll go flip a coin and decide how i want to punish my self
15:39 cynsia Is there an easy way to convert a commit into a patch? _ikke_
15:39 strk left #git
15:39 cynsia that you know if?
15:39 cynsia nevermind, googled it..
15:41 cdown joined #git
15:41 Cabanossi joined #git
15:41 madewokherd joined #git
15:42 cynsia left #git
15:43 i7c Chiko, certainly makes sense to break it down into small changes that ideally don’t break the rest of the software. And I still think your approach with branches etc is valid. However, if you do not work in parallel with others, I don’t see why you would split it.
15:44 sds_ joined #git
15:44 nexemacs joined #git
15:45 TbobbyZ joined #git
15:47 rominronin joined #git
15:47 TomyLobo joined #git
15:48 Chiko i7c, the tasks are quite different (replacing database framework, updating api, replacing front end); it's a long term project and i'm just trying to make the tasks small so i know whats complete and dont really have to review the code each time although i could probably just tag/use commit note (i've made 5 checkins; 12 hours ago, 6 days ago, 9 days ago, 28 days ago, 2 months ago)
15:48 preyalone joined #git
15:49 i7c In such a case I just work on one feature in a branch and make changes until I consider the "feature" complete, then merge.
15:49 i7c I don’t subdivide it further, because I’m doing all the work anyways.
15:51 Chiko so in that case my database branch which is completed but it would break the site if i merge it in (as the dal/api/front end needs to be updated)
15:51 bannakaffalatta joined #git
15:51 i7c hehe mhm
15:51 Chiko i was happy to create a branch for database/dal/api/frontend and just complete them one by one then merge them all one by one to the develop branch but yeah
15:51 Chiko allegedly that's frowned upon :P
15:51 i7c well
15:52 i7c it might be your only choice, tbh
15:52 hagridaaron joined #git
15:52 i7c If development on the dev branch proceeds you might have to regularly rebase your changes, otherwise you will run into the merge conflicts of doom.
15:52 Chiko true
15:53 QwertyDragon joined #git
15:53 Chiko i need to find some more materials to read on git i'd imagine this is a solved issue even for working with teams; if the tasks was much larger you would want to split it up for multiple people to work on even if there are some minor dependencies on each other
15:54 Chiko or would everyone just be working off that one feature branch?
15:54 i7c But if changing the database means you have to change the frontend, I think your architecture is broken :D
15:54 i7c Chiko, I would split it further then.
15:54 Chiko kinda :P but the breaking change comes from the update to the api im making which the site feeds off
15:55 i7c have the long running feature branch + smaller feature branches for inidivudal people working on it.
15:56 Chiko so if it's just me then one feature branch? but if i have others helping me and i can split the feature into subfeatures then split it and share it out?
15:56 Chiko i could work with that
15:56 i7c Taht would be my approach at least. :)
15:56 drodger joined #git
15:57 Chiko yeah that sounds good, it's just nice to have a plan (i'm slowly creating a document on how the projects should be managed) and this was a bit of a gap
15:57 i7c git is just the tool that reflects your management skills in the team :D
15:57 i7c I have to drive home now, bbl
15:57 Chiko ta i need to sleep thank you!
15:58 i7c glad I could be useful ^^
15:58 Chiko ill be more confident once ive spent more time with git and don't need reset as often :P
15:59 tyreld joined #git
16:02 oleo joined #git
16:02 Gustavo6046 joined #git
16:04 arthurl joined #git
16:04 jagob joined #git
16:04 arthurl anyone else having github api issues?
16:05 cbreak my biggest issue with it is that it's not a proper C or C++ API
16:07 Oatmeal joined #git
16:07 nedbat cbreak: how do you mean?
16:11 manuelschneid3r joined #git
16:12 svm_invictvs joined #git
16:12 YuGiOhJCJ joined #git
16:14 lavalamp joined #git
16:16 doener joined #git
16:17 drodger joined #git
16:17 Mysterious_Light joined #git
16:18 svm_invictvs joined #git
16:21 le_melomane joined #git
16:21 Atm0spher1c joined #git
16:22 drodger joined #git
16:22 Wayne_Shephard joined #git
16:24 hagridaaron joined #git
16:25 nitric joined #git
16:28 ResidentBiscuit joined #git
16:30 govg joined #git
16:31 a3Dman joined #git
16:32 jesst joined #git
16:33 drodger joined #git
16:34 raspado joined #git
16:34 fakenerd_ joined #git
16:35 ntnvgu joined #git
16:37 durham joined #git
16:38 theiostream joined #git
16:38 hahuang61 joined #git
16:39 hagridaaron joined #git
16:41 Mysterious_Light joined #git
16:43 netj joined #git
16:46 freimatz joined #git
16:48 alexggordon joined #git
16:49 Guest81707 joined #git
16:49 cdg joined #git
16:51 jstimm joined #git
16:52 hagridaaron joined #git
16:54 NeverDie_ joined #git
16:56 tnecniv joined #git
16:57 kexmex joined #git
16:58 alburaq joined #git
16:59 alburaq something i don't understand. "git merge upstream/master" or something like that. i guess it means "merge the master of the source/origin 'upstream'"?
16:59 gopar joined #git
17:01 theiostream joined #git
17:02 svm_invictvs joined #git
17:04 Pseudocrat joined #git
17:06 julia_c alburaq: see git help rev-parse for the reference for how a <refname> is resolved to a commit; in particular: see <refname> under the SPECIFYING REVISIONS section of the man page
17:08 alburaq julia_c: thank you very much
17:08 _ikke_ alburaq: When you fetch, git updates so called remote tracking branches
17:08 nitric joined #git
17:08 _ikke_ these are prefixed with the remote where the were fetched from
17:08 diogenese joined #git
17:10 alburaq interesting. i guess git checkout <tab tab> will list me those?
17:10 _ikke_ alburaq: git branch -r
17:10 alburaq wow that resolves the links
17:11 alburaq hmm or does it?
17:11 _ikke_ resolves the links?
17:11 alburaq e.g. when i say 'git checkout master'. does "master" resolve to "origin/master"? or "upstream/master"?
17:12 ethali joined #git
17:13 sbasso joined #git
17:14 alburaq basically git brang -r lists no 'master', yet 'git checkout master' works. it seems that it resolves 'master' into 'origin/master', but i don't see why did it do so, and didn't resolve it to 'upstream/master'. i just don't get the logic.
17:14 hagridaaron joined #git
17:15 kadoban alburaq: Neither. It's just the branch called "master". One confusing part here though is, as a shortcut, if the local branch "master" doesn't exist, but exactly one remote has a branch named exactly that, it'll be created automatically for you and then checked out.
17:15 kadoban man git checkout has the wording in there somewhere
17:15 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
17:16 kadoban The part a couple of paragraphs in, "If <branch> is not found but there does exist [..."
17:16 kadoban ]
17:16 alburaq kadoban: now i need to think so hard to figure out why. sometimes software should not be too smart :-p
17:16 kadoban It is really a handy shortcut though.
17:16 thiago joined #git
17:17 rominronin joined #git
17:18 alburaq so 'master' is a unique branch that has nothing to do with the remotes (origin, upstream, etc)?
17:18 grawity it's just the default name for the main branch
17:18 kadoban It may have something to do with them, but it has a distinct identity.
17:18 alburaq grawity: what does main branch mean please.
17:18 tang^ joined #git
17:19 grawity trunk, if you want
17:19 Es0teric joined #git
17:19 tnecniv joined #git
17:19 alburaq so confusing
17:20 alburaq do we need 'master'? can't i just work in remote/branch?
17:20 gugah_ joined #git
17:20 grawity technically possible, but you shouldn't
17:20 Dougie187 joined #git
17:20 grawity if you check out remote/branch and make commits, they *will not* magically appear in the remote
17:20 alburaq can i say that the remotes only contain commits of the remotes, and all my changes are in the local 'master' one?
17:20 grawity git does not work that way
17:20 kadoban alburaq: remote/branch is just used so you have a local view of what's going on on that remote. You should have local branches for things you're actually doing locally.
17:21 grawity all your changes should be done in local branches
17:21 grawity no matter if that branch is named 'master' or 'wip' or 'devel' or whatever
17:21 gugah__ joined #git
17:21 Noldorin joined #git
17:21 alburaq should've called it 'local' instead of 'master'
17:21 alburaq or, 'local/master' :-p
17:21 theiostream joined #git
17:22 kadoban That doesn't make a lot of sense, and local/master would just be annoying.
17:22 grawity you can have multiple local branches, you know
17:22 kadoban origin/local would just be wacky ... and also that ^
17:22 grawity local/master might make sense, but it's overkill
17:22 alburaq i think i don't know git. any video i should watch in youtube?
17:23 kadoban Some of the !book things are decent
17:23 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
17:23 griff joined #git
17:23 tnecniv joined #git
17:24 s2013 joined #git
17:24 alburaq sorry for being dumb. and thank you for your allocating ur time to fix my stupid. i'll try to help myself and hope it works. thanks again and sorry.
17:24 jrcharney joined #git
17:26 jason237 joined #git
17:26 jesst joined #git
17:26 kadoban Everyone goes through this with git, unfortunately. It'll make *much* more sense when you learn some basics, I hope. It eventually is worth it, IMO. git is great once you figure out wtf is going on.
17:27 moei joined #git
17:28 alburaq yes git is great. the only thing in its class that made me feel the need to use :-p
17:29 * thiago remembers when Git hadn't yet won
17:29 mikecmpbll joined #git
17:29 thiago Monotone, Mercurial, etc. were still viable options
17:31 hagridaaron joined #git
17:35 Fallen0223 joined #git
17:35 cbreak thiago: I still sometimes hear people talk about mercurial
17:35 cliluw joined #git
17:36 cbreak and ... we still use svn for legacy stuff :(
17:37 _ikke_ luckily only git for us now
17:38 jrcharney Hey, I'm using bitbucket on for a site on Amazon EC2, however I think I messed up on the intial setup because instead of just pushing my new stuff to the bitbucket repot and having put bitbucket push it to the site, I have to go to the site and pull it from the bitbucket.  How do I fix this?
17:39 ResidentBiscuit joined #git
17:39 XenophonF joined #git
17:40 thiago cbreak: it's no longer a viable alternative for new projects
17:41 thiago jrcharney: sorry, that's not a Git question. That's a BitBucket question.
17:41 thiago jrcharney: no idea how to make it push elsewhere after you push. I'd be surprised if it had that ability.
17:41 thiago but having never used it...
17:42 cbreak there's probably one of those weird "web hook" things
17:42 theiostream joined #git
17:42 belak Bitbucket cloud doesn't have that feature, as far as I know... and I work here. You'd need to set up a webhook which will pull the updated code.
17:43 Zialus joined #git
17:43 jrcharney thiago: OK, I guess I should go to #bitbucket for help?
17:43 thiago jrcharney: if that exists
17:43 jrcharney I'll check
17:43 belak It does
17:43 Dougie187 jrcharney: Or read belak's comment.
17:44 tang^ and belak will be the one helping you
17:44 tang^ most likely
17:44 belak Either me or smf.
17:44 jrcharney Alright, I'll check that too.
17:45 tang^ but belak is nicer
17:45 jrcharney OK, thanks. I'll get right on this.
17:45 bannakaffalatta joined #git
17:46 hahuang61 joined #git
17:46 raijin joined #git
17:48 ResidentBiscuit joined #git
17:48 duderonomy joined #git
17:49 Orion3k joined #git
17:50 t0by joined #git
17:50 t0by joined #git
17:51 Saint_Isadore joined #git
17:54 aw1 joined #git
17:57 Cabanossi joined #git
17:59 Dr-007 joined #git
17:59 MattMaker joined #git
18:00 dreiss joined #git
18:00 Sasazuka joined #git
18:00 raijin joined #git
18:00 Dr-007 goooood day everyone. i'm having a bit of a meltdown on my server. if i tar my entire webdirectory (that also has got the .git in it) then copy it to a different server. then create keys and the new key to my git repository (github). .... then will all be good.?
18:01 selckin sure
18:01 manuelschneid3r joined #git
18:01 selckin .git has everything and you can move it freely
18:02 bremner .git has everything committed (or staged, I guess)
18:04 anuxivm left #git
18:04 Dr-007 nice, then this hellride is almost finished
18:05 Dr-007 i didnt push to git for a while
18:05 Dr-007 i am regretted it from the moment i couldn't access my server anymore
18:05 Dr-007 hehe
18:05 Dr-007 luckily i can access it via a screen for now
18:05 Dr-007 but by the sound of it one of the hdds might be broken
18:07 nixjdm joined #git
18:07 nitric joined #git
18:09 dvaske joined #git
18:10 marianina8 joined #git
18:10 rominronin joined #git
18:10 mknod joined #git
18:10 _ikke_ auch
18:11 unbalancedparen joined #git
18:12 oaao joined #git
18:12 jstimm joined #git
18:12 ertesx joined #git
18:20 Oatmeal joined #git
18:21 pietv joined #git
18:21 cliluw joined #git
18:21 snowkidind joined #git
18:22 choki joined #git
18:24 blitz206 joined #git
18:24 blitz206 Hi guys, basic question
18:25 blitz206 I'm trying to revert a git stash I accidentally did
18:25 blitz206 When I go to do ```git stash show -p | git apply --reverse``` - I error out with 'no such file or directory'
18:26 cdown joined #git
18:26 blitz206 My command history is:
18:26 Cabanossi joined #git
18:26 blitz206 git add .
18:26 blitz206 git stash
18:26 blitz206 git stash show -p | git apply -R
18:27 blitz206 git fsck --no-reflog | awk '/dangling commit/ {print $3}'
18:27 re1 joined #git
18:27 blitz206 git stash show -p | git apply --reverse
18:27 blitz206 Any help would be appreciated!
18:29 jeffreylevesque joined #git
18:29 User458764 joined #git
18:29 _ikke_ why not just git stash apply?
18:32 Brski joined #git
18:33 ResidentBiscuit joined #git
18:35 AaronMT joined #git
18:38 finalbeta joined #git
18:38 nickel_dime_look joined #git
18:42 re1_ joined #git
18:42 cdown joined #git
18:44 perlpilot joined #git
18:45 Zialus joined #git
18:45 MineCoins joined #git
18:47 doener joined #git
18:49 alexggordon joined #git
18:49 TikityTik joined #git
18:49 cr34ton joined #git
18:49 rominron_ joined #git
18:52 aw1 joined #git
18:53 nowhere_man joined #git
18:56 crose joined #git
18:58 Achylles joined #git
18:58 war_pigs joined #git
19:00 sathed joined #git
19:00 jtri joined #git
19:01 jtri is there a way to checkout just one file in diff branch, modify it, and commit it back to that branch?
19:04 selckin no
19:04 d10n-work joined #git
19:05 snowalpaca joined #git
19:06 dminuoso jtri: What's wrong with checkout out the entire branch?
19:06 kadoban Probably just wants to skip a step. Sometimes a checkout can be annoying.
19:06 dminuoso Are you perhaps looking for
19:06 dminuoso !stash
19:06 * dminuoso ponders
19:07 kadoban But, ya usually a stash or a float makes it fine.
19:07 bariscant joined #git
19:12 jason237 joined #git
19:13 Introoter joined #git
19:13 tnecniv joined #git
19:14 tnecniv joined #git
19:15 toothe left #git
19:16 mda1 joined #git
19:16 Acerific joined #git
19:16 Acerific joined #git
19:20 chris3492 joined #git
19:20 ShapeShifter499 joined #git
19:21 Mysterious_Light joined #git
19:22 anuxivm joined #git
19:24 zerow joined #git
19:25 jtri dminuoso: not my question, but its wrong in this case
19:25 jason237 joined #git
19:25 jtri i think i'm going to start a new repo for the files involved though, unless there's an easy way to do what i asked
19:26 _ikke_ jtri: perhaps man git worktree
19:26 gitinfo jtri: the git-worktree manpage is available at http://jk.gs/git-worktree.html
19:26 knuth2 joined #git
19:27 jtri _ikke_: interesting, but a little more complicated than i'm looking for
19:27 _ikke_ ok
19:29 jtri left #git
19:29 jstimm joined #git
19:29 durham_ joined #git
19:32 drodger joined #git
19:33 ethali joined #git
19:33 axisys joined #git
19:36 darkbit joined #git
19:38 kexmex joined #git
19:38 chipotle joined #git
19:41 jason237 joined #git
19:41 Matsv joined #git
19:42 Cabanossi joined #git
19:46 drodger joined #git
19:47 sherry joined #git
19:47 sherry_ joined #git
19:48 h12o joined #git
19:49 sherry joined #git
19:51 Ryanar joined #git
19:51 wilbert joined #git
19:53 plasticboy joined #git
19:53 jstimm joined #git
19:58 DolphinDream joined #git
19:58 DolphinDream howdy
19:58 DolphinDream can i push a repo to a new location without first creating a bare repo at that location  ?
19:59 bariscant joined #git
19:59 selckin no
19:59 tang^ copy the .git folder to your new location as the bare repo folder
20:00 cdg joined #git
20:02 qqx tang^: Although that will mostly work, I wouldn't advise it.
20:03 tang^ I wouldn't advise it either
20:03 tang^ but it's up to DolphinDream to discover the value of doing simple tasks like git init --bare versus copying a repo
20:05 durham joined #git
20:05 qqx It is possible in at least some situations to set up a server to allow pushing a new repo.
20:06 selckin !gitolite
20:06 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/overview/#basic-use-case
20:06 qqx I have the alias https://github.com/aschrab/dotfiles/blob/master/config/git/config#L102
20:06 qqx That works with a git-receive-new-repo command on the server to create a new repo before handling the pushed data.
20:07 qqx Got the idea from somebody on the mailing list (I think it was Peff).
20:07 cdown joined #git
20:08 durham_ joined #git
20:10 lektrik joined #git
20:10 VA3VNA joined #git
20:10 snowalpaca joined #git
20:13 NightMonkey joined #git
20:14 raijin joined #git
20:17 m0viefreak joined #git
20:18 TbobbyZ joined #git
20:18 aidalgol joined #git
20:20 sbasso joined #git
20:21 Quetzal joined #git
20:24 hazelux joined #git
20:24 mda1 joined #git
20:24 zivester joined #git
20:26 Cabanossi joined #git
20:28 bket joined #git
20:29 Sound joined #git
20:29 Sound joined #git
20:30 NightMonkey joined #git
20:30 zerow joined #git
20:31 _28_ria joined #git
20:32 prg3 joined #git
20:36 Levin^ joined #git
20:36 Levin^ hello there
20:36 dilijev joined #git
20:36 KB_9 joined #git
20:37 Achylles joined #git
20:38 Levin^ I have a question about working in a group project. when two or more people work on the same file, they tend to code their own style, adding more or less blank lines and spacebars over their code.
20:39 tang^ agree to a coding style beforehand
20:39 Tobbi joined #git
20:39 Levin^ I sometimes get annoyed about their coding style, that sometimes it's not very clean and sometimes confusing, so I tend to reedit their spaces and lack of spaces..
20:39 cam27 joined #git
20:39 _ikke_ Levin^: That
20:39 Levin^ then I was recently thinking on how bad it is in many aspects
20:39 selckin auto code formatters++
20:39 _ikke_ Levin^: That's bound to get you conflicts
20:40 Levin^ _ikke_: exactly
20:40 Levin^ so I was thinking if I really should not bother fixing their style
20:41 nedbat Levin^: you shouldn't change their style (I won't say "fix")
20:41 qsx git -- where @~^! is not an insult
20:41 Levin^ nedbat: because I'm just making them use "my style"
20:41 selckin you should all agree on a style and enforce it with tools
20:42 nedbat Levin^: if they agree to use your style, then you have no problem.
20:42 Levin^ yea
20:43 Levin^ so the best approach to this is using an auto formatter tool when the file is finalized
20:43 Levin^ and making a commit alone "auto formatting to look cool"
20:43 Levin^ (lol)
20:45 nexemacs joined #git
20:47 KB_9 Hey I have a question about branches and tags.. After a feature branch is merged into master, is it OK to tag the commit on master, and then delete the branch?
20:47 JimDungo joined #git
20:48 selckin sure
20:48 KB_9 Having year-old branches sitting on the remote is just a nuisance, but I still need some history
20:49 Levin^ KB_9: I think you can track the deletion, it will still be stored on your history
20:49 nexemacs joined #git
20:49 Levin^ you will clean your branch list, but never lose them
20:50 jeffreylevesque joined #git
20:50 Dougie187 joined #git
20:51 theiostream joined #git
20:52 theiostream joined #git
20:52 askb joined #git
20:53 JimDungo left #git
20:54 mdk joined #git
20:54 immae KB_9: What kind of information do you want to keep? is a "non-trivial" merge between two branches with a commit message not enough ?
20:56 mdk Any way to tell git clone to avoid asking for password (prefer failing)? (scripting something, trying to keep things simple instead of going full forkpty (as git is not reading the password on stdin but via its tty)
20:56 KB_9 Just want to keep track of when something was merged into master, without looking through commit messages. So I was thinking, if a branch called bugfix-123 was merged into master, I can delete the branch, and tag the merge commit with a bugfix-123 tag
20:57 KB_9 Especially because when using a GUI (like Bitbucket Server), it's hard to find things just by the commit message
20:57 immae Ok. What about the commit "title"? (the first line of the commit message)
20:57 mdk hum via credential.helper maybe
20:57 immae It is usually shown in GUI, would it be good enough for you?
20:58 selckin mdk: export GIT_SSH_COMMAND='ssh -o "BatchMode yes"' not sure if _COMMAND Is correct, can also configure this in ~/.ssh/config
20:58 immae (just trying to find a solution that would not fill your repo with references, otherwise the tag will work, of course)
20:58 mdk selckin: looks like it's an https remote
20:58 Levin^ left #git
20:58 selckin mdk: life sucks
20:59 mdk selckin: haha
20:59 mdk Maybe by giving like /bin/true to GIT_ASKPASS þ
20:59 durham joined #git
21:00 zivester joined #git
21:00 mdk "fatal: Authentication failed"! → it works!
21:01 svm_invictvs joined #git
21:02 KB_9 immae: the commit title kind of works, but I think it's more complicated to search through titles, instead of something like git tag -l "bugfix-*"
21:02 publio joined #git
21:03 raijin joined #git
21:03 immae sure
21:03 h12o joined #git
21:03 immae The drawback with tags is that you'll end-up having a lot of them
21:03 scoobertron joined #git
21:04 KB_9 Are there any issues with that, other than clutter?
21:04 immae No
21:05 immae completion of git commands usually include tag
21:05 immae so if you have thousands of them you won't be so happy. Other than that I see no real issue
21:06 davedub joined #git
21:06 KB_9 So what do people usually use for things like release versions? Tags? Or just keep them as branches
21:07 raffo joined #git
21:07 immae tags
21:07 immae note that as far as git is concerned, tag is the same as a branch
21:07 immae (in term of "storage")
21:07 immae the only difference is that a tag is static, while a branch may "change"
21:08 ash_workz how do you move changes to another branch again?
21:09 dsdeiz joined #git
21:09 war_pigs joined #git
21:10 tnecniv joined #git
21:10 KB_9 Okay perfect. And using slashes to "categorise" tags (bugfix/123) is just a visual thing? No real benefits?
21:10 immae (if you create a tag and a branch on a commit, and look at .git/refs/tags/<the_tag>, and .git/refs/heads/<the_branch>, it's the same content: just a "pointer" to a commit)
21:11 NightMonkey joined #git
21:11 immae same, it's visual only, git doesn't really care (and it will create a subdirectory in .git/refs/tags/, if it pleases you :p )
21:13 zulutango joined #git
21:15 KB_9 Cool. Thanks for your help
21:16 theiostream joined #git
21:19 jost__ joined #git
21:20 TbobbyZ_ joined #git
21:21 rominronin joined #git
21:26 Ryanar joined #git
21:27 zivester joined #git
21:28 durham joined #git
21:31 durham_ joined #git
21:32 raynold joined #git
21:32 Spherical joined #git
21:33 snits joined #git
21:35 alexggordon joined #git
21:36 Sasazuka__ joined #git
21:38 theiostream joined #git
21:38 alexandre9099 joined #git
21:40 TbobbyZ joined #git
21:40 tmg joined #git
21:40 tmg joined #git
21:42 re1 joined #git
21:44 pks joined #git
21:47 re1_ joined #git
21:47 am55 joined #git
21:49 pks joined #git
21:52 VG234 joined #git
21:52 VG234 whoami
21:55 futuristic joined #git
21:58 Cabanossi joined #git
21:59 pks joined #git
21:59 Dougie187 left #git
22:00 netj joined #git
22:05 nitric_ joined #git
22:05 blackwind_123 joined #git
22:07 cdown joined #git
22:08 Backspace_ joined #git
22:09 war_pigs joined #git
22:10 ispn joined #git
22:16 mikecmpbll joined #git
22:18 g0d355__ joined #git
22:19 oskarkv joined #git
22:21 rubyonrailed joined #git
22:21 kus joined #git
22:22 kus so I had this brilliant idea that I will just create another repo inside an existing repo like I have ngcli folder that is a git repo and I did git init in side the dist folder inside ngcli and I was able to commit and push dist once but now that I look at git remote show origin in dist I see the repo url for ngcli what gives?
22:23 rubyonrailed joined #git
22:24 DIDAVISION joined #git
22:26 NightMonkey joined #git
22:28 kus sorry pebkac please ignore
22:29 [Brain] joined #git
22:29 war_pigs joined #git
22:30 hazelux joined #git
22:30 anuxivm left #git
22:31 andres joined #git
22:32 durham joined #git
22:34 rubyonrailed joined #git
22:35 dsdeiz_ joined #git
22:37 rubyonrailed joined #git
22:37 cam27 joined #git
22:39 alburaq joined #git
22:39 Ryanar joined #git
22:39 ShapeShifter499 joined #git
22:40 sbasso joined #git
22:40 kyan joined #git
22:41 cliluw How do I unrebase my commits? I accidentally rebased my commits on top of other commits but I would prefer that my commits are merged in instead.
22:41 rubyonrailed joined #git
22:44 rubyonrailed joined #git
22:44 anderson joined #git
22:45 Ryanar joined #git
22:45 Hello71 !undo
22:45 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
22:45 Hello71 if you just did rebase then git reset --hard HEAD@{1}
22:45 Hello71 er, git reset --hard <before>
22:46 cliluw Hello71: Wouldn't "reset --hard" blow away my commits?
22:47 Hello71 rebase (in the default mode) only adds commits
22:48 eldritch joined #git
22:51 tachoknight_ joined #git
22:51 bannakaffalatta joined #git
22:52 Achylles joined #git
22:52 cliluw Hello71: Sorry, I should have been more clear. I'm trying to undo a "git pull --rebase". So all the last commits on my branch are my local commits, which I want to unrebase.
22:53 griff joined #git
22:53 s2013 joined #git
22:53 Hello71 !undo
22:53 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
22:53 rominronin joined #git
23:02 am55 joined #git
23:02 hazelux joined #git
23:03 a3Dman joined #git
23:07 sgen joined #git
23:10 NonParity joined #git
23:14 madewokherd joined #git
23:15 Es0teric_ joined #git
23:16 andres joined #git
23:26 porfiriopaiz joined #git
23:29 h12o joined #git
23:30 Kaisyu joined #git
23:32 mentazoom joined #git
23:33 h12o joined #git
23:37 Rogue0ne left #git
23:38 peepsalot joined #git
23:40 drodger joined #git
23:41 pierre367 joined #git
23:41 pierre367 hi! i had unstaged change and i did a 'git checkout -- file' on the wrong file...... is there anyway to retrieve my changes please? please!!
23:42 Cabanossi joined #git
23:42 kadoban pierre367: Probably not with git, unless you'd staged them at some point in the past, or stashed them perhaps?
23:43 pierre367 no :/
23:43 kadoban pierre367: Maybe with your editor?
23:43 telephone joined #git
23:43 telephone joined #git
23:43 pierre367 hmmm vim? kadoban
23:43 kadoban Maybe? Is the file still open?
23:44 pierre367 no :/ and no swap file
23:44 pierre367 aahhhh
23:44 pierre367 i feel so dumb right now
23:44 kadoban Probably out of luck then. I don't think there's a way in git anyway. You could try asking the vim folks maybe.
23:44 * pierre367 learned to commit often today
23:45 pierre367 yeah good idea thanks
23:53 bannakaffalatta joined #git
23:58 Anja joined #git

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