Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-19

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

All times shown according to UTC.

Time Nick Message
00:05 mycyber joined #git
00:05 tesuji_ joined #git
00:05 pijiu joined #git
00:09 mizu_no_oto joined #git
00:09 Electrometro joined #git
00:10 BSAlb joined #git
00:11 pmullin left #git
00:12 BackEndCoder joined #git
00:12 [ADN] left #git
00:13 _ADN_ joined #git
00:14 BSab joined #git
00:19 RedNifre_ joined #git
00:20 mizu_no_oto joined #git
00:22 diogenese joined #git
00:26 shinnya joined #git
00:26 kejoma joined #git
00:35 fenugrec joined #git
00:36 ezio left #git
00:36 fenugrec Hi - I'm having the opposite of a typical problem. I "git add" some binary files, and git recognizes them correctly (the initial commit says "/dev/null and file_1 : binary files differ")
00:37 NeverDie joined #git
00:37 fenugrec but if I modify file_1, the modification doesn't get picked up by git
00:38 atomicb0mb joined #git
00:38 kyan joined #git
00:40 e14 joined #git
00:40 fenugrec How can I get  "git diff" and "git status" to notice the modification, and let me commit the change ? I've done this before for PNG files, I don't know what I'm doing wrong now
00:41 mingrammer joined #git
00:42 lvns joined #git
00:45 fenugrec aaah it seems "git diff" doesn't compare file contents if the file size hasn't changed !
00:47 godzirra joined #git
00:47 dweelie joined #git
00:50 dweelie joined #git
00:52 Ravana joined #git
00:53 mingrammer joined #git
00:53 cqi joined #git
00:57 e14 joined #git
00:58 snthsnth joined #git
01:00 jaafar joined #git
01:01 dsdeiz_ joined #git
01:02 jaafar joined #git
01:03 Gsham joined #git
01:04 pks joined #git
01:07 Electrometro joined #git
01:07 dodobrain joined #git
01:08 clemf joined #git
01:09 GandalfTheWizard joined #git
01:09 Vampire0_ joined #git
01:09 drbean What? git diff doesn't compare file contents if the file size doesn't change?
01:10 drbean I changed a colon to a semicolon in a text file, and git diff" showed the change.
01:10 dsantiago joined #git
01:11 fenugrec drbean I assure you, I'm modifying a single byte in these files, and "git diff" claims there were no changes !
01:11 drbean They're binary files?
01:11 fenugrec yes
01:12 netj joined #git
01:12 drbean Nasty.
01:12 fenugrec I tried "*.bin binary",  "*.bin -diff", and "*.bin diff=bin" in .gitattributes
01:12 fenugrec tried both a) commit .gitattributes before the binary files, and b) commit .gitattributes + binary files in the same commit
01:13 fenugrec 6 permutations, same result. wtf is wrong
01:14 crayon joined #git
01:14 UserOO7 joined #git
01:14 crayon joined #git
01:15 Rodya_ joined #git
01:16 Pulp joined #git
01:17 ffabi joined #git
01:18 jeffreylevesque joined #git
01:20 [1]ringer1 joined #git
01:22 snowkidind joined #git
01:23 kejoma joined #git
01:23 romerocesar joined #git
01:24 fenugrec guess it was fixed since git-2.9 ...
01:25 dodobrain joined #git
01:28 fenugrec ah... nope
01:30 SwiftMatt joined #git
01:32 romerocesar joined #git
01:33 d^sh joined #git
01:35 Gsham joined #git
01:36 jeffreylevesque joined #git
01:37 thiago fenugrec: it should show "binary contents differ"
01:39 fenugrec thiago that's indeed what I expect, but no go. I even tried creating two files, same size but with 1 modified byte, and "git diff file_a.bin file_b.bin" (both untracked) reports no differences, whereas GNU diff ( "diff file_a file_b") notices the difference
01:39 evanwang joined #git
01:39 azerus joined #git
01:41 Atrumx joined #git
01:41 thiago ah, mistake found
01:41 thiago the problem is that (both untracked) part
01:46 fenugrec thiago fair enough - I was trying to isolate the problem - but like I said, I tried every combination I can think of (all as tracked files), and git diff never picked up the 1-byte difference !
01:46 e14 joined #git
01:46 ShapeShifter499 joined #git
01:46 Goplat joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and unnecessary bowdlerisms | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-fsck: think of the children
01:51 kyan joined #git
01:54 azerus joined #git
01:55 Raansu joined #git
01:56 harish joined #git
01:56 ShapeShifter499 joined #git
01:57 snthsnth joined #git
01:58 fstd_ joined #git
02:01 dsdeiz joined #git
02:01 dsdeiz joined #git
02:01 mcalavera joined #git
02:01 mns joined #git
02:04 Vampire0 joined #git
02:04 sagerdearia joined #git
02:05 Ranhir joined #git
02:05 snthsnth joined #git
02:06 fenugrec thiago so, what do you think ?
02:07 e14 joined #git
02:08 sagerdearia joined #git
02:09 ojacobson joined #git
02:11 sagerdearia joined #git
02:12 ojacobson_ joined #git
02:14 sagerdearia joined #git
02:14 ojacobson joined #git
02:15 thiago fenugrec: can't confirm
02:16 thiago I see "Binary files xxx and yyy differ"
02:16 fenugrec aarrrrg
02:17 nopea joined #git
02:18 HappyLoaf joined #git
02:19 nopea I created a couple of commits from a temp. dev server (website).  I did not pull them to the live server as I decided to delete the temp. (cloud) server.  Not I am trying to push to bitbucket some new changes, but it says I have to fetch first?  Will that over write everything in the project that I just worked on?
02:19 fenugrec thiago thanks for your time. I'll try this again after some sleep
02:19 mns joined #git
02:20 unbalanced joined #git
02:20 sagerdearia joined #git
02:20 Gsham joined #git
02:21 thiago nopea: not necessarily
02:22 thiago nopea: you can merge or you can drop the changes that are in the server
02:22 nopea thiago: I am worried that if I pull from bitbucket, all the changes I have been working on for a couple days will be gone
02:22 nopea thiago: do you know how I can do that.. I am not well versed in git yet :)
02:24 frekoya_ joined #git
02:24 thiago drop the changes in the server?
02:24 ffabi joined #git
02:25 drbean joined #git
02:25 nopea basically I am looking to push the last commit to bitbucket, but there are commits on it that are not of the server
02:26 nopea commits on bitbucket that are not on my server
02:26 ojdo joined #git
02:29 nopea thiago: git push -f seemed to work
02:31 ojacobson_ joined #git
02:31 ojacobson_ "git push -f seemed to work" man your collagues must _love_ you
02:32 fenugrec hahaha
02:32 nopea one man project...s o yeah 'they' do ;)
02:34 zivester joined #git
02:36 fenugrec thiago it was my fault, as expected - my fault for running a messy setup with a VM and modifying files from the outside
02:37 MattMaker joined #git
02:39 andlabs joined #git
02:41 MattMake_ joined #git
02:46 JanC_ joined #git
02:47 MattMaker joined #git
02:47 godzirra joined #git
02:48 MattMaker joined #git
02:49 mquin joined #git
02:50 cyphase joined #git
02:50 Vampire0_ joined #git
02:53 Pyrogerg joined #git
02:55 raijin joined #git
02:55 lagothri1 joined #git
02:55 e14 joined #git
02:57 hexagoxel joined #git
03:01 Raansu joined #git
03:01 chachasmooth joined #git
03:04 harish joined #git
03:04 aavrug joined #git
03:05 aavrug joined #git
03:06 justanotheruser joined #git
03:07 harish_ joined #git
03:07 safe joined #git
03:08 mingrammer joined #git
03:08 justrohu joined #git
03:08 star_prone joined #git
03:09 eizua joined #git
03:09 Andrew_K joined #git
03:09 Vampire0_ joined #git
03:11 chrisshattuck joined #git
03:11 cyan__ joined #git
03:13 arescorpio joined #git
03:17 chrisshattuck joined #git
03:17 chkm8 joined #git
03:22 tristanp joined #git
03:23 harish_ joined #git
03:23 ffabi joined #git
03:24 nuck joined #git
03:29 mycyber joined #git
03:29 mozzarella joined #git
03:34 robotroll joined #git
03:35 cqi joined #git
03:36 e14_ joined #git
03:37 astrofog joined #git
03:42 a_thakur joined #git
03:43 duderono_ joined #git
03:44 netj joined #git
03:46 BSAlb joined #git
03:49 ffabi joined #git
03:50 duderonomy joined #git
03:52 Doginal joined #git
03:54 raijin joined #git
03:54 alex1a joined #git
03:54 UserOO7_ joined #git
03:55 ShapeShifter499 joined #git
03:55 kyan joined #git
03:59 godzirra joined #git
04:02 mingrammer joined #git
04:03 BackEndCoder joined #git
04:07 tristanp joined #git
04:08 harish joined #git
04:08 snthsnth joined #git
04:11 z8z joined #git
04:12 rchavik joined #git
04:13 ayjay_t joined #git
04:16 sorressean joined #git
04:17 sorressean Is there a way given a file to see the last commit to it/revert changes to that specific file?
04:19 ShapeShifter499 joined #git
04:22 daey_ joined #git
04:28 Guest46692 joined #git
04:28 ap0c joined #git
04:28 lindenle joined #git
04:33 nilg joined #git
04:35 mingrammer joined #git
04:38 MattMaker joined #git
04:38 a3Dman joined #git
04:41 MattMaker joined #git
04:42 MattMaker joined #git
04:43 chrisshattuck joined #git
04:43 Gnut joined #git
04:45 netj joined #git
04:45 PioneerAxon joined #git
04:47 Bombe joined #git
04:47 MattMaker joined #git
04:49 chrisshattuck joined #git
04:51 romerocesar joined #git
04:52 chrisshattuck joined #git
04:54 lvns_ joined #git
04:54 justanotheruser joined #git
04:54 Cabanossi joined #git
04:57 MattMaker joined #git
05:01 ffabi joined #git
05:02 laumann joined #git
05:05 raijin joined #git
05:07 MattMaker joined #git
05:07 jceb joined #git
05:07 dec0n joined #git
05:08 subhojit777 joined #git
05:08 ffabi joined #git
05:09 overlord_tm joined #git
05:10 romerocesar joined #git
05:11 ShapeShifter499 joined #git
05:12 MattMaker joined #git
05:17 mycyber joined #git
05:18 stuh84 joined #git
05:21 Vampire0 joined #git
05:24 Akimb joined #git
05:26 MattMaker joined #git
05:28 mohabaks joined #git
05:29 xpk joined #git
05:29 xpk joined #git
05:31 GT4066 joined #git
05:33 apotry joined #git
05:34 GandalfTheWizar1 joined #git
05:36 phanimahesh joined #git
05:37 gfixler1 joined #git
05:38 dminuoso joined #git
05:38 Silenced joined #git
05:38 jknetl joined #git
05:39 Silenced joined #git
05:44 zeroed joined #git
05:44 chrisshattuck joined #git
05:44 SwiftMatt joined #git
05:46 Junior joined #git
05:47 cyphase joined #git
05:48 lmat joined #git
05:54 dminuoso joined #git
05:55 Raging_Hog joined #git
05:55 MattMaker joined #git
05:58 chrissha_ joined #git
05:59 Guest83809 joined #git
05:59 Motoko joined #git
05:59 qt-x joined #git
05:59 godzirra joined #git
06:02 ThomasLocke joined #git
06:04 cyphase joined #git
06:04 satya4ever joined #git
06:04 erguven joined #git
06:05 ShapeShifter499 joined #git
06:08 _ng joined #git
06:08 chele joined #git
06:09 lb1c joined #git
06:10 MattMaker joined #git
06:11 drbean_ joined #git
06:18 wget joined #git
06:19 JeroenT joined #git
06:20 cyphase joined #git
06:25 Repox joined #git
06:25 phanimahesh joined #git
06:26 roelmonnens joined #git
06:27 dminuoso joined #git
06:28 eshlox joined #git
06:30 lindenle joined #git
06:31 Limes left #git
06:31 Limes joined #git
06:32 eduardas_m joined #git
06:33 dreiss joined #git
06:34 MattMaker joined #git
06:36 cyphase joined #git
06:36 sharkz joined #git
06:37 sharkz left #git
06:37 Limes joined #git
06:38 star_prone joined #git
06:39 Sceorem joined #git
06:39 Limes left #git
06:39 lb1c did the gitignore behaviour change some time in the past? i have a tracked file in a folder, and this folder is in gitignore. now i thought, additional files in that folder should be recognized by git, since a thing in the folder is tracked already. no? or does that only apply to changes on tracked files in an ignored folder?
06:40 Limes joined #git
06:40 bluepixel joined #git
06:40 tobiasvl lb1c: the thing is that folders aren't tracked in git
06:41 tobiasvl so your ignoring the folder ignores every file in it – of course with the exception of the tracked file
06:43 pamplemousse joined #git
06:44 lb1c tobiasvl: i know about the folders thing, but since the default error was, "i added a path to gitignore and it didn't ignore because i added the folder(and its files) previously" i thought i might missed some thing
06:44 bluepixel joined #git
06:44 lb1c so ignoring a folder but keep track of selected files in it is perfectly fine and my monday morning is less trouble than i thought ^
06:46 whitby joined #git
06:47 jknetl joined #git
06:48 laumann joined #git
06:49 MattMaker joined #git
06:49 ap0c_ joined #git
06:52 lordjancso joined #git
06:52 Limes joined #git
06:54 MattMaker joined #git
06:58 dminuoso joined #git
07:00 cyphase joined #git
07:01 evanwang joined #git
07:01 mingrammer joined #git
07:02 niels__ joined #git
07:02 submitnine joined #git
07:03 _joes_ joined #git
07:04 niels__ joined #git
07:04 Timvde joined #git
07:07 bluepixel joined #git
07:08 bluepixel joined #git
07:10 ShekharReddy joined #git
07:10 overlord_tm joined #git
07:11 sweatsuit joined #git
07:12 TomyWork joined #git
07:15 JJjack joined #git
07:15 netj joined #git
07:17 danslo joined #git
07:18 JJjack im trying to recover a lost stash
07:19 Motoko A stash is a special commit, IIRC. See http://gitready.com/advanced/2009/01/17/restoring-lost-commits.html
07:21 BSab joined #git
07:22 quenode joined #git
07:23 Alienpruts joined #git
07:24 elect joined #git
07:24 tobiasvl yes, !revlog
07:24 tobiasvl !reflog
07:24 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
07:25 cyphase joined #git
07:27 jast are you sure there's a reflog that records lost stashes?
07:28 tobiasvl perhaps you have to delve into fsck
07:29 encod3 joined #git
07:29 Fuzzmz per http://www.databasically.com/2013/08/15/recover-a-dropped-stash-in-git/ , git fsck --no-reflog | grep 'dangling commit' | cut -d ' ' -f 3 should work
07:30 jast chances are you'll get a lot more than just stashes that way, but at least you'll get something in the first place :)
07:31 Fuzzmz true, you'd need to go through each sha and see if that's your stash
07:31 djb-irc joined #git
07:32 JJjack Im sure I stashed when switchinng branches can't see the files
07:33 Darcidride joined #git
07:33 dminuoso left #git
07:34 DonVitoCorleone joined #git
07:35 snthsnth joined #git
07:35 jast well, if 'git stash list' doesn't show your stash, either you didn't stash or you dropped the stash
07:36 dan2k3k4 joined #git
07:37 JJjack m terminal is still open with the command
07:38 JJjack I stashed it then checked out
07:40 cyphase joined #git
07:41 JJjack I have this but when I apply I get nothing
07:41 JJjack Saved working directory and index state WIP on callsms: b423ef4 call controller/model
07:41 JJjack HEAD is now at b423ef4 call controller/model
07:41 ap0c joined #git
07:41 BadSnappa joined #git
07:41 jceb joined #git
07:42 aidalgol joined #git
07:46 sevenfourk joined #git
07:49 Andrew_K joined #git
07:49 bocaneri joined #git
07:49 a3pq51 joined #git
07:49 JJjack ok stash apply worked
07:50 JJjack thanks
07:50 circ-user-3z9Io joined #git
07:51 Balliad joined #git
07:51 cconstantine joined #git
07:51 BSAlb joined #git
07:56 mingrammer joined #git
07:57 cdown joined #git
07:57 cyphase joined #git
07:58 rffleaie joined #git
07:59 gniourf joined #git
08:00 godzirra joined #git
08:01 apassi joined #git
08:03 apassi Hello. Is it possible to commit "hidden" commits, which are not send to remote in push ?
08:05 selckin !configs
08:05 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
08:06 jast use a separate branch for those commits, and never push it
08:06 ayjay_t joined #git
08:06 apassi Basically i need to delete bunch of files ( maven pom's ) from version control, but other needs them.
08:06 apassi i am working with feature branches, so separate brach is quite hard to work
08:06 selckin that requirement makes no sense what so ever
08:06 apassi why ?
08:06 apassi I think it is possible in mercurial
08:06 apassi hidden commit or something like that
08:07 apassi ah secret changeset
08:08 giraffe joined #git
08:09 courrier joined #git
08:19 ilbot3 joined #git
08:19 Topic for #git is now Welcome to #git, the place for git help and unnecessary bowdlerisms | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-fsck: think of the children
08:20 ap0c_ joined #git
08:23 ap0c joined #git
08:24 ghostlight joined #git
08:24 baxx joined #git
08:28 netj joined #git
08:28 a_thakur joined #git
08:31 navidr joined #git
08:32 lindenle joined #git
08:34 gniourf joined #git
08:34 roentgen joined #git
08:34 fedepad joined #git
08:34 albel727 joined #git
08:36 Quam joined #git
08:36 moei joined #git
08:37 dob1 joined #git
08:38 dob1 hi, changing the name of the directory where a repository is, it doesn't matter to git?
08:38 selckin git doesn't care
08:38 dob1 ok thanks
08:41 cdown joined #git
08:41 cbaylis left #git
08:41 BSaboia joined #git
08:43 jknetl joined #git
08:44 Seveas git is a heartless monster, it never cares.
08:45 canton7 it used to, if it had submodules
08:45 canton7 they fixed that though
08:46 canton7 well, *technically* git doesn't support moving or renaming the folder the repository is in
08:46 canton7 but in practice it works
08:46 chll_ joined #git
08:47 selckin only people that like pain use submodules anyway
08:47 cdesai joined #git
08:47 phanimahesh joined #git
08:48 jast it's really only painful when USFWTANI :}
08:49 canton7 google has no idea what USFWTANI means
08:51 MrWoohoo joined #git
08:56 jast that's because I just made it up
08:56 jast it's short for: Using Submodules For What They Are Not Intended
08:56 King_Hual joined #git
08:57 mingrammer joined #git
09:00 rffleaie I receive the 160013 error, Filesystem has no item /!svn/100 and my repo is downloaded without commit
09:03 Darcidride joined #git
09:07 canton7 rffleaie, more info needed: what did you try (paste your command), what did you expect to happen, and what actually happened (paste the full, untruncated error)
09:08 canton7 !repro
09:08 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
09:12 ferr joined #git
09:14 jungsubk joined #git
09:14 nullie Vomit bin?
09:14 achadwick joined #git
09:15 kingarmadillo joined #git
09:17 * canton7 looks at Eugene
09:17 canton7 bleh, the bot's quit
09:18 a3pq51 joined #git
09:18 konrados joined #git
09:19 konrados I think I found a bug in git - svn, like this: https://gist.github.com/konrados/eb4b447c752c068b5c66546927135d5a can you tell me what to do now?
09:19 konrados I forgot to say morning :)
09:22 mlittlej joined #git
09:22 rffleaie ok, I have this kind of structure https://xxx.xxx.xxx.xxx/repo_a/directory1/directory2/project1 I need to clone it on a new git repo. I am using this command:git svn clone --prefix=svn/ -s --no-metadata \
09:22 rffleaie --authors-file=$BASE_DIR/authors-transform-final.txt \
09:22 rffleaie http://svn.example.com/svn-repository/directory1/directory2/project local-repo . after this command local-repo directory is empty and I haven't my project . During the execution I have this warning Using higher level of URL: https://10.xx.xx.xx/repo/directoryA/DirectoryB/project1 => https://10.xx.xx.xx/
09:22 rffleaie W: Ignoring error from SVN, path probably does not exist: (160013): Filesystem has no item: File not found: revision 100, path '/directoryA/DirectoryB/project1'
09:23 synthmeat joined #git
09:24 _xor joined #git
09:28 gitinfo joined #git
09:28 JJjack left #git
09:29 irqq joined #git
09:30 ap0c joined #git
09:30 mlittlej joined #git
09:34 stamina joined #git
09:38 JeroenT joined #git
09:41 a_thakur_ joined #git
09:42 sleezd joined #git
09:43 idmistir joined #git
09:43 idmistir joined #git
09:45 ShekharReddy joined #git
09:45 a_thakur joined #git
09:47 Akimb joined #git
09:48 lb1c nullie: just vomit into the bin
09:49 sweatsuit joined #git
10:05 ilbot3 joined #git
10:05 Topic for #git is now Welcome to #git, the place for git help and unnecessary bowdlerisms | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-fsck: think of the children
10:15 mlittlej joined #git
10:20 mlittlej joined #git
10:21 jknetl joined #git
10:22 qws-user-1228 joined #git
10:22 geoid joined #git
10:24 dan2k3k4 joined #git
10:25 mingrammer joined #git
10:25 mingrammer joined #git
10:28 Silenced joined #git
10:29 Silenced joined #git
10:31 mohabaks joined #git
10:34 PioneerAxon joined #git
10:34 lindenle joined #git
10:34 Guest43851 joined #git
10:35 cebor joined #git
10:35 pijiu2 joined #git
10:36 alex1a joined #git
10:38 a_thakur_ joined #git
10:42 Silenced joined #git
10:42 Darcidride joined #git
10:42 ToBeCloud joined #git
10:43 dreamyspell joined #git
10:43 JeroenT joined #git
10:44 GandalfTheWizard joined #git
10:45 troyt joined #git
10:48 tlaxkit joined #git
10:50 cebor_ joined #git
10:53 Silenced joined #git
10:55 notebox joined #git
10:56 submitnine joined #git
10:56 Raging_Hog joined #git
10:58 rorro joined #git
11:01 eizua joined #git
11:03 PioneerAxon joined #git
11:06 mizu_no_oto joined #git
11:07 dimi1947 joined #git
11:09 Isl joined #git
11:12 tlaxkit joined #git
11:13 cdown joined #git
11:13 alex1a_ joined #git
11:17 Emperor_Earth joined #git
11:17 harish joined #git
11:18 yuhlw_ joined #git
11:21 kingarmadillo joined #git
11:22 deltab joined #git
11:23 swiftgeek joined #git
11:24 iaup joined #git
11:26 kyan joined #git
11:30 Wesgu joined #git
11:31 jceb joined #git
11:33 JSharpe joined #git
11:35 a_thakur joined #git
11:36 kingarmadillo joined #git
11:36 raijin joined #git
11:36 ash_workz joined #git
11:36 nuck joined #git
11:38 dsdeiz joined #git
11:38 dsdeiz joined #git
11:39 mehola joined #git
11:39 ShapeShifter499 joined #git
11:46 rnsanchez joined #git
11:47 DolphinDream joined #git
11:50 fenugrec joined #git
11:50 JeroenT joined #git
11:52 lindenle joined #git
11:55 tlaxkit joined #git
11:59 jeffreylevesque joined #git
12:01 Borkr joined #git
12:02 Noldorin joined #git
12:02 godzirra joined #git
12:06 tvl joined #git
12:06 DolphinDream joined #git
12:12 JeroenT joined #git
12:13 fuchstronaut joined #git
12:13 mycyber joined #git
12:14 cbreak rffleaie: the way git svn works is by checking out old commits
12:14 cbreak rffleaie: you can help it by giving it the revision at which to start importing
12:16 rffleaie I have tried with -r start:end but doesn't work
12:16 dviola joined #git
12:17 fenugrec left #git
12:17 a_thakur joined #git
12:17 Sceorem joined #git
12:18 dviola joined #git
12:18 cbreak svn checkout of the given revision works?
12:19 rffleaie yes, the co of the head works
12:19 cbreak rffleaie: not head, the -r start
12:20 rffleaie I am doing to try
12:20 barteks2x joined #git
12:21 sorressean left #git
12:22 vuoto joined #git
12:22 pwnawannab[NE] joined #git
12:23 jeffreylevesque joined #git
12:23 vuoto joined #git
12:25 vuoto joined #git
12:27 digidog joined #git
12:27 johnmilton joined #git
12:28 ExoUNX joined #git
12:28 lars361 joined #git
12:29 Cerise joined #git
12:29 Cerise joined #git
12:29 johnmilton joined #git
12:30 tinanoo joined #git
12:32 DevAntoine joined #git
12:32 DevAntoine hi
12:33 DevAntoine I've checked out a remote branch doing "git checkout -b foo". I had to do a pull to get its content. When pulling I had a merge commmit of foo inside foo. 1) Why do I have to pull the remote to get its content? 2) Why this merge?
12:34 moritz DevAntoine: you have a branch foo, the remote has a branch foo
12:34 fguillot joined #git
12:34 moritz DevAntoine: you join them together somehow. That's a merge.
12:35 moritz how else would you bring them together, except by merging?
12:35 GodGinrai joined #git
12:36 JeroenT joined #git
12:36 DevAntoine well, couldn't I checkout the remote directly instead of creating a new local branch then merging the remote in it?
12:37 rorro joined #git
12:38 andlabs joined #git
12:39 mischat joined #git
12:39 johnmilton joined #git
12:41 wogi joined #git
12:41 d0nn1e joined #git
12:43 swiftgeek joined #git
12:46 Hanumaan joined #git
12:47 SoleSoul joined #git
12:47 Hanumaan how to remove a file completely from all commits and free space .. some larger file has been kept into git and it is taking lot of time every time ..
12:48 osse !bfg
12:48 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
12:48 SoleSoul Hi. Can someone please help me with 'git p4'? I need to change the depot path but I can't find how to do it. Is this possible?
12:49 emg joined #git
12:51 zivester joined #git
12:52 fguillot joined #git
12:53 lindenle joined #git
12:54 vls-xy joined #git
12:56 jpic joined #git
12:57 rffleaie W: Do not be alarmed at the above message git-svn is just searching aggressively for old history.
13:00 cisco87 joined #git
13:02 saedelaere joined #git
13:02 mischat_ joined #git
13:03 mycyber joined #git
13:06 jceb joined #git
13:07 tofu00 joined #git
13:07 kaldoran joined #git
13:08 cdg joined #git
13:08 Silenced_v2 joined #git
13:08 Silenced_v2 joined #git
13:10 PioneerAxon joined #git
13:10 zeroed joined #git
13:11 pothepanda joined #git
13:13 satbyy joined #git
13:13 satbyy joined #git
13:16 cdown joined #git
13:18 PioneerAxon joined #git
13:19 Gsham joined #git
13:20 joki joined #git
13:21 CEnnis91 joined #git
13:22 mycyber joined #git
13:23 xdakdr joined #git
13:25 kaldoran joined #git
13:26 sangy joined #git
13:27 compeman joined #git
13:30 mchl_nix joined #git
13:30 finalbeta joined #git
13:30 godzirra joined #git
13:31 mchl_nix Hello, I have a question about organizing a repository.
13:31 mchl_nix Let's imagine I have a bunch of "programs" which can include "libraries".
13:32 mchl_nix I have a master branch, which will include all stable programs and libraries.
13:32 mchl_nix I'm uncertain what my develop branch should do and how I should organize development on the libraries and the programs.
13:33 mchl_nix One branch per program, one branch per library. Then merge them into develop to build from there?
13:33 mchl_nix I'm a newcomer to git and would love to hear what more experienced users would recommend.
13:34 Zamyatin joined #git
13:35 mquin joined #git
13:37 sangy joined #git
13:37 dunpeal joined #git
13:37 dunpeal Hi. Is there a way to suppress "remote:" messages on push?
13:38 RedNifre joined #git
13:38 dunpeal BitBucket sends me a useless 4-line "remote:" message about pull requests every single time I push.
13:38 sanketdg joined #git
13:39 sanketdg joined #git
13:40 sanketdg joined #git
13:40 mehola joined #git
13:41 sanketdg joined #git
13:42 rnsanchez_ joined #git
13:42 sanketdg joined #git
13:43 nedbat dunpeal: also, "counting objects", "compressing objects", etc. who cares?
13:43 compeman joined #git
13:44 selckin -q
13:44 markmarkmark !lol
13:44 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
13:44 sanketdg joined #git
13:46 alcohol question; i'm working on some old legacy project - i want to pull new changes in the current branch. however, one of the directories inside the project has been replaced with a shared network mount. what happens if i pull changes from upstream that modified files in said directory? will git try to apply them?
13:46 jast alcohol: I would expect it to
13:46 dunpeal nedbat, selckin: I suppose -q is the only client-side solution. thanks!
13:46 selckin dunpeal: 1>/dev/null 2>&1
13:47 jast that's worse
13:47 selckin dunpeal: the classics are classics for a reaosn
13:47 AaronMT joined #git
13:47 dunpeal selckin: yeah I'll go ahead and redirect my teletype printout to the recycle bin next to my desk :>
13:48 dunpeal also this can be shortened to &>/dev/null
13:48 selckin thats too new
13:49 dunpeal true, we shouldn't trust invented past 1974, it hasn't been tested well enough yet.
13:49 selckin your recycle bin hasn't been upgraded
13:50 dunpeal finally, I'm not the only one complaining about this BS message: https://bitbucket.org/site/master/issues/11409/revert-modify-create-pull-request-message
13:50 selckin can't believe you care that much
13:51 alcohol dunpeal: but the rationale behind is very weak. assuming output on stderr is actually an error is incredibly ignorant.
13:52 digidog joined #git
13:53 PCatinean joined #git
13:54 nedbat dunpeal: yeah, why not look at the status code?
13:54 anonymuse joined #git
13:54 alcohol i personally use those urls a lot, both for creating PR's or quickly opening existing PR's after submitting new changes
13:55 alcohol if your CI/CD pipeline breaks cause a process outputs on stderr, your CI/CD pipeline software is garbage, or configured in a bad way
13:55 concerti joined #git
13:56 ewet joined #git
13:56 RedNifre joined #git
13:58 a3Dman joined #git
13:58 kaldoran joined #git
13:59 jwest joined #git
13:59 guampa joined #git
14:00 phaleth joined #git
14:03 vart joined #git
14:03 lidow joined #git
14:05 cbreak DevAntoine: git checkout -b X doesn't make a local branch off of a remote branch
14:05 cbreak it makes one off of HEAD
14:05 Lipp joined #git
14:05 DevAntoine cbreak: thanks! Oh can I make a local branch off of a remote branch then?
14:05 cbreak DevAntoine: you should have done git checkout X (which automatically creates a local X from remotename/X if no local X exists)
14:06 cbreak or git checkout -b X -t origin/X if you want to be super explicit
14:06 DevAntoine oh, I just did bad with the -b option
14:06 cbreak you could also do git checkout origin/X, which checks out the commit origin/X points at
14:07 cbreak but it will move you to a detached HEAD, off from any branch
14:08 a3pq51 joined #git
14:09 DevAntoine oh, when doing remote/ it checks out a commit and not a branch
14:09 zacts joined #git
14:10 cbreak yes.
14:10 mycyber joined #git
14:11 dunpeal joined #git
14:13 chrisshattuck joined #git
14:14 vls-xy left #git
14:14 vls-xy joined #git
14:15 MadHatter42 joined #git
14:17 themayor joined #git
14:17 snowkidind joined #git
14:19 jaafar joined #git
14:21 depach joined #git
14:22 ShekharReddy joined #git
14:22 EY joined #git
14:23 guardian hello I'm facing the following situation: "master" branch appends 10 lines to file foo.txt in commit A, "topic" branch appends 1 line to file foo.txt in commit B. When merging "topic" into "master", git sees no conflict removes the lines from commit A in foo.txt and adds the line from commit B. I expected new lines from commit A and B to end up in "merged foo.txt". What do you think?
14:23 fuchstronaut joined #git
14:25 nedbat guardian: is this repo online somewhere that we can see?
14:25 guardian nope :(
14:26 PioneerAxon joined #git
14:26 rgrinberg joined #git
14:26 EY guardian, did you branch "topic" after commit A?
14:26 bket joined #git
14:27 guardian nope, before
14:27 cbreak guardian: a merge will give a merge conflict
14:27 cbreak the merged foo.txt will contain conflict markers if git can't figure out how to merge changes
14:27 guardian that's the point, there's no conflict markers
14:28 guardian lines from commit A are removed, the line from commit B is added
14:28 EY cbreak, that's what is supposed to happen, but he says that commit A changes are discarded in favour of commit B changes.
14:28 cbreak doesn't sound like git.
14:28 Timvde (disclaimer: not sure if this is a git question or actually a BitBucket question) I need to deploy a repository behind a very strict firewall where I can't initiate an SSH connection. I could use (and have used) https to pull the repository before, but it should really be accountless, such that other administrators are able to update the code too. Is there another way to do this?
14:29 EY cbreak, the only thing even remotely like this that I have encountered is when developers make additional changes to a merge commit. The additional changes are completely ignored.
14:29 guardian it's a topic branch that ran for 1 year (yeah there are reasons)
14:29 guardian as far as I can tell, master branch got merge once or twice into "topic" along the year
14:29 guardian and now it's time to merge topic back into master
14:29 EY guardian, ah. in this case, it's quite normal.
14:29 cbreak Timvde: use fix your firewall and use ssh
14:29 roentgen joined #git
14:30 Timvde cbreak: I'm sadly not in the position to do that
14:30 EY guardian, when you merge "master" into "develop", the changes from commit A would have been applied to foo.txt, then commit B undoes them.
14:30 _ikke_ When merging, git only looks at 3 commits
14:31 guardian EY: that's what I'm trying to figure out, whether commit A was in history when those merged happened
14:31 _ikke_ What happens in between doesn't matter
14:31 cbreak Timvde: make a new account with read only permissions and shared the password "FUCK THIS INSECURE FIREWALL"
14:32 EY guardian, try `git --log --graph` and see the order of the changes.
14:33 EY _ikke_, can you elaborate on the "only looks at 3 commits" please?
14:33 guardian is there a command that would ask for conflict resolution again?
14:33 weckl joined #git
14:33 cbreak guardian: git checkout -m file
14:34 dunpeal joined #git
14:34 cbreak guardian: also ask git merge-base for the merge base commit
14:37 lucianangelus joined #git
14:37 guardian cbreak: thank you, how do I use that merge base commit value then?
14:37 cbreak guardian: it's informational for you
14:37 cbreak git will use it automatically
14:37 cbreak it is the commit git will use to build its merge from
14:38 guardian ok
14:40 treehug88 joined #git
14:40 guardian I can't seem to find a way to get out of this, beside comparing files between two branches and double check after git merge finished
14:41 mycyber joined #git
14:42 chrisshattuck joined #git
14:44 ResidentBiscuit joined #git
14:45 emg joined #git
14:46 clmsy joined #git
14:46 subhojit777 joined #git
14:47 cbreak guardian: the merge git performed is correct
14:47 cbreak guardian: by merging master into the branch, you told git "the combination of this branch and master does not need that line"
14:47 cbreak guardian: so, after that, git obviously knows that that line is no longer a change it has to worry about for making the next merge
14:47 cbreak it is no longer a change between the new merge base and the master's tip
14:48 lindenle joined #git
14:51 Dong__ joined #git
14:51 mischat_ joined #git
14:51 michaelsharpe joined #git
14:52 mingrammer joined #git
14:52 cdesai joined #git
14:52 JeroenT joined #git
14:52 kaldoran joined #git
14:53 Dong__ guys, got a simple question, when e.g. I clone git from GitHub, if then I run "git remote show origin", it shows 5 remotes all as "tracked", but I haven't decided to track them yet except the origin/master, why are those others all marked as "tracked"?
14:54 clemf joined #git
14:54 Pyrogerg_ joined #git
14:54 finalbeta joined #git
14:54 mingrammer joined #git
14:55 JeroenT joined #git
14:55 perlpilot Dong__: you mean immediately after you "git clone", you get this?
14:56 Dong__ yes, immediately after clone
14:57 cbreak those are remote tracking branches
14:57 cbreak they mirror branches on the remote with force-semantic
14:57 cbreak they aren't local branches
14:57 zivester joined #git
14:57 HelloMoto joined #git
14:57 cbreak remote tracking branches for origin are in refs/remotes/origin/, local branches are in refs/heads
14:58 Dong__ yes, but I haven't decided to track them yet, why are those tracked?
14:58 Prisoner-2460_1 joined #git
14:58 thebope_ joined #git
14:59 rgrinberg joined #git
14:59 osse What you mean is you have no local branch yet that has any of these as upstream, right m
14:59 osse ?
14:59 Dong__ yes
15:00 Dong__ under refs/remotes/origin/ I only got a HEAD there
15:00 cbreak Dong__: they are there because they exist on the remote
15:00 thebope_ joined #git
15:00 cbreak Dong__: type: git branch -a
15:00 Dong__ it's ok to see them as remote, but I didn't track them?
15:01 fedepad joined #git
15:01 cbreak Dong__: who cares?
15:01 cbreak git will track them.
15:01 cbreak if you clone a repository, git will track that repository
15:02 cbreak (and unless you specify something else, that includes all branches)
15:02 oncall-pokemon joined #git
15:02 Dong__ http://pastebin.com/iJw7QWJf line 7 - 11, showing "tracked"
15:03 Dong__ I thought only "master" should be showing that
15:03 cbreak why?
15:03 dreiss joined #git
15:03 roelmonnens joined #git
15:04 Chelsea_Jurgens joined #git
15:04 cbreak Dong__: git tracks all branches unless you tell it otherwise.
15:04 Dong__ is there a switch to tell clone for this?
15:05 cbreak yes.
15:05 cbreak I recommend not using it...
15:05 fugiman joined #git
15:06 Dong__ no I was just trying to figure out how does git know it is tracking those, as there is no files under /refs/remotes/origin, so it figured out from packed-refs file?
15:08 linuxmint joined #git
15:08 cbreak refs don't have to exist in the filesystem, yes
15:09 finalbeta joined #git
15:09 fuchstronaut joined #git
15:09 tyreld joined #git
15:09 rbern joined #git
15:09 BSAlb joined #git
15:09 xelxebar joined #git
15:09 Dong__ so basically when I run that "git remote show origin", git just went to packed-refs, finding all the branches there and telling me it were "tracked", right?
15:10 Dong__ so can I just turn off one, to say don't track this thanks
15:10 lss8 joined #git
15:11 BSab joined #git
15:11 Dong__ found this, http://stackoverflow.com/questions/16842426/can-git-permanently-ignore-a-remote-branch
15:11 fmcgeough joined #git
15:12 osse seems like tracked can mean different thins
15:12 grift joined #git
15:12 cbreak Dong__: as I said: yes, it's possible, but it's stupid.
15:13 Electrometro joined #git
15:13 osse Dong__: master can track origin/master, and origin/master tracks the master branch at origin
15:13 osse or something
15:13 Gitzilla joined #git
15:13 pwnawannab[NE] joined #git
15:14 Dong__ reading from the SO answer/comments, it seems not possible
15:14 Dong__ to explicitly turn off one.
15:14 dunpeal alcohol, nedbat: no doubt, I think BitBucket messed up with this "feature" and looks like it's going to be removed.
15:15 cbreak Dong__: sure is. Define an appropriate fetch ref spec
15:16 nedbat dunpeal: gitlab has the same feature. i think people are over-reacting, but what do i know?
15:17 selckin overreacting is what the internet was made for
15:17 lidow left #git
15:17 stomplee joined #git
15:18 dunpeal NO IT WASN'T!!!!!111oneoneone
15:18 osse eleven
15:18 _ikke_ /mode +b selckin
15:20 Dong__ cbreak: thanks
15:22 InfoTest joined #git
15:23 lindenle joined #git
15:28 Prisoner-2460_1 when i stash —include-untracked, why can’t i see those files when i show -p stash? is there any way to?
15:29 cdown joined #git
15:32 alfism joined #git
15:32 dendazen joined #git
15:33 ojacobson joined #git
15:33 SoleSoul left #git
15:34 m1m3-50 joined #git
15:36 GandalfTheWizard joined #git
15:36 guardian cbreak: yeah understood
15:36 guardian thanks for thelp cbreak, EY and _ikke_ -- appreciated
15:36 Electrometro joined #git
15:37 EY guardian, np.
15:38 isysd joined #git
15:40 thiago joined #git
15:41 Emperor_Earth joined #git
15:42 mykola joined #git
15:44 fahadash joined #git
15:45 jaafar joined #git
15:47 re1 joined #git
15:50 crised joined #git
15:50 kpease joined #git
15:51 crised When doing git add -p, there is a hunk that I don't want to stage, because I just moved the lines and left the file exactly the same. How can I reverse this and leave the file how it was before?
15:51 crised Or, just don't consider this file as changed
15:51 _ikke_ pick n?
15:51 sxlijin joined #git
15:52 crised _ikke_: but this will be added on the next commit?
15:52 _ikke_ Not if you don't stage it
15:52 osse crised: pick n then use checkout -p after
15:52 Pyrogerg joined #git
15:53 dunpeal Oh, fun
15:53 rominronin joined #git
15:53 dunpeal `git push -q` suppresses all output *except* the useless "remote:" messages.
15:54 crised osse: what does checkout -p means?
15:54 dunpeal This abuse of the remote message channel is outrageous. Now it's pull request spamming, next it will be targetted ads.
15:54 osse crised: try it and see.
15:54 crised checkout -p on the file that I answered 'no' to stage it?
15:54 osse crised: similar to add -p but you're asked for what to discard
15:55 mykola hi there! I'm trying to figure out how to properly detect if the fetch url is using an scp-like syntax. any pointers to git sources? or just a regex?
15:55 crised cool
15:55 madewokherd joined #git
15:55 Perspicaciosity joined #git
15:55 rorro joined #git
15:56 Salander27 joined #git
15:56 kpease joined #git
15:57 rahtgaz joined #git
15:58 sxlijin wondering if people know about this: the git icon on the windows installer seems to be broken
15:58 alex1a joined #git
15:58 lvns joined #git
16:00 kaldoran joined #git
16:01 vF3hNGxc47h8 joined #git
16:01 narendraj9 joined #git
16:02 NeverDie joined #git
16:03 canton7 sxlijin, search the github issues - I've seen it there a couple of times
16:03 canton7 https://github.com/git-for-windows/git/issues/872
16:03 sxlijin oh, that's where that repo is
16:03 canton7 (and related)
16:04 canton7 yeah, it's linked to from the 'git for windows' homepage
16:05 sxlijin i've always grabbed my installer from the git-scm page, forgot that git-for-windows was a thing
16:06 ansimation joined #git
16:06 jaafar joined #git
16:06 GodGinrai the git-scm installer uses git-for-windows
16:07 EY Git-for-Windows has an icon? I live in posh-git under Powershell.
16:08 GodGinrai cygwin-git here
16:08 GodGinrai I don't even use git-for-windows :P
16:08 hazelux joined #git
16:08 sxlijin well i have an arch vm
16:08 sxlijin but i'm a uni student ta'ing a class where we're forcing git on the students
16:08 sxlijin so all the git-for-windows
16:08 sxlijin oh hey
16:08 sxlijin pre-release installer is broken
16:09 sxlijin at least for me
16:09 chelly joined #git
16:09 GodGinrai sxlijin: honestly, git *should* be required in a class.  That way people get used to version control, and git in particular.
16:10 sxlijin part of the reason we're pushing it (:
16:11 jrun left #git
16:13 red82 joined #git
16:14 danslo joined #git
16:15 red82 hi there.  I made a branch of my master for some WIP.  since then master has had a ton of updates.  If I wanted my branch to reflect those changes, would it be correct to checkout master, checkout -b WIP_with_updated_master, then git merge WIP_from_old_master ?
16:16 red82 and then just keep working in WIP_with_updated_master ?
16:16 Noldorin_ joined #git
16:17 kulelu88 joined #git
16:18 GodGinrai red82: normally you'd just merge master into your branch that you are working on.  If you want to be safe about it, you would checkout -b from the WIP branch to get the "merge" branch, then merge master, then checkout WIP and merge the "merge" branch back in.
16:18 bket1 joined #git
16:18 m1m3-50 joined #git
16:18 GodGinrai after dealing with conflicts in the "merge" branch
16:19 niels__ joined #git
16:19 red82 that makes sense
16:20 Electrom_ joined #git
16:21 niels__ joined #git
16:21 laumann joined #git
16:21 bket1 joined #git
16:22 aard_ joined #git
16:23 CheckDavid joined #git
16:24 Prisoner-2460_1 joined #git
16:25 red82 thanks GodGinrai
16:26 red82 so in SourceTree (or some other visual git tool) would my WIP branch show the fork as happening from master_way_back_then or master
16:28 sxlijin you'd have one commit in the branch with master as a parent and another (from checkout way back when) with master_way_back_then as a parent
16:30 jaafar joined #git
16:32 blackwind_123 joined #git
16:33 blackwind_123 joined #git
16:35 kaldoran joined #git
16:35 EitherZeroOrOne joined #git
16:36 NeverDie_ joined #git
16:37 nd_ joined #git
16:37 durham joined #git
16:43 srcerer joined #git
16:43 lucz joined #git
16:44 NeverTired joined #git
16:44 m1m3-50 joined #git
16:46 mingrammer joined #git
16:49 Olipro Is it possible to fix whitespace in an initial commit?
16:50 tom[] joined #git
16:53 sxlijin doesn't look like it
16:53 Hanumaan what could be problem here unable to push only this repo I have other repos on the same server working: http://paste.ubuntu.com/23203604/
16:53 sxlijin wait no
16:53 sxlijin i take it back @olipro, you can amend initial commits
16:54 nitric joined #git
16:54 Olipro I know I can amend
16:54 Olipro but amend doesn't have --whitespace=fix
16:54 Sebastien joined #git
16:54 Sebastien left #git
16:54 roentgen joined #git
16:55 BSAlb joined #git
16:58 sxlijin make an initial commit, apply, then squash?
17:01 m1m3-50 joined #git
17:01 Shentino joined #git
17:02 m1m3-50 joined #git
17:02 xcesariox joined #git
17:03 LionsMane joined #git
17:03 robotroll joined #git
17:04 overlord_tm joined #git
17:05 jungsubk joined #git
17:05 fuchstronaut joined #git
17:05 alex1a joined #git
17:05 finalbeta1 joined #git
17:07 SteffanW joined #git
17:08 ShekharReddy joined #git
17:09 le_melomane joined #git
17:12 Shentino joined #git
17:12 Marbug_ joined #git
17:14 danslo joined #git
17:15 chrisshattuck joined #git
17:18 alex1a_ joined #git
17:19 thiago joined #git
17:23 crose joined #git
17:27 alcohol i always start my repos with an empty initial commit :x
17:27 GodGinrai dreghay: /join #jquery
17:27 alcohol but i totally didnt read up, so might not be relevant
17:27 GodGinrai whoops
17:29 Vampire0_ joined #git
17:30 buffal0 joined #git
17:31 ElChicoNube joined #git
17:31 jeffreylevesque how do i rewrite the three commits ago?
17:31 Gsham joined #git
17:31 jeffreylevesque it's not pushed
17:32 vuoto joined #git
17:34 _ikke_ git rebase -i HEAD~4
17:35 le_melomane joined #git
17:35 jeffreylevesque says i have unstaged changes
17:35 jeffreylevesque does that mean i have to push to upstream/origin first?
17:35 lvns joined #git
17:36 _ikke_ No
17:36 _ikke_ it means you have to either commit, stash, or undo those changes
17:38 irqq joined #git
17:38 lolmac joined #git
17:39 ahmedelgabri joined #git
17:42 kaldoran joined #git
17:43 Apteryx joined #git
17:43 mehola joined #git
17:45 dreiss joined #git
17:46 Sasazuka joined #git
17:47 Guest92264 joined #git
17:49 oberststen joined #git
17:51 ochorocho__ joined #git
17:51 raijin joined #git
17:52 buffal0 joined #git
17:54 Chill_Surf joined #git
17:54 rominronin joined #git
17:55 multi_io_ joined #git
18:00 jnewt_ joined #git
18:00 Darren__ joined #git
18:01 jnewt__ joined #git
18:01 jaafar joined #git
18:01 dsantiago joined #git
18:02 stamina joined #git
18:04 nephyrin joined #git
18:05 buffal0 joined #git
18:05 AnarchyAo joined #git
18:06 fuchstronaut joined #git
18:06 Jon28 joined #git
18:06 thebope_ When I'm fixing merge conflicts, if I fix all conflicts and then do a git add . it adds "deleted by them ../file/whatever/path.js" files back into the repo
18:07 thebope_ Is there a way to stage the deleted by them files for commit?
18:08 laumann joined #git
18:08 bsanford joined #git
18:09 DinoBoy joined #git
18:09 jnewt_ joined #git
18:10 snthsnth joined #git
18:11 DinoBoy joined #git
18:11 shgysk8zer0 joined #git
18:11 mycelium joined #git
18:13 re1 joined #git
18:13 jnewt__ joined #git
18:14 Repox joined #git
18:16 jnewt joined #git
18:17 finalbeta1 left #git
18:17 golu joined #git
18:21 florian_ joined #git
18:23 Balliad joined #git
18:26 Groscheri joined #git
18:28 crised joined #git
18:28 Sasazuka__ joined #git
18:29 hweaving joined #git
18:29 hweaving Why does "git shortlog -3" work?  I can't find any mention in the manual of options getting passed on to "git log".  Is "git shortlog" strictly a wrapper around "git log"?
18:30 hweaving Or is "-3" a revision range option
18:31 sostenuto joined #git
18:32 ahmedelgabri joined #git
18:32 hweaving "man gitrevisions" says that "@{-1}" is a valid revision range, but I can't see where "-1" would be.
18:32 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
18:33 elastix joined #git
18:33 re1 joined #git
18:33 jnewt joined #git
18:34 patarr joined #git
18:34 jnewt_ joined #git
18:35 mingrammer joined #git
18:36 satifant joined #git
18:36 raijin joined #git
18:36 clemf joined #git
18:37 sh1znc joined #git
18:39 sharkz_ joined #git
18:39 Darcidride joined #git
18:40 jnewt__ joined #git
18:41 kadoban joined #git
18:42 dhollinger joined #git
18:42 rivarun joined #git
18:43 Guest94 joined #git
18:44 SwiftMatt joined #git
18:45 Guest94 left #git
18:46 navidr joined #git
18:46 nilez joined #git
18:47 kaldoran joined #git
18:48 mischat joined #git
18:49 Gsham joined #git
18:50 jnewt_ joined #git
18:51 niels___ joined #git
18:53 MattMaker joined #git
18:54 mingrammer joined #git
18:54 rominronin joined #git
18:55 dodobrain joined #git
18:56 clemf joined #git
18:56 actinide joined #git
18:58 Seveas hweaving:        -<number>, -n <number>, --max-count=<number>
18:58 Seveas Limit the number of commits to output.
19:01 hweaving Seveas:  What page is that from?  That sounds like the man page for "git log" rather than "git shortlog"
19:01 jstimm joined #git
19:02 MattMaker joined #git
19:03 Joel joined #git
19:03 Joel quite possibly one of the dumbest questions, in a re-base, when I re-word a commit, how can I have it start with a #? like to say #AF-<ticketnumber> - How now brown cow? :\
19:03 Joel because # is comments when using vim as a text editor..
19:04 GodGinrai why do you want to make it start w/ a #?
19:04 eivarv joined #git
19:05 zezeon joined #git
19:06 Joel GodGinrai, because of various systems which parse git logs.
19:06 sartan to reference something like a github ticket in a committ note
19:06 sartan 'resolves #49 - world not helloing enough'
19:07 tgummerer Joel: you can set core.commentchar to something different than #
19:07 fuchstronaut joined #git
19:07 GodGinrai sartan: yea, but those don't *start* with #
19:07 Joel tgummerer, orly? interesting. thank you!
19:07 hazelux joined #git
19:07 sartan GodGinrai: eh, right
19:08 tgummerer if you just want it for you rebase you could do something like git -c core.commentchar=% rebase -i ...
19:08 Joel tgummerer, worked like a charme!
19:08 tgummerer (at least if your git is newer than 1.8)
19:08 tgummerer awesome
19:08 jaafar joined #git
19:10 DrSlony joined #git
19:10 garethdaine joined #git
19:10 DrSlony Hello, how do I view file foo.c the way it was before the last two commits?
19:10 newbie1 joined #git
19:10 Joel DrSlony, check it out from two commits ago
19:11 _ikke_ DrSlony: git show HEAD~2:<file>
19:11 DrSlony thank you
19:11 hweaving So I guess the conclusion is that "git shortlog" uses "git log" options syntax for something like "-3"?
19:12 _ikke_ hweaving: That looks to be the case
19:12 hweaving The source code in shortlog.c did not make it obvious, but I didn't trace the options function calls.  Thanks
19:12 nwkj86 joined #git
19:13 _ikke_ hweaving: to be more precise, they probably both use rev-list
19:13 nitric_ joined #git
19:13 wogi joined #git
19:13 wogi joined #git
19:13 hweaving _ikke_: I could understand if "-3" is a valid revision specification, but the "man gitrevisions" I mentioned only talks about @{-1} instead of -1 by itself.  I'm probably missing something.  :P
19:13 gitinfo _ikke_: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
19:14 _ikke_ No, it's not a revisions specification
19:15 _ikke_ -<n> is short for -n <n> in git log, but -n has a different meaning in shortlog
19:16 DrSlony left #git
19:16 hweaving _ikke_:  Yeah, I noticed that which confused me further
19:16 hweaving I found a magical undocumented feature :D
19:16 _ikke_ :-)
19:16 netj joined #git
19:17 shgysk8zer0 joined #git
19:18 EmeraldExplorer joined #git
19:18 _ikke_ hweaving: handle_revision_opt
19:19 _ikke_ https://github.com/gitster/git/blob/master/revision.c#L1655
19:19 georg joined #git
19:20 TSS_ joined #git
19:20 hweaving _ikke_: cheers
19:22 Ravana joined #git
19:23 TinkerTyper joined #git
19:23 zezeon joined #git
19:23 godzirra joined #git
19:23 ramsub07 joined #git
19:23 danimal2 joined #git
19:24 EvilPeng1 joined #git
19:24 fuchstronaut joined #git
19:25 ibasaw joined #git
19:26 cagedwisdom joined #git
19:26 m0viefreak joined #git
19:27 ochorocho__ joined #git
19:28 incog joined #git
19:28 _ikke_ Might be good to update the documentation to make that more clear
19:29 ibasaw hi, i want to copy a pull request made by someone on a repository, how to do it ? The PR was made on master branch but need it on branch 0.18.
19:29 ramsub07 hello, how do i remove changes made in a particular commit alone ? I don't want to remove the commits made after that, but only revert the diff in that commit
19:30 jast man git-revert
19:30 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
19:30 _ikke_ ibasaw: easiest is to fetch the branch from the forked repository
19:30 _ikke_ ibasaw: If the PR is made on github, then you can also fetch the PR refs
19:30 _ikke_ And then rebase it on the proper branch
19:31 ibasaw this is on github, but don't know how to fetch the pr refs
19:32 johnmilton joined #git
19:33 raijin joined #git
19:34 hweaving left #git
19:35 apprentice joined #git
19:35 fees joined #git
19:35 ramsub07 jast: that removes only that particular diff ?
19:36 _ADN_ joined #git
19:36 _ikke_ !fetch_pr
19:37 _ikke_ !github_pull
19:37 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
19:39 m1m3-50 joined #git
19:39 TSS_ joined #git
19:40 ramsub07 is there any way to remove all the commits from a particular Pull Request ?
19:40 shgysk8zer0 joined #git
19:40 jungsubk joined #git
19:40 Balliad joined #git
19:41 MattMaker joined #git
19:41 mrBen2k2k2k_____ joined #git
19:42 inflames joined #git
19:44 mehola joined #git
19:44 ramsub07 in other words, is there a way to revert a PR remotely ?
19:45 tgunr joined #git
19:45 _rnsanchez_ joined #git
19:45 realz joined #git
19:45 _ikke_ Why do you need to do that?
19:46 cdown_ joined #git
19:46 ldlework joined #git
19:46 ldlework joined #git
19:49 Pyrogerg joined #git
19:50 sadf32f32 joined #git
19:51 clemf joined #git
19:52 Muzer joined #git
19:55 MattMaker joined #git
19:57 nilg joined #git
19:57 ASOLAr joined #git
19:58 MattMaker joined #git
19:59 cdg joined #git
20:01 Pyrogerg_ joined #git
20:02 EvilPeng1 joined #git
20:02 ramsub07 _ikke_: there was a PR made that i possibly suspect has caused a bug
20:02 ramsub07 i need to assert if it is a commit in that particular PR
20:02 ramsub07 if so, i'll revert that commit
20:02 ramsub07 but before that i need to close in on which PR caused
20:04 FroMaster joined #git
20:04 _ikke_ ramsub07: so the PR was already merged in?\
20:05 ramsub07 _ikke_: yep
20:06 ramsub07 and i'm a contributor and don't have access to revert that PR :(
20:06 zacts joined #git
20:06 autoboxer joined #git
20:06 RedNifre_ joined #git
20:07 _ikke_ ramsub07: locally you can do everything
20:07 _ikke_ Do you have an easy way to verify the bug?
20:08 ramsub07 _ikke_: only way is to remove all the commits in that PR
20:08 ramsub07 is there way to remove one commit till the other commit ?
20:09 cjbrambo joined #git
20:09 _ikke_ ramsub07: Do you know about git bisect?
20:09 nikivi joined #git
20:10 jungsubk joined #git
20:11 Perspicaciosity joined #git
20:11 BSab joined #git
20:13 mrBen2k2k2k_____ joined #git
20:16 andlabs joined #git
20:16 ejnahc joined #git
20:16 Ranhir joined #git
20:17 m1m3-50 joined #git
20:17 dsdeiz joined #git
20:17 dsdeiz joined #git
20:19 alex1a joined #git
20:21 chrisshattuck joined #git
20:22 grayjoc joined #git
20:24 mingrammer joined #git
20:25 tgunr joined #git
20:25 snthsnth joined #git
20:28 ramsub07 _ikke_: nope
20:29 ramsub07 sorry about the delay, there was some disconnectivity
20:29 cyan__ joined #git
20:32 anuxivm joined #git
20:33 deltab_ joined #git
20:34 Achylles joined #git
20:35 dunpeal joined #git
20:36 mablae joined #git
20:37 _ikke_ man git bisect
20:37 gitinfo the git-bisect manpage is available at http://jk.gs/git-bisect.html
20:38 GodGinrai joined #git
20:40 pamplemousse joined #git
20:41 ElChicoNube joined #git
20:43 d10n-work joined #git
20:43 fuchstronaut joined #git
20:44 _ikke_ it's a tool that helps finding which commit introduced a bug
20:52 boombatower joined #git
20:52 CussBot joined #git
20:56 cdown_ joined #git
20:56 madewokherd joined #git
20:57 MattMaker joined #git
20:58 BSaboia joined #git
20:59 chrisshattuck joined #git
21:00 psprint joined #git
21:02 ansimation joined #git
21:04 m1m3-50 joined #git
21:05 m1m3-50 joined #git
21:05 aidalgol joined #git
21:10 rorro joined #git
21:14 JamesBaxter joined #git
21:18 alex1a joined #git
21:18 jeffreylevesque joined #git
21:19 Gamecubic joined #git
21:19 mingrammer joined #git
21:20 rnsanchez_ joined #git
21:20 merkator joined #git
21:20 rgrinberg joined #git
21:23 ramsub07 joined #git
21:24 ochorocho__ joined #git
21:26 ayjay_t joined #git
21:26 romerocesar joined #git
21:27 HyP3r joined #git
21:27 shgysk8zer0 joined #git
21:27 HyP3r Hello everybody, I have a small git problem: I have cloned a github repository, checked out an old version tag (git checkout -f) and then changed something a bit and commited it
21:28 HyP3r Then I forked this project on github and want to push those changes into my own fork of this
21:28 HyP3r I don't know how
21:28 HyP3r I have changed the urls with git config -e inside the file
21:29 kadoban HyP3r: Well, first give it a name, likely as a branch. Then you can push it. By the way, you should instead use 'git remote' for messing with remotes. And I suspect you shouldn't usually be doing 'git checkout -f'.
21:29 HyP3r I always got "You are not currently on a branch." then I created a branch: "git branch websolarlog" and checked this out
21:29 HyP3r "git checkout websolarlog"
21:30 a3Dman joined #git
21:30 HyP3r But then I think I did something stupid:
21:30 HyP3r "git pull origin master" now git want to merge the master branch with my websolarlog branch
21:30 HyP3r I don't want that
21:31 HyP3r but "git status" says that there are tousands of files to commit :(
21:31 kadoban So abort the merge, if that's not what you want?
21:32 kadoban 'git merge --abort'
21:32 HyP3r Ah ok good didn't know this command
21:33 HyP3r now if I do "git push" on my websolarlog branch I get this error: "hint: Updates were rejected because a pushed branch tip is behind its remote"
21:34 HyP3r With git pull I get "There is no tracking information for the current branch."
21:35 chrisshattuck joined #git
21:36 snthsnth joined #git
21:37 Puffball joined #git
21:37 whitby joined #git
21:39 timothy joined #git
21:39 raijin joined #git
21:43 alex1a_ joined #git
21:44 kpease joined #git
21:45 mehola joined #git
21:46 reim joined #git
21:47 BSAlb joined #git
21:48 hosttor joined #git
21:49 sxlijin joined #git
21:49 [ADN] joined #git
21:49 dsdeiz_ joined #git
21:50 andlabs joined #git
21:51 du joined #git
21:51 acr4 joined #git
21:51 Werring joined #git
21:51 dustinm joined #git
21:51 timmu joined #git
21:51 JSharpe joined #git
21:51 comps joined #git
21:51 monoprotic joined #git
21:51 monoprotic joined #git
21:51 k6ekb joined #git
21:51 moestevens joined #git
21:51 Remram joined #git
21:51 aidalgol joined #git
21:51 cYmen joined #git
21:51 Mekkis joined #git
21:51 ToxicFrog joined #git
21:51 pioiytr_ joined #git
21:51 EY joined #git
21:51 jguillen joined #git
21:51 inflames joined #git
21:51 FroMaster joined #git
21:51 re1 joined #git
21:51 msonntag joined #git
21:51 sweatsuit joined #git
21:51 iob joined #git
21:51 jokajak joined #git
21:51 yac joined #git
21:51 Olipro joined #git
21:51 pwnawannab[NE] joined #git
21:51 Cerise joined #git
21:51 Cerise joined #git
21:51 rahtgaz joined #git
21:51 mlittlej joined #git
21:51 mozzarella joined #git
21:52 pothepanda joined #git
21:52 mycyber joined #git
21:52 lahwran joined #git
21:52 mquin joined #git
21:52 ohcibi joined #git
21:52 Sonderblade joined #git
21:52 ffabi joined #git
21:52 reim joined #git
21:52 justanotheruser joined #git
21:54 chelly joined #git
21:54 timwis joined #git
21:54 ahr3n joined #git
21:55 flupke joined #git
21:55 Vampire0 joined #git
21:56 evanc joined #git
21:56 CheckDavid joined #git
21:57 navidr joined #git
21:57 gitinfo joined #git
21:57 RedNifre joined #git
21:57 ToeSnacks joined #git
21:57 mehdi__ joined #git
21:57 Rikairchy joined #git
21:57 EmeraldExplorer joined #git
21:59 al-damiri joined #git
21:59 ffabi joined #git
22:00 e14 joined #git
22:03 nemesit|znc joined #git
22:04 Chinorro joined #git
22:04 kba joined #git
22:05 myhau joined #git
22:05 Pseudocrat joined #git
22:05 Pseudocrat joined #git
22:06 AlexanderS joined #git
22:06 ffabi joined #git
22:06 blackwind_123 joined #git
22:07 m1m3-50 joined #git
22:07 Puffball joined #git
22:08 mizu_no_oto joined #git
22:08 therealGent joined #git
22:08 godzirra joined #git
22:10 Wlosw3 joined #git
22:10 ghostlight joined #git
22:12 Hobbyboy joined #git
22:13 Arokh joined #git
22:13 mingrammer joined #git
22:15 madewokherd joined #git
22:16 blackwind_123 joined #git
22:18 mycyber joined #git
22:19 doppo joined #git
22:19 danslo_ joined #git
22:20 Puffball joined #git
22:20 cyphase joined #git
22:20 minibar joined #git
22:22 tgunr joined #git
22:24 newbie1 joined #git
22:25 dunpeal joined #git
22:29 ruby_ joined #git
22:30 Pursuit joined #git
22:32 jeffreylevesque anyone know how i can rewrite history of a specific commit hash
22:39 whitby joined #git
22:40 m1m3-50 joined #git
22:40 pamplemousse joined #git
22:40 ruby_ joined #git
22:41 cagedwisdom joined #git
22:43 raijin joined #git
22:46 mukmuk joined #git
22:46 nitric joined #git
22:46 sangy joined #git
22:47 myhau joined #git
22:49 Ravana joined #git
22:49 ShekharReddy joined #git
22:49 LBV_User joined #git
22:52 anonymuse joined #git
22:53 deepy joined #git
22:54 anuxivm joined #git
22:55 dunpeal joined #git
22:55 sagerdearia joined #git
22:57 rominronin joined #git
22:58 madknight jeffreylevesque, what are you trying to do?
22:58 Ravana joined #git
23:00 jeffreylevesque after rewriting history is it possible to remove commit history from github issue?
23:01 go1111111 joined #git
23:02 snthsnth joined #git
23:03 anuxivm joined #git
23:04 soreau left #git
23:06 mellernoia joined #git
23:06 UserOO7 joined #git
23:07 madknight jeffreylevesque, if you rewrote your local history and dropped or squashed or edited you commits then you need todo a force push onto the github issued branch to publish the changes
23:08 mingrammer joined #git
23:08 marc_v92 joined #git
23:08 MrWoohoo joined #git
23:08 mablae_ joined #git
23:09 jeffreylevesque is it possible to rewrite a branch's history to find out it doesn't rewrite history, such that feature is removed, because another branch forked off it (after if was merged into master), and merged into master
23:09 anuxivm joined #git
23:09 jeffreylevesque so, to be successful, it would mean to rewrite two branches?
23:10 jeffreylevesque branch-1 (with the desired removal) merged to master, then branch-2 forked off from master, and then merged into master again
23:11 chrisshattuck joined #git
23:12 fguillot joined #git
23:13 sagerdearia joined #git
23:14 mizu_no_oto joined #git
23:17 duderonomy joined #git
23:17 Lor_ joined #git
23:17 Vampire0 joined #git
23:18 dendazen joined #git
23:18 anuxivm joined #git
23:20 danslo_ joined #git
23:22 nedbat jeffreylevesque: why not just make the code the way you want, and push it? Why re-write history?
23:22 jeffreylevesque i know
23:23 madknight thats a common problem with rewriting public history, lookup with "git reflog" try to find a common base (hash) and start form there, replaying your commits onto the last known common hash
23:24 dunpeal joined #git
23:24 mizu_no_oto joined #git
23:31 e14_ joined #git
23:32 clemf_ joined #git
23:33 actinide joined #git
23:35 dsdeiz joined #git
23:35 dsdeiz joined #git
23:36 thiago joined #git
23:38 BackEndCoder joined #git
23:38 anuxivm joined #git
23:39 jeffreylevesque well i removed the commit from the branch
23:39 jeffreylevesque but they still exist on the network graph like not attached to a branch
23:39 jeffreylevesque commits that have no branch
23:40 dsdeiz joined #git
23:40 kejoma joined #git
23:42 jaequery joined #git
23:43 hfp_work joined #git
23:43 red82 joined #git
23:44 MarkusDBX joined #git
23:44 LBV_User joined #git
23:44 pamplemousse joined #git
23:44 fiete joined #git
23:44 e14 joined #git
23:44 anuxivm joined #git
23:45 d1b joined #git
23:45 Khisanth joined #git
23:45 grift joined #git
23:46 mehola joined #git
23:47 martixy joined #git
23:47 _flow_ joined #git
23:50 tang left #git
23:52 ghostlight joined #git
23:52 tang^ joined #git
23:53 sartan joined #git
23:54 nivag joined #git
23:54 nebg joined #git
23:54 martixy Hello. So I have a feature branch on standby, that has a commit that I need to work off of. The branch is linear, but when I check out that commit it SourceTree creates a graph where some of the commits from that branch are fully detached the the rest of the project. git log --graph didn't offer any further insights, but maybe there's some combo of arguments that will. Is there a way to just create
23:54 martixy a new branch from that commit without breaking the history like that?
23:54 Arguggi joined #git
23:54 tang^_ joined #git
23:55 chernjie joined #git
23:56 r4z3r joined #git
23:56 madknight jeffreylevesque, "git reflog expire --expire-unreachable=now --all && git gc --prune=now"
23:56 leonarth joined #git
23:56 sparetire joined #git
23:56 jeffreylevesque i'm not messing with history anymore, submitted a request to github
23:57 tang^ joined #git
23:57 madknight jeffreylevesque, just in case https://stackoverflow.com/questions/3765234/listing-and-deleting-git-commits-that-are-under-no-branch-dangling
23:58 jeffreylevesque but, I also want to remove it from the git issue
23:58 jeffreylevesque i think it may still appear in the issue
23:59 crised I pushed a commit to github, then reset the head on my local repo, now I want to commit and push again (forgetting about the comit in github)
23:59 crised On branch UIFixesYour branch and 'origin/UIFixes' have diverged,and have 1 and 1 different commit each, respectively.  (use "git pull" to merge the remote branch into yours)
23:59 crised but I get that message

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