Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-19

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:01 ToxicFrog ♥ branches
00:04 mischat joined #git
00:05 shgysk8zer0_ joined #git
00:07 xaviergmail_ joined #git
00:12 ozmage joined #git
00:13 Sapio So I have project folder for my git project. In Git Bash, I've created a new branch called dev
00:13 Sapio I can switch between the branches. Doing an LS shows the same gile.
00:13 Sapio * file
00:13 Sapio I looked in the folder and I only see one copy of that file.
00:14 Sapio How do I edit the "dev" version of that file?
00:14 User458764 joined #git
00:14 ToxicFrog Sapio: "git checkout dev", then do your edits.
00:14 lb1c38 git checkout dev
00:14 Sapio I'm confused. I thought the branch created a copy
00:14 ToxicFrog Once you commit them, that commit will be recorded in the "dev" branch rather than the "master" branch
00:14 lb1c38 Sapio maybe you read a bit before continuing?
00:14 lb1c38 !book
00:14 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
00:14 ToxicFrog And switch between branches (git checkout master/git checkout dev) will change which version you see based on what branch you're on.
00:14 lb1c38 !talk
00:14 gitinfo [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jessica Kerr: Git basics, descriptional)
00:15 ToxicFrog They look the same right now because both branches contain the same commits.
00:15 manuelschneid3r joined #git
00:15 ToxicFrog This is not like SVN; the different branches are all stored internally, and "git checkout" changes the files in your working copy to reflect which branch is checked out, rather than just creating a bunch of subdirectories with copies of your files in them.
00:17 ws2k3 joined #git
00:18 venmx joined #git
00:20 deinspanjer joined #git
00:20 zzz joined #git
00:21 menip joined #git
00:23 hahuang61 joined #git
00:24 JanC_ joined #git
00:30 m0viefreak joined #git
00:37 Blkt joined #git
00:38 snowalpaca joined #git
00:39 pks joined #git
00:40 deinspanjer joined #git
00:41 shinnya joined #git
00:41 chipotle joined #git
00:44 User458764 joined #git
00:46 pur3eval joined #git
00:49 deinspanjer joined #git
00:49 trip joined #git
00:49 VladGh joined #git
00:53 MattMaker joined #git
00:54 Masber joined #git
00:55 cdg joined #git
00:57 rivarun joined #git
00:58 todd_dsm joined #git
01:00 chachasmooth joined #git
01:00 Electrometro joined #git
01:05 mischat joined #git
01:06 Derperperd joined #git
01:14 fstd_ joined #git
01:14 User458764 joined #git
01:20 Electrometro joined #git
01:20 scoobert1on joined #git
01:21 miczac joined #git
01:21 matoro joined #git
01:31 endiruna joined #git
01:33 dreiss joined #git
01:37 btree joined #git
01:37 btree left #git
01:39 snowalpaca joined #git
01:39 chachasmooth joined #git
01:40 Goplat joined #git
01:41 strugee joined #git
01:42 inflames joined #git
01:43 User458764 joined #git
01:44 EV3RYDAYPR0GRESS joined #git
01:45 VladGh joined #git
01:46 arescorpio joined #git
01:51 aidalgol joined #git
01:51 dhollinger joined #git
01:56 kbs joined #git
01:58 mohabaks joined #git
01:59 mohabaks left #git
02:00 skered joined #git
02:02 helmet33 joined #git
02:03 Oatmeal joined #git
02:06 brent__ joined #git
02:06 mischat joined #git
02:08 pks joined #git
02:12 xaviergmail_ joined #git
02:12 chachasmooth joined #git
02:12 mikecmpbll joined #git
02:13 Gsham joined #git
02:13 finalbeta joined #git
02:14 User458764 joined #git
02:15 VladGh joined #git
02:15 chachasmooth_ joined #git
02:18 venmx joined #git
02:24 hahuang61 joined #git
02:24 Vampire0_ joined #git
02:27 pur3eval joined #git
02:27 danimal2 joined #git
02:28 jstimm joined #git
02:29 mehola joined #git
02:32 caffeinatedcode` left #git
02:32 caffeinatedcode joined #git
02:35 matumbo joined #git
02:38 mehola joined #git
02:46 User458764 joined #git
02:46 Derperperd joined #git
02:47 dsdeiz joined #git
02:48 hhee joined #git
02:49 d^sh joined #git
02:50 zerox2a joined #git
02:51 Groovin joined #git
02:52 ozmage joined #git
02:52 Groovin what is the best on-premise ci solution that works with git?
02:52 ffilozov joined #git
02:53 cagmz_ joined #git
02:53 fahadash joined #git
02:53 cagmez__ joined #git
02:53 Groovin Jenkins?
02:54 glspi joined #git
02:54 Cthalupa joined #git
02:55 DolpheenDream joined #git
02:56 HElephant joined #git
02:56 snowalpaca joined #git
03:01 bremner a popular choice. buildbot is a bit less heavy, I think
03:02 ojdo joined #git
03:04 chachasmooth joined #git
03:05 raijin joined #git
03:07 mischat joined #git
03:07 kbs nice, (as a question I've had as well) thx for pointer to buildbot as an alternative
03:09 HElephant joined #git
03:14 fstd_ joined #git
03:16 madewokherd joined #git
03:17 Groovin Thx.  Will look at buildbot.
03:17 Vortex34 joined #git
03:18 hexagoxel joined #git
03:20 chachasmooth joined #git
03:20 Groovin Looks promising... easy to get up and running for a newbie?
03:20 MattMaker joined #git
03:21 snowalpa_ joined #git
03:21 snowalp__ joined #git
03:22 Masber joined #git
03:22 kiltzman joined #git
03:23 packet0 joined #git
03:23 kiltzman joined #git
03:25 kiltzman joined #git
03:26 kiltzman joined #git
03:27 kiltzman joined #git
03:28 kiltzman joined #git
03:29 ash_workz joined #git
03:29 kiltzman joined #git
03:47 Derperperd joined #git
03:52 ozmage_ joined #git
03:55 sitaram joined #git
03:56 dsdeiz joined #git
03:56 dsdeiz joined #git
03:56 sunri5e joined #git
03:56 snowalpaca joined #git
03:57 snowalpa_ joined #git
03:57 pur3eval joined #git
03:58 snowal___ joined #git
03:58 mizu_no_oto joined #git
03:58 pandbearit joined #git
03:59 pandabearit_ joined #git
04:01 chachasmooth joined #git
04:02 joshszep joined #git
04:04 endiruna1 joined #git
04:06 finalbeta joined #git
04:07 mischat joined #git
04:08 User458764 joined #git
04:09 yaewa joined #git
04:09 nowhereman joined #git
04:09 hahuang61 joined #git
04:13 pur3eval joined #git
04:19 venmx joined #git
04:21 MattMaker joined #git
04:21 Motoko joined #git
04:21 sitaram joined #git
04:21 sitaram joined #git
04:26 IRCFrEAK joined #git
04:26 jnewt joined #git
04:27 Cabanoss- joined #git
04:32 Wulf joined #git
04:33 IRCFrEAK left #git
04:36 WayToDoor joined #git
04:39 User458764 joined #git
04:43 NightMonkey joined #git
04:43 jdelreal joined #git
04:46 aavrug joined #git
04:46 lektrik joined #git
04:49 suttonwilliamd joined #git
04:52 dmc joined #git
04:53 dsdeiz joined #git
04:59 Forbidd3n joined #git
05:01 hexagoxel joined #git
05:02 bannakaf_ joined #git
05:03 Nilesh_ joined #git
05:04 ozmage joined #git
05:06 sitaram joined #git
05:06 sitaram joined #git
05:08 mischat joined #git
05:08 User458764 joined #git
05:10 adi_ joined #git
05:16 MattMaker joined #git
05:18 venmx joined #git
05:20 chachasmooth joined #git
05:22 gkatsev joined #git
05:25 nod joined #git
05:26 xaviergmail_ joined #git
05:26 ozmage joined #git
05:27 neeri joined #git
05:29 chachasmooth joined #git
05:34 packet0 joined #git
05:35 ozmage_ joined #git
05:37 User458764 joined #git
05:37 basiclaser joined #git
05:38 ozmage joined #git
05:40 dreiss joined #git
05:40 d^sh joined #git
05:41 wachpwnski-mobi joined #git
05:43 Derperperd joined #git
05:43 APic joined #git
05:43 PlusMinus joined #git
05:44 chachasmooth joined #git
05:44 wachpwnski-mobi joined #git
05:51 ertes joined #git
05:52 kasual joined #git
05:55 hahuang61 joined #git
06:01 User458764 joined #git
06:07 rawburt So I have repo where I want to keep a file but don't want to commit it's changes to Git
06:07 rawburt .gitignore I think will result in the file being deleted from the repo
06:08 eroux joined #git
06:09 chachasmooth joined #git
06:09 mischat joined #git
06:16 rawburt http://stackoverflow.com/questions/1139762​/ignore-files-that-have-already-been-commi​tted-to-a-git-repository/11366713#11366713
06:24 shgysk8zer0_ joined #git
06:25 kini joined #git
06:25 chachasmooth joined #git
06:27 MonsterKiller joined #git
06:29 math-alpha joined #git
06:29 ozmage joined #git
06:39 Derperperd joined #git
06:44 ertesx joined #git
06:45 nowhereman joined #git
06:46 pks joined #git
06:47 dimi1947 joined #git
06:47 nowhereman joined #git
06:51 kiltzman joined #git
06:54 acetakwas joined #git
06:54 moei joined #git
07:04 ozmage joined #git
07:05 pks joined #git
07:06 mda1_ joined #git
07:07 pur3eval joined #git
07:07 Guest9 joined #git
07:08 User458764 joined #git
07:09 _ng joined #git
07:10 mischat joined #git
07:11 raynold ahh it's a wonderful day
07:12 Taikibansei joined #git
07:17 Lc0rE joined #git
07:20 zefferno joined #git
07:23 PlusMinus left #git
07:26 xaviergmail_ joined #git
07:26 Forbidd3n raynold: you have a minute to help me with why class is showing in composer autoload_psr4.php but class doesn't exist - https://gist.github.com/anonymous​/45c2cd05c364f00dbb9347a3c30597a0
07:26 eroux joined #git
07:26 pks joined #git
07:30 fahadash joined #git
07:31 kiltzman joined #git
07:31 kiltzman joined #git
07:32 kiltzman joined #git
07:32 kiltzman joined #git
07:33 venmx joined #git
07:33 kiltzman joined #git
07:34 peeps[lappy] joined #git
07:34 kiltzman joined #git
07:36 shgysk8zer0_ joined #git
07:38 ToxicFrog joined #git
07:43 ToxicFrog joined #git
07:46 jagob joined #git
07:47 King_Hual joined #git
07:52 User458764 joined #git
07:56 hahuang61 joined #git
07:57 blackwind_123 joined #git
08:03 dsdeiz joined #git
08:11 mischat joined #git
08:14 joshszep joined #git
08:17 blackwind_123 joined #git
08:18 t0by joined #git
08:18 t0by joined #git
08:25 Masber joined #git
08:27 pks joined #git
08:27 User458764 joined #git
08:35 dsdeiz joined #git
08:35 dsdeiz joined #git
08:36 ozmage joined #git
08:38 dreiss joined #git
08:39 toolforger joined #git
08:39 ozmage_ joined #git
08:40 metachr0n joined #git
08:44 MineCoins joined #git
08:45 nod joined #git
08:47 nd joined #git
08:50 dimi1947 joined #git
08:56 diogenese joined #git
08:57 dimi1947 I tried to swuash 2 commits and here is the message I got(image snapshot taken from git bash):https://1drv.ms/i/s!AjCBrCpLQye-g1CV7Ws3Ba07U7e5
08:59 dRealm joined #git
08:59 dRealm When a pull request gets merged upstream ("the base repo" or "the base fork"), is that  a new commit into the base repo?
08:59 dRealm The message on github says, "sama merged commit 9e09605  into <gh_username>:master"
09:00 dRealm I've checked my commit log, and there is not a commit # that begins with (or contains the substring) 9e09605
09:00 mehola joined #git
09:01 _main_ joined #git
09:02 _main_ joined #git
09:03 Ovsyanka dimi1947: seems like something uses that file and git cant delete it. What is your OS?
09:04 __main__ joined #git
09:04 dimi1947 Ovsyanka:Windows 7 ultimate
09:05 xmajedz joined #git
09:06 Ovsyanka you can use Unlocker to see what program uses this file: https://ru.wikipedia.org/wiki/Unlocker
09:06 Ovsyanka if I am right - you will found something. If i am not - then we can think in some other way
09:08 dimi1947 Ovsyanka:the wikipedia link is in russian...I cannot understand a thing
09:08 Ovsyanka oh, sorry: https://unlocker.en.softonic.com/
09:09 Ovsyanka i didnt noticed that :-[
09:11 dimi1947 Ovsyanka:One thing that I do not understand is that you said that git want to delete the file...I just want to squah 2 commits...what has deleting the file has to do with it?
09:12 mischat joined #git
09:14 overlord_tm joined #git
09:16 PioneerAxon joined #git
09:17 xaviergmail_ joined #git
09:17 MattMaker joined #git
09:19 ozmage joined #git
09:19 Electrometro joined #git
09:22 dersand joined #git
09:23 todd_dsm joined #git
09:26 toolforger joined #git
09:29 Macaveli joined #git
09:32 bannakaffalatta joined #git
09:33 Murii joined #git
09:33 xaviergmail_ joined #git
09:33 theoceaniscool joined #git
09:36 SteffanW joined #git
09:36 Ovsyanka dimi1947: did this file created in one of that commits?
09:38 mischat joined #git
09:54 User458764 joined #git
09:56 cyphase joined #git
09:57 hahuang61 joined #git
09:58 miczac joined #git
09:59 myme joined #git
10:01 jameser joined #git
10:02 PioneerAxon joined #git
10:02 ChiLL_SurF joined #git
10:04 PrashantJ joined #git
10:04 tango_ joined #git
10:05 netj joined #git
10:05 PrashantJ Cloned a upstream repository and edited in master repo. Now, I want to sync the local master with upstream and undo all the changes. 'git pull' does not help. Anyone please?
10:07 Ovsyanka Did you made commit in your local master branch?
10:07 PrashantJ No Ovsyanka
10:07 tango_ joined #git
10:08 Ovsyanka Do you just made your changes in the working directory?
10:08 PrashantJ yes, I just cloned an upstream project and did changes in master
10:08 Ovsyanka do your master points to the commit origin/master points?
10:08 PrashantJ Yes
10:08 Ovsyanka Do you want to save your changes?
10:09 Ovsyanka I mean, in some place
10:09 PrashantJ I did not stage files
10:09 Ovsyanka Or it is a thrash changes and you never want it
10:09 PrashantJ Yes exactly
10:09 PrashantJ thrash changes
10:10 Ovsyanka okay, you can just run `git reset --hard HEAD`
10:10 Ovsyanka it will make your working directory exactly like your HEAD commit. And your HEAD commit is master right now.
10:11 PrashantJ Ovsyanka, as per my assumption all delta's need to be fixed when I do 'git pull'. Am I correct?
10:11 Ovsyanka nope
10:11 PrashantJ Ovsyanka, oops
10:11 treia joined #git
10:12 Ovsyanka it may depends on your git settings, but usually your changes just rebasing on the actual code.
10:12 PrashantJ Ovsyanka, thanks for help. Need to dig in a bit
10:13 Ovsyanka Your branch rebasing on remote branch (or it merges with remote, depends on git settings).
10:13 Ovsyanka What client you use on your machine?
10:13 YuGiOhJCJ joined #git
10:14 Ovsyanka I use SmartGit and it: 1. stashes your local changes, rebasing local branch to remote branch, applying stashed changes.
10:15 PrashantJ I use git on terminal. simple one
10:16 Ovsyanka Git by default as i know dont start the rebase while your local directory is dirty.
10:16 finalbeta joined #git
10:16 nidr0x joined #git
10:17 PrashantJ Ovsyanka, I did 'git checkout -- <filename>' and it worked to what I wanted
10:17 Ovsyanka Yes, it is another way to do this. But for particular file.
10:17 Ovsyanka Why you didnt run my supposed command? =)
10:18 PrashantJ ohh, Someone by my side advised this :)
10:19 PrashantJ Thanks Ovsyanka !
10:19 MattMaker joined #git
10:19 Ovsyanka okay =) yw!
10:21 dsdeiz joined #git
10:23 ToBeCloud joined #git
10:23 garethdaine joined #git
10:25 catsup joined #git
10:26 catsup joined #git
10:29 borkr joined #git
10:30 Nilesh_ joined #git
10:36 ozmage joined #git
10:40 Jackneill_ joined #git
10:46 finalbeta joined #git
10:49 Cassiopaya joined #git
10:54 ozmage joined #git
10:57 jnavila_ joined #git
10:58 ElGrandeAmigo joined #git
10:58 irqq joined #git
11:00 User458764 joined #git
11:00 PioneerAxon joined #git
11:00 Derperpe1 joined #git
11:00 Shakeel__ joined #git
11:01 ajpiano joined #git
11:02 armyriad joined #git
11:05 s1scha joined #git
11:05 a_ joined #git
11:13 mda1 joined #git
11:16 finalbeta joined #git
11:16 blackwind_123 joined #git
11:17 MineCoins joined #git
11:20 MattMaker joined #git
11:20 lowercaseman joined #git
11:25 aavrug joined #git
11:26 treia joined #git
11:26 zeroed joined #git
11:26 dsdeiz joined #git
11:26 dsdeiz joined #git
11:27 def_jam joined #git
11:27 PioneerAxon joined #git
11:28 eb0t_ joined #git
11:29 packet0 joined #git
11:30 finalbeta joined #git
11:31 nettoweb joined #git
11:35 kiltzman joined #git
11:36 b100s joined #git
11:38 kiltzman joined #git
11:40 eb0t_ joined #git
11:40 kiltzman joined #git
11:41 kiltzman joined #git
11:42 kiltzman joined #git
11:42 Whiskey When i modify files in my git, i can see it in "git status" is it anyway to empty that list untill next time i edit files?
11:42 def_jam joined #git
11:43 kiltzman joined #git
11:43 leeN joined #git
11:44 kiltzman joined #git
11:44 kadoban commit them?
11:45 Whiskey but if i don´t will see them or commit them?
11:45 kadoban No. You really shouldn't be sitting there with many changed files you don't plan to commit. Kind of defeats the purpose of git.
11:45 Ovsyanka Whiskey: I am not sure that i got your request right, but i think you have to commit that changes, then your working directory will clean
11:46 Ovsyanka Whiskey: you can make lot of commits and then you can squash it together into one commit.
11:46 Whiskey No!
11:47 Whiskey If i change any file, it will show in "git status" it most be a way to ignore files and remove it from that list like it never was modifyed
11:47 Ovsyanka ah, okay.
11:48 Ovsyanka there is git ignore for that purpose
11:48 kadoban Yes, by removing the changes in the file or commiting them. *shrug*  Ignore won't do anything for tracked files.
11:48 Whiskey and atm i fucked up my git and i hate this software
11:48 Ovsyanka I know 3 ways to ignore files. The right choise depends on what is that particular files. What is that files?
11:49 Whiskey I try to remove last commit that i uploaded to my remote, but it won´t delete it
11:49 kadoban Ovsyanka: None of them will have any effect on tracked files.
11:49 Ovsyanka Describe us what is that files and why you want to ignore it.
11:49 Ovsyanka yes, but he can remove it from git
11:50 pks joined #git
11:50 nettoweb1 joined #git
11:51 PioneerAxon joined #git
11:52 Whiskey Why is my commit not delete
11:52 Whiskey d
11:54 Ovsyanka Whiskey: I dont know. How you tryed to delet it? Let's finish with files to ignore? Reply to my questions plz
11:54 Whiskey No i don´t think you get what i mean
11:55 Whiskey drop that i have another damit
11:55 Whiskey i hate this fucking software
11:56 Ovsyanka lol. You just need some patience to enjoy it =)
11:56 Ovsyanka so, about deleting. What do you mean "delete commit"? Delete it from history?
11:57 Ovsyanka Or qust revert its changes?
11:57 Ovsyanka just*
11:57 Whiskey Well the damn software reverted all my changes local when i try to remove the commit
11:57 hahuang61 joined #git
11:58 Whiskey delete it from remote when you se "commit xxxxxxx" ?????????
11:58 irqq joined #git
11:58 Whiskey i don´t care about my local repo, i just need the remote to remove the commit and the changes made on the "remote" repo, and keep my local repo untuched
11:59 AciD` left #git
12:01 finalbeta joined #git
12:01 Ovsyanka Software isn't "damn". It makes that you say it to make.Okay, you can use `git reset --hard <commitRef>`, where <commitRef> is the reference to commit you want to be a head of your branch.
12:01 Whiskey but it will remove it on local also?
12:02 Ovsyanka this command working with your local repo. After it you have to push the changes to remote repo
12:02 Whiskey but it will reset changes on my local repo also right?
12:02 bremner !backup
12:02 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
12:02 Ovsyanka Wait a moment, i will find you a good description about this case
12:03 Whiskey sp any edited files will be reverted back on my local also
12:03 Ovsyanka Whiskey: http://stackoverflow.com/questions/1338​728/delete-commits-from-a-branch-in-git
12:04 Whiskey yes you don´t listen
12:04 Whiskey I don´t need to delete anything in my "local" only on the remote
12:05 Tobbi joined #git
12:05 Whiskey So, delete commit and changes for "remote" and keep it as it is on local repo so my changes stay
12:05 bluepixel joined #git
12:05 Ovsyanka you can place a tag or a branch on your current commit.
12:05 Ovsyanka i'll give you an example
12:06 JanC_ joined #git
12:06 Whiskey So its not possible to just delete it on repo whitout delete it on local
12:06 bremner you can, as I said above, just make another copy of the local repo and work there
12:07 satifant joined #git
12:07 Whiskey so everytime you do it, you have to backup and restore?
12:08 Whiskey Is not that very complicated and stupid insted of just have a command that tell repo to just ignore last commit and changes, sounds strange to me
12:08 bremner well, wanting to change the remote without changing the local is not something I've ever wanted to do
12:08 kadoban There's ways to do it, you can look in man git push if you like.
12:08 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
12:08 bremner complaining doesn't really help anything, it just makes want to do other things rather than help.
12:08 kadoban I'd do more work, but ... frankly you're kind of rude.
12:09 eb0t joined #git
12:09 Whiskey i won´t try find it, as i have google on it allredy and try and my whole repo is damaged now
12:09 Whiskey i have try "git reset --soft commitId" but it don´t work
12:10 eblip joined #git
12:10 Whiskey its should do what i want i think
12:10 Ovsyanka Whiskey: http://pastebin.com/Yb4zqJzg
12:11 Whiskey what is mytask?
12:12 Whiskey i stil think my way is more easy
12:12 Ovsyanka Whiskey: it is just a name for branch.
12:12 Whiskey i won´t save it, and jump around whit branches my repo is to small to play whit this commands
12:12 Ovsyanka Oh, i didn't noticed about your way. Okay, you can use your way if you have one
12:13 Whiskey yes i told you
12:13 Whiskey git reset --soft commitId <-- it removes my last commiit and leve my local untuched right
12:14 Ovsyanka ah, yes, you can do it too
12:14 Whiskey does commitId need to be full?
12:14 Whiskey or is it fine whit the one you see on lets say github
12:14 Ovsyanka then you should do forced push as i described in pastebin
12:14 Whiskey yeh
12:15 bremner it still changes your local repo. It just doesn't change the working copy.
12:15 Whiskey Latest commit 11f1efa <-- or does it need to be full
12:15 Whiskey bremner: what does that means?
12:16 Whiskey does it leve my local files unchanged so it is what it was when commit was made
12:16 bremner yes, but your files are out of sync with the git history stored in the local repo
12:16 Whiskey is that a problem?
12:17 bremner depends if you plan to work more on this branch, ever
12:17 Whiskey yes i do
12:17 Whiskey okay, lets say this, remove local and remote commit then so its in sync, but files on local reamin untuched
12:17 Whiskey then it should fix any problems
12:18 irqq_ joined #git
12:18 Whiskey atm i need to sync my repo whit remote, as its all a mess before i try to delete that commit
12:19 nedbat Whiskey: it's easy to make your repo be like the remote. you want to forget about all your changes, right?
12:20 Whiskey yeh
12:20 Oatmeal joined #git
12:20 nedbat Whiskey: you want your master to be like origin/master ?
12:20 Whiskey as before i fix the problem i have right now i need to restore it
12:20 Whiskey i think it is that atm
12:20 MattMaker joined #git
12:20 Whiskey whatever that means, master local? and orgin/master remote?
12:20 nedbat Whiskey: yes
12:21 Whiskey yes i want it to be 1/1 copy atm
12:21 nedbat Whiskey: git checkout master; git reset --hard origin/master
12:22 bremner but we just had this long discussion about preserving the local repo...
12:22 bremner reset --hard will certainly not do that.
12:22 Whiskey bremner: yes but its fucked up as i try to delete the commit
12:22 Whiskey So i need to restore it, before i try to undo that commit
12:23 Whiskey the status log is way out of sync
12:23 bremner ok, just don't complain when reset --hard wipes out your changes
12:23 nedbat Whiskey: do you need any of your local changes?
12:23 Whiskey i don´t have any changes atm
12:23 bremner ffs
12:23 dsdeiz joined #git
12:23 nedbat Whiskey: then in what way is your local repo different than the remote?
12:24 Whiskey well, if i remove the last commit, the changes made will be deleted that was the problem
12:24 Whiskey i think
12:24 nedbat !lol
12:24 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
12:24 nedbat Whiskey: can you show us the output of that line?
12:25 Whiskey sure
12:25 Whiskey nedbat seems like that worked fine
12:26 nedbat Whiskey: ok, then no need to show the output. carry on
12:26 Whiskey http://pastebin.com/UQbyBeiv
12:27 Whiskey anyways
12:27 Whiskey back to my prolbem
12:27 Whiskey nedbat: thanks
12:27 Whiskey 255fa8a (HEAD, origin/master, master) Removed tabs and use whitepsace isnted <-- that commit need to be deleted from remote, whitout change files on the local repo
12:28 jameser joined #git
12:30 nedbat Whiskey: why do you want to remove it from the remote, but not from your local repo?
12:31 Peetz0r joined #git
12:31 Whiskey nedbat: the commit need to be deleted from both, i just want to be sure that my modifed files on my local repo stay modifed
12:32 nedbat Whiskey: why do you want that? what will you do next?
12:32 a_thakur joined #git
12:32 Whiskey well of some reason 3 files come in one commit, it was supose to be in 3 diffrent commits
12:32 Whiskey so recommit them on by one
12:32 MarioBranco joined #git
12:33 robotroll joined #git
12:33 nedbat Whiskey: i don't want to give you bad advice, so I'm going to keep asking questions first: why is it important for them to be in 3 different commits?
12:33 Whiskey nedbat: the changes that was uploaded in the commit was total diffrent and has nothing to do whit the commit i made
12:34 nedbat Whiskey: as long as the end result is the same, what difference does it make which commit it appears in?
12:34 Whiskey well, why have changes in a commit that don´t have anything to do whit it?
12:35 Whiskey then the commits its not needed and only the changes
12:35 nedbat Whiskey: i understand the ideal of having clean separate commits. but trying to back and fix commits can get very complicated, and might not be worth the effort.
12:35 nedbat especially to have someone talk you through it over irc
12:35 nedbat *go back
12:36 nedbat Whiskey: i would recommend leaving this as it is, and being more careful with commits in the future.
12:36 Whiskey nedbat: my answer is still the same, if its possible to remove commits on both places, and let the changes be on local and just revert back the local
12:36 Whiskey revert back the "remote"
12:36 nedbat Whiskey: yes, it's possible.
12:36 Whiskey tell me how and i try it
12:37 nedbat Whiskey: how many commits to you want to undo on the remote?
12:37 Whiskey only one
12:37 Whiskey last one
12:38 eblip joined #git
12:38 nedbat Whiskey: i wouldn't bother to undo the remote. instead, make the commits on the local, and then push them to the remote. that will look like you undid it.
12:38 eb0t joined #git
12:39 nedbat Whiskey: git reset --soft @^
12:39 Whiskey and then "git push"
12:40 Whiskey but will it revert changes on remote?
12:40 nedbat Whiskey: actually, this is better: git reset @^
12:40 nedbat Whiskey: you don't need to revert the changes on the remote, because in five minutes, you will push new changes to the remote.
12:41 Whiskey hmmm
12:42 jnavila_ joined #git
12:43 Whiskey Now it mess whit me again stupid git
12:43 Whiskey the commit is made on my local and its need to be removed
12:44 Whiskey welll i can push it and redo it
12:45 vuoto joined #git
12:45 Whiskey talk about strange software
12:45 Whiskey okay nedbat: we back where it started
12:46 beuker_ left #git
12:46 nedbat Whiskey: can you pastebin your whole terminal session? Do that git log command at the end, and show us what you have
12:46 Whiskey Porblem is that "git status" has 3 green files and i guss this is the ones that going to be uploaded to the remote when commit is made, how do i remove files that don´t need to be in that commit? to ingore them
12:47 Whiskey i only need one to be commited not all three of them
12:47 nedbat Whiskey: pastebin your terminal session
12:47 treia joined #git
12:47 Whiskey its on swedish one sec :D
12:47 kadoban Whiskey: You badly need to read up on some git basics. Any tutorial or book. It will be vastly confusing until you do.
12:48 beuker joined #git
12:48 nedbat Whiskey: the parts i need to see will be fine.
12:49 Whiskey whit other words, revert them back to untracked
12:49 nedbat Whiskey: use this log command:  git log --oneline --graph --decorate --all master origin/master
12:49 Whiskey nedbat: everything is fine there
12:49 nedbat Whiskey: use this log command:  git log --oneline --graph --decorate --all master origin/master
12:50 Whiskey git rm --cached filename <-- is what i was after nedbat
12:51 Whiskey nedbat: thanks for you help, i have everything i need now
12:51 treia joined #git
12:51 MonsterKiller joined #git
12:51 Whiskey kadoban: yeh i know i try to learn
12:52 Groovin trying to set up a devops pipeline... looks like git-ci is not really open source for on premise installation.
12:52 souther joined #git
12:53 Groovin Any ideas on a package to handle this for me?  Looking for free open source... jenkins?  buildbot?  Any favorites for newbs like me?
12:53 packet0 joined #git
12:54 Whiskey hmm maybe not
12:56 treia joined #git
12:58 Whiskey There we go :D
12:59 Whiskey "git reset HEAD <file>" was the one i was after :D
12:59 dsdeiz joined #git
13:00 Tobbi joined #git
13:01 mischat joined #git
13:01 hxle joined #git
13:01 m0viefreak joined #git
13:01 Whiskey nedbat: thanks alot its pefect now :)
13:05 crawler joined #git
13:07 crawler joined #git
13:08 dsdeiz joined #git
13:08 dsdeiz joined #git
13:14 acetakwas joined #git
13:15 manuelschneid3r joined #git
13:21 MattMaker joined #git
13:21 Gustavo6046 joined #git
13:22 Masber joined #git
13:25 flobin joined #git
13:30 b100s joined #git
13:34 mahakal joined #git
13:35 Whiskey error: failed to push some refs to, Updates were rejected because the tip of your current branch is behind why does this happens?
13:36 Cabanossi joined #git
13:38 nedbat Whiskey: you need push -f
13:39 Whiskey is that -force?
13:39 finalbeta joined #git
13:40 Cabanoss- joined #git
13:40 nedbat Whiskey: git push --help
13:40 mahakal Whiskey u asking bash there ..here git...whar r u really doing?
13:40 systemovich joined #git
13:40 nedbat mahakal: asking bash?
13:41 Whiskey hehe in #bash
13:41 Whiskey nedbat: it did upload stuff i did not added to the commit
13:41 nedbat Whiskey: i don't understand what you are saying
13:42 brokensyntax joined #git
13:42 Whiskey i change one file, try to push and commit it
13:42 Whiskey it upload 2 files and vice versa
13:43 pR0Ps joined #git
13:43 nedbat Whiskey: the only way we can help is if you provide details
13:43 Whiskey ooops
13:43 Whiskey my fullt
13:44 Whiskey nedbat: was my fult :)
13:44 Whiskey back on track
13:44 DieguezZ joined #git
13:46 Fpmug joined #git
13:48 metachr0n joined #git
13:49 ErkiDerLoony joined #git
13:49 anuxivm joined #git
13:50 brokensyntax joined #git
13:55 avis- joined #git
13:58 mda1_ joined #git
13:58 hahuang61 joined #git
14:01 chachasmooth joined #git
14:02 mischat joined #git
14:09 mohabaks joined #git
14:17 joshszep joined #git
14:22 MattMaker joined #git
14:22 DolpheenDream joined #git
14:23 Gsham joined #git
14:23 serialoverflow joined #git
14:27 Cabanossi joined #git
14:29 mohabaks left #git
14:29 marianina8 joined #git
14:34 mda1 joined #git
14:40 texinwien_ joined #git
14:40 King_Hual joined #git
14:40 King_Hual joined #git
14:42 bkur joined #git
14:53 Endorphine joined #git
14:54 bjooy joined #git
14:54 m4sk1n joined #git
14:55 marianina8 joined #git
14:56 User458764 joined #git
14:57 kexmex joined #git
14:58 brokensyntax joined #git
15:00 NullableTruth joined #git
15:02 jagob joined #git
15:02 diegs_ joined #git
15:03 mischat joined #git
15:04 leeN joined #git
15:04 crawler joined #git
15:06 flobin joined #git
15:07 Learath2 joined #git
15:10 Electrometro joined #git
15:15 diegs_ left #git
15:18 griffindy joined #git
15:23 MattMaker joined #git
15:27 DieguezZ joined #git
15:27 GodEater joined #git
15:27 GodEater joined #git
15:28 borkr joined #git
15:28 User458764 joined #git
15:28 miczac joined #git
15:28 systemovich joined #git
15:29 bannakaffalatta joined #git
15:30 kasual joined #git
15:31 duderonomy joined #git
15:33 irqq joined #git
15:37 Endorphine joined #git
15:40 dreiss joined #git
15:44 kiltzman joined #git
15:46 kiltzman joined #git
15:47 vuoto joined #git
15:48 kiltzman joined #git
15:49 brokensyntax joined #git
15:49 kiltzman joined #git
15:50 PioneerAxon joined #git
15:50 chachasmooth joined #git
15:51 kiltzman joined #git
15:51 kiltzman joined #git
15:51 vuoto joined #git
15:53 kiltzman joined #git
15:53 tmsmith joined #git
15:53 muldover joined #git
15:55 DaveTaboola joined #git
15:56 hasc joined #git
15:59 ResidentBiscuit joined #git
15:59 hahuang61 joined #git
15:59 g5pw joined #git
15:59 chachasmooth joined #git
16:01 mda1 joined #git
16:02 kexmex joined #git
16:02 perrier-jouet joined #git
16:02 Electrometro joined #git
16:03 YuGiOhJCJ joined #git
16:03 mischat joined #git
16:05 dsdeiz joined #git
16:05 dsdeiz joined #git
16:07 anuxivm left #git
16:07 tmsmith joined #git
16:07 jimi_ joined #git
16:08 ych joined #git
16:09 rorro joined #git
16:10 brokensyntax joined #git
16:10 Peetz0r joined #git
16:11 SpiderDisco joined #git
16:11 jnavila_ joined #git
16:12 Peetz0r joined #git
16:13 cdown joined #git
16:13 SirOliver joined #git
16:14 Peetz0r joined #git
16:17 helmet33 joined #git
16:18 miczac_ joined #git
16:21 brokensyntax joined #git
16:22 g5pw joined #git
16:23 sword joined #git
16:24 MattMaker joined #git
16:24 griffindy joined #git
16:28 kaldoran joined #git
16:29 sim590 joined #git
16:29 packet0 joined #git
16:31 heftig joined #git
16:31 vuoto joined #git
16:32 deepak_ joined #git
16:32 EV3RYDAYPR0GRESS joined #git
16:34 mizu_no_oto joined #git
16:34 Noldorin joined #git
16:39 marianina8 joined #git
16:41 jimi_ joined #git
16:42 xaviergmail_ joined #git
16:44 Derperpe1 joined #git
16:44 mohabaks joined #git
16:46 mohabaks left #git
16:51 suttonwilliamd_ joined #git
16:54 jelle[m] joined #git
16:57 madewokherd joined #git
16:59 govg joined #git
17:05 mischat joined #git
17:05 menip joined #git
17:07 User458764 joined #git
17:08 __rgn joined #git
17:09 Electrometro joined #git
17:11 tusharmalik joined #git
17:11 LeBlaaanc joined #git
17:11 vuoto joined #git
17:14 __rgn is there a way to determine which commit a directory is at if it's not a git repo at the moment, but i init and add a remote?
17:14 kexmex hey guys
17:14 kexmex lets say i have a version branch and feature branches created from version branch
17:15 pks joined #git
17:15 kexmex so lets say i am working on a feature branch for a week and there are a bunch of changes made to version branch
17:15 kexmex and say, someone fixed a bug that I'd like to get into my feature branch which makes it easier for me to work on it
17:15 kexmex if i merge  version branch to feature branch and continue working on it, then I merge feature branch into version branch....  isn't the tree gonna be fugly as hell?
17:16 Domhack joined #git
17:17 bremner __rgn: which commit with respect to your remote? just clone it and check.
17:17 armyriad joined #git
17:18 bremner or fetch the remote, but possibly the working dir will have changes not in the remote
17:18 thiago __rgn: it is at no commit then
17:18 dreiss joined #git
17:19 glebihan joined #git
17:19 _ng joined #git
17:22 emreunal[m] joined #git
17:23 __rgn bremner: i am asking about the "check" part
17:24 MattMaker joined #git
17:25 __rgn okay looks like the question was too difficult, i'll try to explain in another way
17:25 venmx joined #git
17:26 __rgn you clone a repo, and accidentally rm -rf .git. few weeks pass and you want to get to the state your repo was before you rm'd few weeks ago
17:26 __rgn how do you figure out that commit based on state of working tree
17:28 kasual joined #git
17:29 emreunal[m] left #git
17:31 thiago __rgn: you check your backups
17:31 thiago that's the only sure way. The rest is guesswork.
17:32 __rgn i know it's the only sure way
17:32 thiago there you go
17:33 __rgn thanks a lot
17:34 bremner __rgn: for-each-ref and git diff could help the guess work
17:36 thiago I'd make a commit and see if the tree SHA1 matches any of the commits'
17:36 bremner won't timestamps mess with you? or that's not in the tree SHA1?
17:37 thiago that requires the files matching exactly a commit (no modification), adding all files and no ignored ones
17:37 thiago timestamps are not recorded
17:37 bremner I see. only in the commit SHA1 I guess.
17:37 thiago yes
17:44 packet0 joined #git
17:45 b100s left #git
17:48 xaviergmail_ joined #git
17:53 ertesx joined #git
17:55 finalbeta joined #git
17:57 zerox2a joined #git
18:00 hahuang61 joined #git
18:00 [Brain]2 joined #git
18:01 Motoko joined #git
18:04 ych joined #git
18:05 Electrometro joined #git
18:05 mischat joined #git
18:09 SuprDewd joined #git
18:24 Doow joined #git
18:24 ffilozov joined #git
18:25 MattMaker joined #git
18:26 coco joined #git
18:27 crawler joined #git
18:27 annoymouse joined #git
18:27 mac- joined #git
18:27 _xor joined #git
18:28 watabou joined #git
18:29 wilbert joined #git
18:30 [Brain] joined #git
18:31 annoymouse I messed up a little bit and I am hoping someone can help me fix my mistake. I am trying to submit to separate pull requests on GitHub to some upstream repo. The first one was a relatively quick fix so I just did it on my master branch (I know, I should have made a hotfix branch) and submitted the PR. Then I created a new branch based off of my master for
18:31 annoymouse the second pull request. I committed the changes to that branch, but when I try to submit the second PR, the commits from the first PR are included. Is this a problem for the upstream maintainer? If so, how can i reply my changes on top of the upstream master?
18:31 User458764 joined #git
18:32 jast it's only a problem for the upstream maintainer if they're not going to want the first set of commits
18:33 thiago you can "fix" it by creating a third branch, starting from origin/master, then cherry-picking your commits
18:33 thiago once you're done, you can delete the incorrect branch, rename the temporary branch to its actual name, then push -f
18:33 ResidentBiscuit joined #git
18:35 a0x10c joined #git
18:37 annoymouse thiago: Do you mean starting from upstream/master? My origin/master has the commits from the first PR.
18:37 annoymouse And what's the command for cherry-picking?
18:38 thiago yes
18:38 thiago git cherry-pick
18:38 annoymouse Let me try that
18:39 annoymouse thiago: So something like git branch temp upstream/master at first
18:39 thiago yes
18:41 annoymouse and git cherry-pick takes the hash of the first commit I want to include as an arg?
18:41 thiago no, of each commit you want to cherry-pick
18:43 annoymouse thiago: Ok
18:43 annoymouse Now how do I rename the temp branch?
18:50 thebird joined #git
18:50 denisMone joined #git
18:52 pur3eval joined #git
18:53 bats joined #git
18:53 SuprDewd joined #git
18:53 User458764 joined #git
18:55 peeps[lappy] joined #git
18:55 jimi_ joined #git
18:55 BSaboia joined #git
19:06 mischat joined #git
19:09 venmx joined #git
19:14 roygbiv joined #git
19:15 BSAlb joined #git
19:18 thebird joined #git
19:18 DolpheenDream joined #git
19:19 Tobbi joined #git
19:19 raynold joined #git
19:22 dreiss joined #git
19:23 thiago annoymouse: git branch -m
19:24 clickjack joined #git
19:24 hussam joined #git
19:25 jnavila_ joined #git
19:26 finalbeta joined #git
19:26 MattMaker joined #git
19:27 matoro joined #git
19:28 chris_wot joined #git
19:35 Goplat joined #git
19:39 ozmage joined #git
19:44 salamanderrake is there a way in git to protect untracked folder/files from git clean -fxd ?
19:45 thiago drop the -x
19:45 thiago and add the files to .gitignore
19:46 salamanderrake ok
19:47 venmx joined #git
19:48 osse salamanderrake: maybe you want git clean -fXd
19:48 salamanderrake thats what I am thinking
19:48 dendazen joined #git
19:54 mischat joined #git
19:54 kiltzman joined #git
19:55 kiltzman joined #git
19:55 tmsmith joined #git
19:57 kiltzman joined #git
19:57 kiltzman joined #git
20:00 kiltzman joined #git
20:00 kiltzman joined #git
20:00 hahuang61 joined #git
20:01 kiltzman joined #git
20:01 Emperor_Earth joined #git
20:02 ajsantos joined #git
20:03 fortin joined #git
20:03 robattila256 joined #git
20:04 pandeiro joined #git
20:04 xaviergmail_ joined #git
20:05 fortin hi folks. I'm trying to compile a static git binary which supports ls-remote too but the tutorials I find are all suggesting to disable libcurl which seems to break it (Unable to find remote helper for 'https')
20:06 salamanderrake does git have issues with tracking differences between .ini files? I added one line and in the git diff between two commits on a .ini file and instead of showing the change it did the whole - everything and + everything.
20:08 ajsantos left #git
20:08 DieguezZ joined #git
20:09 salamanderrake also is this the place to ask about git lfs or is lfs still not official yet?
20:09 fortin salamanderrake: maybe the editor changed line terminator? might explain why all file changed
20:10 salamanderrake maybe
20:10 kadoban Nobody really cares what's official. But none of the regulars seem to use git lfs. I don't think git lfs would ever be an official thing anyway, it's like a github addon.
20:10 salamanderrake github and gitlab
20:10 salamanderrake they both use it
20:10 matoro joined #git
20:11 eblip joined #git
20:12 venmx joined #git
20:16 afuentes joined #git
20:16 chachasmooth joined #git
20:17 ozmage joined #git
20:20 parasite_ joined #git
20:20 BSaboia joined #git
20:21 AciD` joined #git
20:22 Gustavo6046 joined #git
20:22 cdown joined #git
20:22 Tobbi joined #git
20:24 anuxivm joined #git
20:25 glspi joined #git
20:26 wget joined #git
20:27 d-fence_ joined #git
20:27 MattMaker joined #git
20:27 BSaboia joined #git
20:34 chachasmooth joined #git
20:35 Murii joined #git
20:35 gabriel joined #git
20:40 joki joined #git
20:44 Bob8989 joined #git
20:46 Derperpe1 joined #git
20:47 User458764 joined #git
20:49 pur3eval joined #git
20:51 Atm0spher1c joined #git
20:56 mischat joined #git
20:58 rorro joined #git
20:58 JanC_ joined #git
21:01 Oatmeal joined #git
21:03 dviola joined #git
21:04 ispn joined #git
21:06 peterbecich joined #git
21:09 diogenese joined #git
21:16 peterbecich joined #git
21:19 rgrinberg joined #git
21:20 flobin joined #git
21:22 rgrinberg joined #git
21:25 amdi_ joined #git
21:26 gugah joined #git
21:27 MattMaker joined #git
21:30 jimklo joined #git
21:30 ramsub07 joined #git
21:30 DolpheenDream joined #git
21:34 Artyom joined #git
21:36 askb joined #git
21:38 Gsham joined #git
21:39 aidalgol joined #git
21:39 marianina8 joined #git
21:44 jimi_ joined #git
21:44 Derperperd joined #git
21:46 ResidentBiscuit joined #git
21:49 bmahe joined #git
21:50 webdev007 joined #git
21:53 systemovich joined #git
21:55 overlord_tm joined #git
21:56 zeroed joined #git
21:56 zeroed joined #git
21:57 venmx joined #git
22:00 pur3eval joined #git
22:01 hahuang61 joined #git
22:03 basdb joined #git
22:06 nimbleark joined #git
22:08 Puffball joined #git
22:14 Muzer joined #git
22:17 blackwind_123 joined #git
22:17 clickjack joined #git
22:22 xaviergmail_ joined #git
22:24 webdev007 joined #git
22:24 jagob joined #git
22:26 zeroed joined #git
22:29 MattMaker joined #git
22:29 j7k6 joined #git
22:29 rorro joined #git
22:34 ResidentBiscuit joined #git
22:35 Forlorn joined #git
22:36 DolpheenDream joined #git
22:39 btree joined #git
22:40 btree left #git
22:41 webdev007 joined #git
22:43 webdev007 joined #git
22:51 pks joined #git
22:51 valize joined #git
22:51 acetakwas joined #git
22:54 pbrewczynski joined #git
22:57 Eugene salamanderrake - LFS is not in core git.git and is thus not "official". I would venture(based upon anecdotal-at-best evidence) that annex is more stable. What people actually use really depends upon the project
22:57 ryxxed joined #git
22:57 Eugene I am solidly in the "don't commit big things to git, you ninny" camp
22:58 Eugene LFS certainly appears to be taking off, and it is Github/lab integrated so...... go for it
23:00 ozmage joined #git
23:01 fmeerkoetter joined #git
23:01 Derperperd joined #git
23:02 webdev007 joined #git
23:02 cbreak LFS is a huge pain in the ass
23:03 cbreak it's super slow, fragile, and annoying to use, at least on windows
23:03 cbreak if you have alternatives, I'd recommend considering them, if not, I'd recommend searching for them :)
23:06 Darcidride joined #git
23:07 fragMental joined #git
23:07 jimi_ joined #git
23:09 suttonwilliamd joined #git
23:12 ^7heo cbreak: can you explain what LFS is in that context?
23:13 ^7heo oh it's a git thing/
23:13 robattila256 joined #git
23:13 kadoban ^7heo: https://git-lfs.github.com/
23:13 kadoban Yes, funnily enough :)
23:14 ^7heo nah it's not really funny.
23:15 clickjack joined #git
23:16 ^7heo I am very much annoyed by the ambiguous acronyms used more and more in everyday language
23:16 ^7heo WTF w/ this rly.
23:18 kadoban LFS is fairly well known, and you're in #git. Also, you probably missed the start of the conversation, which was a few hours ago.
23:27 col joined #git
23:29 MattMaker joined #git
23:31 dviola joined #git
23:32 Whiskey I have a problem i changed name to one of my files, and when i commit it and push it, the old one is not removed, do i need to "git rm --cached filename" to get it removed?
23:33 cbreak Whiskey: how did you change the name?
23:33 Whiskey from abcdsf.ext to adsgsdg.ext and also changed place on it to another folder
23:33 DolpheenDream joined #git
23:33 cbreak so, you renamed it
23:33 Whiskey but deleted the old file from my local repo
23:33 cbreak and moved it
23:33 cbreak so the old one is no longer there
23:34 cbreak and you told git about it with git mv?
23:34 Whiskey no
23:34 cbreak then you have to tell it about it with git add after the move
23:34 cbreak before the commit obviously
23:34 Whiskey yeh i did that
23:34 cbreak otherwise it's not a move
23:34 cbreak just a copy
23:36 Whiskey well the new file get uploaded and comitted, but the old is not deleted
23:36 cbreak because you didn't tell git about it
23:36 Whiskey well git status show "deleted" on the file that is deleted its allredy know it
23:36 cbreak Whiskey: if you make changes to the working dir, tell git about it
23:37 cbreak git add is for adding changes to the staging area
23:37 col joined #git
23:37 cbreak Whiskey: it shows it as unstaged changes
23:37 cbreak if you had added it, it'd show a rename
23:37 Whiskey i can´t do git add and the deleted files
23:37 joshszep joined #git
23:37 cbreak you can add the deletion
23:37 Whiskey on ""
23:37 cbreak remember: git add adds changes
23:37 Whiskey it just tell me file not exist
23:38 cbreak no
23:38 cbreak you don't even have to tell it which files, git add -u will do it for every change
23:39 matoro joined #git
23:40 Whiskey i prefere to do it manually
23:40 Whiskey but i can also reset head manually after -u so okey:D
23:40 Whiskey thanks
23:42 nettoweb joined #git
23:42 Gustavo6046 joined #git
23:43 shgysk8zer0_ joined #git
23:44 Whiskey cbreak: the problem whit -u is that it can come in files that you not like to commit at the moment
23:45 cbreak you can combine it with names
23:45 Whiskey :)
23:49 jimi_ joined #git
23:51 xaviergmail_ joined #git
23:53 clickjack joined #git
23:55 ozmage joined #git
23:56 dwts joined #git
23:56 venmx joined #git
23:58 nettoweb1 joined #git
23:58 kyan joined #git

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