Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-14

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

All times shown according to UTC.

Time Nick Message
00:00 prg3 joined #git
00:00 joshszep joined #git
00:08 mehola joined #git
00:08 boombatower joined #git
00:08 isysd joined #git
00:09 fmcgeough joined #git
00:10 dsdeiz joined #git
00:10 dsdeiz joined #git
00:14 arnaud__ joined #git
00:15 huracans joined #git
00:15 Sasazuka joined #git
00:17 harrymoreno joined #git
00:17 VladGh joined #git
00:22 msonntag joined #git
00:29 venmx joined #git
00:32 z3t0 joined #git
00:34 ayjay_t joined #git
00:37 sssilver joined #git
00:37 nunchuck joined #git
00:37 Vangelis joined #git
00:39 nwkj86 joined #git
00:40 CtrlC joined #git
00:41 visionquest left #git
00:42 cqi joined #git
00:45 Cork joined #git
00:46 JamesBaxter joined #git
00:52 madewokherd joined #git
00:54 nwkj86 joined #git
00:55 Mikaela joined #git
00:55 Vaelatern Hello, I'm trying to do a git_remote_fetch for my repository. The code runs without errors, all assertions for return values pass, the code is being executed, but .git/refs/remotes/upstream/master doesn't change to reference the upstream commit. I'm guessing that the code should not end with the git_remote_fetch(), but I'm not sure what to do next
00:56 Jellyg00se joined #git
00:56 Samual joined #git
00:57 `Lobster joined #git
00:58 deadimmortal joined #git
00:58 `Lobster left #git
00:58 Vaelatern Oh, maybe it only writes FETCH_HEAD?
00:59 Salander27 joined #git
00:59 rivarun joined #git
00:59 deadimmortal left #git
01:00 Vaelatern Yeah, that's what it's doing. I looked through the libgit2 api but it's not easy to find a function to update the on-disk repo
01:00 robattila256 joined #git
01:01 d^sh joined #git
01:01 trondth joined #git
01:06 sssilver joined #git
01:07 thebope joined #git
01:08 nwkj86 joined #git
01:08 felher joined #git
01:08 fstd joined #git
01:10 jimi_ joined #git
01:14 byte512 joined #git
01:14 dreiss joined #git
01:14 dsdeiz joined #git
01:15 SwiftMatt joined #git
01:15 dodobrain joined #git
01:18 svm_invictvs joined #git
01:22 nidr0x joined #git
01:24 Oatmeal joined #git
01:27 mizu_no_oto joined #git
01:28 habbasi joined #git
01:29 thekingofbandit joined #git
01:30 dodobrain joined #git
01:33 Goplat joined #git
01:38 chachasmooth joined #git
01:39 qpdb joined #git
01:41 theskill_ joined #git
01:42 done joined #git
01:42 jokajak joined #git
01:42 snthsnth joined #git
01:44 Rickmasta joined #git
01:46 romerocesar_ joined #git
01:53 dsantiago joined #git
01:56 raspado joined #git
02:00 venmx joined #git
02:03 dikiaap joined #git
02:06 svm_invictvs joined #git
02:12 Siegfried joined #git
02:14 sssilver joined #git
02:16 dsdeiz joined #git
02:18 VladGh joined #git
02:19 raspado joined #git
02:20 anuxivm left #git
02:20 lindenle joined #git
02:23 leTali joined #git
02:23 finalbeta joined #git
02:28 sgtbigman joined #git
02:33 ArchNoob joined #git
02:36 d^sh joined #git
02:38 mischat joined #git
02:41 leftriver70 joined #git
02:46 rivarun joined #git
02:52 fahadash joined #git
02:55 Sleepy63 joined #git
02:59 pks joined #git
03:03 ArchNoob joined #git
03:05 aavrug joined #git
03:06 qws-user-1228 joined #git
03:06 snthsnth joined #git
03:08 thebope joined #git
03:12 bocaneri joined #git
03:12 Oatmeal joined #git
03:18 sunri5e joined #git
03:18 raspado joined #git
03:19 khfeng_ joined #git
03:20 Motoko joined #git
03:21 jaguarmagenta joined #git
03:22 Oatmeal joined #git
03:28 hexagoxel joined #git
03:29 done joined #git
03:30 venmx joined #git
03:31 pks joined #git
03:33 chachasmooth joined #git
03:39 mischat joined #git
03:39 Intee joined #git
03:40 Intee Hey is there someone that could help me work out why my gitignore file isn't working? :(
03:42 kadoban joined #git
03:42 thiago why do you think it's not working?
03:43 Intee hey thiago, the items in gitignore are still in my repo. I'm using git with github
03:43 Intee #github suggested I ask here.
03:43 thiago do you see the files in github's web page?
03:43 Intee I'm just about to delete both repos and start again see if I mixed something up somewhere.
03:43 Intee yeah, they are still there thiago https://github.com/Intergage/PowerProfile
03:43 Intee That is the repo I'm having issues with.
03:44 thiago that's the problem: those files are in the repo
03:44 thiago tracked files can't be ignored
03:44 thiago git rm the files
03:44 Intee thiago, I tried that as well. Well I think I did.. git rm -r --cached .
03:44 Intee I ran that, then added everything WITH the gitignore
03:45 thiago what file do you wish not to be there?
03:45 Intee I've got everything backed up so I'm just going to start again to make sure I didn't do anything stupid.
03:45 Intee Umm: Modules, Themes, Scripts\SysInternals
03:46 thiago ok, do that git rm, then commit
03:46 phanimahesh joined #git
03:46 Intee Done.
03:47 Andrew_K joined #git
03:47 Intee I got a lot of output: delete mode 100644 modules/<directory>
03:47 raijin joined #git
03:47 thiago ok, good
03:47 thiago that's done
03:49 drizbit joined #git
03:49 thiago the problem should be solved now
03:49 NeverDie joined #git
03:50 Siegfried joined #git
03:51 Intee thiago, nope. They are still in my repo.
03:51 Intee I missed something for sure. I have been playing for a bit today
03:51 Intee I have everything backed up so going to delete local and github repo and try again :P
03:52 thiago how do you know they're in the repo?
03:52 Intee https://github.com/Intergage/PowerProfile
03:52 Intee Am I just being completely dumb?
03:52 Intee .gitignore should just not push those files to my github right?
03:56 thiago did you git push after that commit?
03:57 Intee yeah I did and it didn't error.
03:57 thiago pastebin the output of git ls-tree HEAD
04:01 Intee thiago, it only has two files at the moment. Just created and it is pushing and pulling fine at the moment
04:02 Intee And I just added two files for now: https://bpaste.net/show/02c50c4e15ff
04:02 thiago ok, good
04:02 thiago where's the .gitignore?
04:03 Intee haven't created it yet.
04:03 theskill_ joined #git
04:03 govg joined #git
04:03 Intee I can just create a text file and name it '.gitignore' right?
04:03 Intee It doesn't need to be encoded with something specific?
04:05 thiago correct
04:06 Intee Ok so .gitignore is there.
04:06 Intee Just has one folder in it at the moment.
04:06 thiago ok
04:07 ISmithers How do I view changes between versions using Git?
04:07 thiago git show
04:08 blackwind_123 joined #git
04:09 ISmithers Is that how you do it thiago, comparing hunks like that?
04:09 andrew710 joined #git
04:09 thiago yes
04:09 ISmithers I was wondering about something prettier. Perhaps that means I should keep using Beyond Compare. I have it configured, but sometimes it is nice to see overall file changes that you can see who changed what, when and so forth.
04:10 ISmithers Sort of like git blame I think + git show + graphics. :)
04:10 theskil__ joined #git
04:10 ISmithers I should make a plugin like that, pretty blame or something.
04:12 Intee Hey sorry thiago now that .gitignore is there with the folder name, I should technically be able to 'git add .' and have git completely ignore that folder?
04:13 railssmith joined #git
04:15 Vortex34 joined #git
04:16 mikecmpbll joined #git
04:26 ISmithers Yup Intee
04:27 ISmithers Also consider this for some differences in the git add command options http://stackoverflow.com/questions/572549​/difference-between-git-add-a-and-git-add
04:29 dsantiago joined #git
04:34 jokajak joined #git
04:34 vtorri joined #git
04:34 Intee Thanks heaps ISmithers
04:34 vtorri hello
04:35 ISmithers Nps Intee
04:36 robotroll joined #git
04:36 vtorri i have written a program in github, but i want to change the design. I want to write the code (there will be different files) in a new branch
04:36 vtorri is it possible to replace master with this new branch ?
04:36 lindenle joined #git
04:37 b3kN joined #git
04:37 ISmithers vtorri: Yes. You branch your repository to say, 'new-features' and then start work on that branch. When ready, you can then merge that back to the master branch and continue as before with the new features. Is that what you want?
04:38 Atrumx joined #git
04:38 kadoban vtorri: You can also change what the default branch is in github, if that's what you want to do.
04:38 b3kN joined #git
04:39 b3kN joined #git
04:39 mischat joined #git
04:40 b3kNik joined #git
04:41 robattila256 joined #git
04:41 b3kNik joined #git
04:47 dreiss joined #git
04:47 vtorri ISmithers: yes
04:47 done joined #git
04:47 vtorri kadoban: how do I do that ?
04:48 kadoban vtorri: It's in the settings for the repo somewhere, I dunno, I always have to search it out.
04:49 a3Dman joined #git
04:51 vtorri kadoban: ok, i'll search, thank you
04:52 robattila256 joined #git
04:53 mischat joined #git
05:01 venmx joined #git
05:03 dsantiago joined #git
05:04 cyphase joined #git
05:05 inflames joined #git
05:05 daey joined #git
05:06 thebope joined #git
05:09 phanimahesh joined #git
05:21 a_thakur joined #git
05:21 sssilver joined #git
05:24 Cabanossi joined #git
05:28 subhojit777 joined #git
05:30 govg joined #git
05:31 lordjancso joined #git
05:33 cyphase joined #git
05:34 ldlework Hello. I recently was working on a branch and did an interactive rebase. But I apparently grabbed too many commits (one extra). Now this one commit got rewritten by the rebase to a new commit id.
05:35 ldlework Is there anyway I can get that original commit back onto the history without changing the rest of the commits I'm working on?
05:36 netj joined #git
05:37 phroa you can use "git revert --no-commit <thatsha>" to stage the inverse of that commit's changes, then use "git commit --amend --no-edit" to fold the changes which undo it in to the current commit as if it was never squashed.  in theory :)
05:37 phroa that's assuming your problem is you squashed/fixup'd one commit too many; interactive rebase can mean many things
05:38 dmc phroa, that's a shortcut?
05:38 dmc to this guy `git commit -a --fixup @; git rebase -i --autosq @^^`
05:39 Limes_ joined #git
05:40 lindenle joined #git
05:40 phroa nifty
05:40 thiago lindenle: no. Abort the rebase, go back to the un-rebased state and then try agian.
05:41 18WAARGZE joined #git
05:41 catsup joined #git
05:42 dmc phroa, if that `git commit --amend --no-edit` does the same thing, it's even better
05:43 phroa I... think it is.  the first time I read yours I thought it did something completely different than what I think it does now
05:44 Nitesh joined #git
05:44 dmc will TIAS when I get the chance :p
05:44 phroa man git-commit
05:44 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
05:47 nilg joined #git
05:51 holodoc joined #git
05:54 ayjay_t joined #git
05:54 mischat joined #git
05:54 sea-gull joined #git
05:57 satya4ever joined #git
05:57 raspado joined #git
05:58 skyres joined #git
06:03 steven_a_s joined #git
06:05 skyres joined #git
06:08 tyreld joined #git
06:11 skyres joined #git
06:13 jozwior joined #git
06:17 skyres joined #git
06:23 skyres joined #git
06:24 nd_ joined #git
06:27 nicksloan joined #git
06:29 snthsnth joined #git
06:29 skyres joined #git
06:31 A5101 joined #git
06:31 venmx joined #git
06:35 skyres joined #git
06:36 Junior joined #git
06:37 diogenese joined #git
06:37 InfoTest joined #git
06:41 overlord_tm joined #git
06:41 skyres joined #git
06:47 skyres joined #git
06:48 rendar joined #git
06:54 qt-x joined #git
06:55 mischat joined #git
06:57 ThomasLocke joined #git
06:57 ThomasLocke joined #git
06:59 Siegfried joined #git
07:00 vuoto joined #git
07:01 Raging_Hog joined #git
07:01 jokajak joined #git
07:01 LucaTM joined #git
07:01 venmx joined #git
07:06 freimatz joined #git
07:14 rscata joined #git
07:17 kurijlj joined #git
07:17 Anupkumar joined #git
07:19 jokajak joined #git
07:20 kurijlj joined #git
07:21 vuoto joined #git
07:23 Zeno` joined #git
07:23 Zeno` Hi. Is there a way for git to automatically fix whitespace errors?
07:24 preaction what's a whitespace error?
07:24 Zeno` like trailing whitespace or lack of a newline at the end of a c or c++ source file
07:25 grawity via custom (pre-)commit hooks, maybe
07:25 Zeno` hmm, that's might be an idea
07:25 grawity or filters (clean/smudge)
07:25 preaction you can use a pre-commit hook or something, but i generally just use CI to complain
07:25 Zeno` good idea, thanks
07:25 grawity the former can fix your working tree; the latter can only alter what's checked in to the repo
07:25 preaction the problem with hooks is that you need your devs to install them and set them up and maintain them and not disable them
07:25 Zeno` it's more about pull requests that I get
07:26 Zeno` I think I can write a hook though
07:26 preaction but none of the PRs you get will have that hook unless the person who sends the PR also has the hook
07:26 Zeno` preaction, yeah, but those with commit access will probably install them
07:26 grawity for pull requests, either complain during review, or make CI complain
07:26 mangolisk_ joined #git
07:26 preaction making CI automatically complain is the easiest solution here
07:26 Zeno` I do complain during review, but it's just monotonous for something that should be easy to fix at merge time :)
07:28 Zeno` Can travis CI be set up to complain?
07:28 Zeno` nvm, I'll read the docs
07:29 preaction travis can be set up to do anything, run anything. so make your hook, which is a shell script, and make travis run the same shell script
07:30 kurijlj joined #git
07:31 PCatinean joined #git
07:32 JeroenT joined #git
07:32 KevinDF joined #git
07:32 Zeno` yep
07:32 Zeno` writing script now
07:32 Zeno` thanks everyone
07:33 nidr0x joined #git
07:34 bmahe joined #git
07:36 skyres joined #git
07:37 vuoto joined #git
07:38 fees joined #git
07:39 languitar joined #git
07:39 tvw joined #git
07:40 adac joined #git
07:41 ashokrajar joined #git
07:42 Sceorem joined #git
07:43 skyres joined #git
07:43 zapb_ joined #git
07:43 arduinoToy joined #git
07:44 suy joined #git
07:45 jnavila joined #git
07:45 themill joined #git
07:46 overlord_tm joined #git
07:47 nilg joined #git
07:47 Stummi joined #git
07:47 RichiH joined #git
07:48 nopf joined #git
07:49 skyres joined #git
07:52 arduinoToy joined #git
07:54 arduinoToy joined #git
07:54 JeroenT_ joined #git
07:55 skyres joined #git
07:55 zeroed joined #git
07:55 zeroed joined #git
07:56 mischat joined #git
07:56 Alienpruts joined #git
07:58 barteks2x joined #git
08:01 skyres joined #git
08:02 venmx joined #git
08:03 netj_ joined #git
08:05 anonzadas joined #git
08:05 elect joined #git
08:06 PCatinean joined #git
08:07 skyres joined #git
08:09 danslo_ joined #git
08:10 richard1 joined #git
08:12 TomyWork joined #git
08:13 skyres joined #git
08:15 done joined #git
08:19 JeroenT joined #git
08:19 skyres joined #git
08:20 kurijlj joined #git
08:21 sea-gull joined #git
08:22 RichiH joined #git
08:24 anonzadas joined #git
08:24 Hobbyboy joined #git
08:24 bmahe joined #git
08:25 Wayne_Shephard joined #git
08:26 skyres joined #git
08:26 JeroenT joined #git
08:27 systemovich joined #git
08:29 RichiH joined #git
08:31 RichiH joined #git
08:32 hhee1 joined #git
08:32 skyres joined #git
08:33 m1m3-50 joined #git
08:35 tazle_ joined #git
08:35 Mikaela joined #git
08:36 Meteorhead joined #git
08:36 mehola joined #git
08:36 kedare joined #git
08:37 Koopz left #git
08:38 oskarkv joined #git
08:38 skyres joined #git
08:39 Guest63226 joined #git
08:40 aswen joined #git
08:41 kurijlj joined #git
08:42 JeroenT joined #git
08:43 venmx joined #git
08:44 skyres joined #git
08:46 chele joined #git
08:47 adac joined #git
08:48 solf1re joined #git
08:48 rominronin joined #git
08:48 RichiH left #git
08:50 a3Dman joined #git
08:51 skyres joined #git
08:55 subhojit777 joined #git
08:56 JeroenT joined #git
08:56 mikecmpbll joined #git
08:57 skyres joined #git
09:00 ferr joined #git
09:01 ahmedelgabri joined #git
09:02 cmn joined #git
09:03 skyres joined #git
09:06 ocbtec joined #git
09:06 halbomin joined #git
09:06 brk_ joined #git
09:07 JJjack joined #git
09:07 ayjay_t joined #git
09:07 bongjovi joined #git
09:08 cworth joined #git
09:08 marcogmonteiro joined #git
09:08 encod3 joined #git
09:09 selckin joined #git
09:09 anonzadas joined #git
09:09 JJjack how do reopen a commit and remove changes from it withour deleting the working tree changes
09:09 skyres joined #git
09:10 grawity the last commit? git reset HEAD^
09:10 grawity or just use `git commit --amend` to update it with new changes
09:11 zeroed joined #git
09:13 JJjack if I use git rm it removes the changes as well?
09:14 JJjack or just removes it from the commit?
09:14 NedNisW_ joined #git
09:15 _ADNWO_ joined #git
09:15 JJjack rm -cacged?
09:16 JJjack cached?
09:16 skyres joined #git
09:17 osse that removes a file
09:17 osse not changes
09:18 JJjack and git reset heads keeps the working files?
09:18 JJjack when not using -f
09:18 JJjack or --hard?
09:18 osse yes
09:18 JJjack ok
09:19 JJjack thanks
09:19 ArchNoob joined #git
09:22 peeps[lappy] joined #git
09:22 skyres joined #git
09:24 DieguezZ joined #git
09:28 anonzadas joined #git
09:28 redeemed joined #git
09:28 skyres joined #git
09:33 duckinja joined #git
09:35 skyres joined #git
09:35 ismithers joined #git
09:37 ldlework How can I rebase and amend a commit where like, the changes are put into the stage so that I can revert changes to one of the files in the commit?
09:38 anonzadas joined #git
09:38 osse that's not how it works. you can use checkout HEAD~1 or similar to grab content from the previous commit when you're editing it
09:38 cdown joined #git
09:39 ldlework I don't quite understand what you said
09:39 osse what part of it
09:39 osse never mind. what is it you're trying to accomplish ?
09:39 ldlework Can I rebase, amend a commit, while amending to a reset of 1 commit, just commit the changes I want, checking out the file I want to undo changes to, and the ncontinue the rebase?
09:40 osse yes
09:40 ldlework osse: 1, 2, 3, HEAD; 2 changes three files. The changes to one of the files was a mistake and needs to be discarded.
09:40 ldlework Neat
09:40 osse but when you edit  a commit with rebase the commit is already created and you're supposed to use commit --amend
09:41 osse so to undo you need to grab the previous version of the file with git checkout HEAD~ -- file
09:41 skyres joined #git
09:44 ldlework osse: it says after I've made my changes and I've staged the changes I want to keep
09:44 ldlework (use "git commit --amend" to amend the current commit)
09:44 ldlework (use "git rebase --continue" once you are satisfied with your changes)
09:44 ldlework what's the difference?
09:45 Akimb joined #git
09:46 osse apples and oranges
09:46 JJjack joined #git
09:46 osse one creates the new replacement commit. the other continues the reset of the rebase
09:46 ldlework I see
09:46 SwiftMatt joined #git
09:47 ldlework osse: I see, ammend puts the changes into the commit I reset to
09:47 ldlework ?
09:47 skyres joined #git
09:47 ldlework where as a non-amend commit will make a new commit (replacing the one I've reset FROM)?
09:48 ldlework yeah seems so
09:49 kurkale6ka joined #git
09:50 tobiasvl yes, amend always edits the "last" commit
09:50 tobiasvl ie. the current HEAD
09:53 Abc joined #git
09:53 skyres joined #git
09:55 Vangelis joined #git
09:55 ArchNoob joined #git
09:55 ExeciN joined #git
09:56 mischat joined #git
10:00 skyres joined #git
10:00 satya4ever joined #git
10:01 mehola joined #git
10:02 kedare joined #git
10:03 mischat_ joined #git
10:04 MafiaInc joined #git
10:06 skyres joined #git
10:10 lanking joined #git
10:11 Snugglebash joined #git
10:12 skyres joined #git
10:12 rnsanchez joined #git
10:13 tcorneli joined #git
10:17 MrMojito joined #git
10:19 skyres joined #git
10:20 nilg joined #git
10:22 roelmonnens joined #git
10:25 jbitdrop joined #git
10:25 skyres joined #git
10:25 rominronin joined #git
10:26 cdown joined #git
10:27 mablae joined #git
10:28 Xethron joined #git
10:30 Serpent7776 joined #git
10:31 skyres joined #git
10:32 anonzadas joined #git
10:33 earational joined #git
10:34 nettoweb joined #git
10:36 mehola joined #git
10:37 skyres joined #git
10:44 skyres joined #git
10:44 ddv joined #git
10:44 ddv how do I point a git submodule to another branch?
10:44 Andrew_K joined #git
10:45 leehambley joined #git
10:46 danslo_ joined #git
10:46 tobiasvl ddv: just go into the submodule directory, checkout the branch, then go up to the supermodule, add and commit
10:47 ddv tobiasvl: Thanks
10:50 skyres joined #git
10:51 adac joined #git
10:52 berndl joined #git
10:54 cyphase joined #git
10:56 danslo_ joined #git
10:56 skyres joined #git
10:57 done joined #git
11:03 skyres joined #git
11:03 Dazzyp joined #git
11:05 cagedwisdom joined #git
11:05 achadwick joined #git
11:09 cdown joined #git
11:09 skyres joined #git
11:10 Score_Under joined #git
11:11 Score_Under I can't for the life of me remember the name of the feature, and I can't find it on Google, but I'm still pretty sure I wasn't dreaming when I discovered it - isn't there a way to process a file such that it's stored in the git repo differently to how it's viewed when checked out?
11:11 irco joined #git
11:12 cyphase joined #git
11:12 tobiasvl Score_Under: not sure what you're aiming at, but perhaps the gist mentioned here has some ideas? !config
11:12 gitinfo Score_Under: [!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
11:12 grawity Score_Under: clean/smudge filters
11:12 tobiasvl oooh yeah that's probably it.
11:12 jast filters, see man gitattributes
11:12 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
11:12 tobiasvl !filters
11:12 gitinfo Filters can be very useful for automatically making changes to files at checkout(smudge) and checkin/add(clean). See 'man gitattributes' for more information
11:14 Score_Under I think clean/smudge is exactly it, thank you
11:15 skyres joined #git
11:17 CaptainQuirk joined #git
11:17 CaptainQuirk Hi guys
11:17 CaptainQuirk Quick question : I have a set of awful "wip" commits with so much stuff in it that I would like them to be split into meaningful ones
11:17 CaptainQuirk rebase is obviously the option here
11:17 grawity yes
11:18 CaptainQuirk does someone have a preferred workflow
11:18 CaptainQuirk it's not that technical about git itself
11:18 j416 CaptainQuirk: interactive rebase, or simply reset them away
11:18 CaptainQuirk yeah well, unfortunately, those are ancient and interlaced with commits I would like to keep
11:19 j416 CaptainQuirk: I also tend to end up with a handful of wip commits, then I just reset them all away and "add -p" changes into logical commits. Sometimes it takes a bit of wrestling to get just right.
11:19 CaptainQuirk j416, yes but in this case it's not possible
11:19 j416 why?
11:19 CaptainQuirk or I would have to reset commits I didn't make myself
11:19 CaptainQuirk or can you reset individual commits ?
11:19 j416 no
11:19 CaptainQuirk you reset to a certain commit in history, right ?
11:19 j416 you mean you have wip commits that others have based their work off of?
11:20 CaptainQuirk yes
11:20 j416 then you're screwed, unless you can convince those people that you're allowed to modify history before their commits
11:21 CaptainQuirk yes you're right actually ; this other branch was merged in our dev branch
11:21 govg joined #git
11:21 j416 don't let others work off of your wip commits without giving them the info that you will be changing those commits, so they are on their own if they do
11:21 CaptainQuirk well, sometimes you can't do it any other way
11:22 tobiasvl sure, but then you should consider your WIP commits not in progress anymore
11:22 j416 sure, then just let them know
11:22 j416 or that.
11:22 skyres joined #git
11:22 jast you can either brush up your WIP before sharing it, or let everyone participate in collectively fixing history each time you fix it up afterwards, or live with ugly WIP in your history
11:22 j416 try to make small commits, of course, but if it's tricky, and others are blocked, as a last resort just let them work off of the wips and make sure that you put everything in order later (all on a separate branch, of course)
11:22 CaptainQuirk I know what I should have done ;-)
11:23 j416 but, do avoid it if at all possible. It tends to create headaches when people are not used to git.
11:23 CaptainQuirk well here, the major issue is for me not for others
11:23 jast in the aftermath, with enough collaborators, consider it impossible to fix
11:23 j416 CaptainQuirk: how so?
11:23 CaptainQuirk well I have the right to change the history of the dev branch
11:23 CaptainQuirk others don't
11:24 j416 why do you have the right to?
11:24 CaptainQuirk because I'm admin on the project
11:24 CaptainQuirk others aren't
11:24 j416 even if you technically have the right to, it doesn't mean you have the right to, if you know what I mean
11:24 dodobrain joined #git
11:24 Rodya_ joined #git
11:25 CaptainQuirk yeah well in this case, given the amount of work done since this unfortunate choice of workflow (which is no work except mine)
11:25 j416 in our team, everyone has the rights to force-push to any branch, if they want. And we can do it, but we try to limit it to when it is absolutely necessary (such as fixing screwups)
11:25 CaptainQuirk and since no one created a new branch based on the dev branch
11:25 CaptainQuirk and no, not everyone can push force on the dev branch
11:25 CaptainQuirk in mine
11:26 j416 it's helpful to just work on a separate branch, when done, let that sit for a few hours before bringing it in to your shared branch, so as to reduce risk of last-minute blunders
11:26 quite It says in man git-diff-tree that the <path> this command takes is a prefix, not wildcard or regex. But when I'm trying it out now, it seems to be exactly a wildcard (git 2.10.2)
11:26 gitinfo the git-diff-tree manpage is available at http://jk.gs/git-diff-tree.html
11:27 anonzadas joined #git
11:28 mizu_no_oto joined #git
11:28 skyres joined #git
11:29 adac joined #git
11:31 tvw joined #git
11:32 jozwior_ joined #git
11:33 nilg joined #git
11:34 Zeno` left #git
11:34 skyres joined #git
11:36 leehambley joined #git
11:37 sshine left #git
11:40 jozwior__ joined #git
11:40 manuels joined #git
11:40 JeroenT joined #git
11:41 skyres joined #git
11:41 derk0pf joined #git
11:41 encod3 joined #git
11:42 lindenle joined #git
11:44 derk0pf hey i've $git rm file; git push branch name. the file still shows in the webpage is there a way to delete it on the webpage?
11:44 Mixologic_ joined #git
11:44 rominronin joined #git
11:44 benz00 joined #git
11:44 sobersabre_ joined #git
11:44 grawity you forgot to `git commit` in between
11:46 cyphase joined #git
11:47 skyres joined #git
11:49 davimore joined #git
11:49 King_Hual joined #git
11:49 re1 joined #git
11:50 ieee joined #git
11:53 skyres joined #git
11:58 sdothum joined #git
11:59 xaa__ joined #git
11:59 vuoto joined #git
12:00 skyres joined #git
12:03 venmx joined #git
12:05 vuoto joined #git
12:05 InfoTest joined #git
12:06 cyphase joined #git
12:06 skyres joined #git
12:07 mischat joined #git
12:08 greyline joined #git
12:08 greyline hi all
12:08 gitinfo greyline: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:09 greyline I got a few git repositories in zip formats from a company, but I'm not allowed to talk with them. Can I somehow get the tagging information from those repositories? I mean if it has versions or not
12:09 greyline and if yes, what are them
12:10 osse greyline: extract them and run git tag inside
12:11 Cyclohexane left #git
12:12 clmsy joined #git
12:12 Zamerick joined #git
12:12 greyline osse: it says it's not a git repository
12:12 greyline basically it just a folder inside the zip
12:12 skyres joined #git
12:13 dsdeiz joined #git
12:13 dsdeiz joined #git
12:13 osse in that case you don't have a few git repositories
12:13 Snugglebash joined #git
12:13 Darcidride joined #git
12:13 greyline osse: it was a git repository
12:13 danslo joined #git
12:13 osse there is no .git inside the zip?
12:14 greyline osse: no... just the zip file has a weird generated name and it has .gitignore inside that
12:14 done joined #git
12:14 osse then you can't get tag info
12:14 greyline okay
12:16 adac joined #git
12:19 skyres joined #git
12:19 FilipNortic_ joined #git
12:20 finalbeta joined #git
12:24 cyphase joined #git
12:25 skyres joined #git
12:26 b3kN joined #git
12:28 b3kN joined #git
12:28 Starky joined #git
12:28 askhat joined #git
12:29 askhat left #git
12:29 b3kN joined #git
12:31 irco joined #git
12:32 skyres joined #git
12:32 cbreak sounds like you only got a git archive, so there's nothing you can do apart from hoping it's in the archive filename
12:34 p4trix joined #git
12:35 cdown joined #git
12:37 Starky joined #git
12:38 JJjack joined #git
12:38 skyres joined #git
12:39 russoneto joined #git
12:41 khfeng_ joined #git
12:43 cqi joined #git
12:43 cdown joined #git
12:44 skyres joined #git
12:45 cqi joined #git
12:47 cqi joined #git
12:50 str joined #git
12:51 skyres joined #git
12:54 cyphase joined #git
12:54 Marbug left #git
12:55 johnmilton joined #git
12:56 JeroenT joined #git
12:56 alhariel joined #git
12:59 JeroenT joined #git
13:01 nilg` joined #git
13:02 Domhack joined #git
13:05 JeroenT joined #git
13:08 leeN joined #git
13:10 mischat joined #git
13:11 synthroid joined #git
13:11 jknetl joined #git
13:11 TLE joined #git
13:11 dodobrain joined #git
13:12 jknetl_ joined #git
13:14 JeroenT_ joined #git
13:15 grawity I think git archives have the commit ID embedded somewhere
13:17 _ikke_ Only if you passed a commit to git archive
13:17 _ikke_ git has a tool to extract it
13:17 cyphase joined #git
13:18 kadoban joined #git
13:20 pepijndevos joined #git
13:25 alex1a_ joined #git
13:27 mkoskar joined #git
13:27 vuoto joined #git
13:31 vuoto joined #git
13:32 vuoto joined #git
13:32 vuoto joined #git
13:36 porsche944 joined #git
13:38 KlausedSource joined #git
13:39 KlausedSource hey guys i setup a bare git repo and a working git repo as supposed here by the accepted answer: https://stackoverflow.com/questions/161609​41/remote-git-repository-in-document-root
13:40 KlausedSource i configured a post-receive git hook on the bare repo to pull changes into the new repo (from the bare)
13:40 KlausedSource this works so far so good...but the permissions are messed up
13:41 * moritz recommends building a proper deployment system: https://leanpub.com/deploy
13:42 kadoban I just use rsync for deploying simple sites. Works great.
13:42 canton7 !deploy
13:42 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
13:42 canton7 (plenty of good suggestions in that link)
13:43 ^7heo thanks canton7 I didn't remember that command ;)
13:43 ilyaigpetrov joined #git
13:43 canton7 ^7heo, !trigger
13:43 gitinfo ^7heo: [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
13:43 ^7heo canton7: oh great :D
13:45 vuoto joined #git
13:46 KlausedSource canton7, thx for the link i'm reading it at this time
13:46 d0nn1e joined #git
13:47 cyberz hello
13:48 cyberz I'm trying to rebase a past commit because with the aim of rewording it, but (surprisingly) when I continue the rebase I run in an "error: could not apply ..." error on a commit (not the one I'm rewording)
13:49 cyberz -because
13:49 cyberz now that might be?
13:50 danslo joined #git
13:51 berndl joined #git
13:51 ShapeShifter499 joined #git
13:51 fmcgeough joined #git
13:55 rnsanchez_ joined #git
13:55 grawity cyberz: have there been any merges in the meantime?
13:55 lss8 joined #git
13:55 Tykling left #git
13:55 cyberz grawity yes, I've merged master
13:55 cyberz the merge commit is there as well
13:56 intellix joined #git
13:57 blackwind_123 joined #git
13:57 nicksloan joined #git
13:57 JeroenT joined #git
14:00 JeroenT joined #git
14:02 jimi_ joined #git
14:04 ggVGc joined #git
14:04 nettoweb joined #git
14:05 Pulp joined #git
14:05 ggVGc I feel I need to make my git chops a bit more solid. Could someone recommend a good resource for getting better at understanding complex merges, rebasing etc.
14:06 marcogmonteiro joined #git
14:06 derk0pf joined #git
14:08 cdg joined #git
14:09 lindenle joined #git
14:10 cbreak learning by doing? :)
14:10 joki joined #git
14:10 ggVGc cbreak: yeah, but I feel I want a good reference
14:10 ggVGc I've been using git for many years
14:10 ggVGc but I feel like a very basic user
14:10 ggVGc and it's time to improve
14:10 tlaxkit joined #git
14:11 mischat joined #git
14:13 jeffreylevesque joined #git
14:13 vuoto joined #git
14:14 ShekharReddy joined #git
14:15 f3r70rr35f joined #git
14:17 ExoUNX joined #git
14:21 cek joined #git
14:21 ToBeFree joined #git
14:21 cek guys my git misbehaving. I'm doing git fetch remote branch , then git log remote/branch and it doesn't seem to show updated
14:22 grawity the 4-word fetch doesn't update the refs by default (in older versions), it only fetches to FETCH_HEAD
14:22 cek oh wait, remote is dead.
14:22 grawity use `git fetch remote` generally
14:23 cek left #git
14:24 osse ggVGc: !book
14:24 gitinfo ggVGc: 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
14:24 osse !bottomup
14:24 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/​pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
14:25 ggVGc osse: thanks
14:25 ggVGc always there when I need you
14:27 dviola joined #git
14:27 mischat joined #git
14:27 rorro joined #git
14:28 appledroid joined #git
14:29 mmlb joined #git
14:32 sangy joined #git
14:33 mmlb joined #git
14:40 MissionCritical joined #git
14:40 Learath2 joined #git
14:42 shinnya joined #git
14:44 Es0teric joined #git
14:45 Pulp joined #git
14:46 ngperfex joined #git
14:48 Rodya_ joined #git
14:50 jokajak joined #git
14:50 tinanoo joined #git
14:50 boombatower joined #git
14:50 Dougie187 joined #git
14:52 jstimm joined #git
14:53 e14 joined #git
14:54 PHPanos joined #git
14:54 Xethron joined #git
14:54 jokajak joined #git
14:55 anonymuse joined #git
14:56 CheckDavid joined #git
14:58 vrld joined #git
15:00 treehug88 joined #git
15:00 AaronMT joined #git
15:00 Xethron joined #git
15:02 eivarv joined #git
15:02 isysd joined #git
15:02 CaptainQuirk j416, almost finished my neverending rebase
15:03 ArchNoob joined #git
15:05 venmx joined #git
15:05 israelzuniga joined #git
15:05 aarobc joined #git
15:06 yehowyada joined #git
15:06 israelzuniga left #git
15:07 adymitruk joined #git
15:07 j416 CaptainQuirk: :)
15:09 JeroenT joined #git
15:09 Ryanar joined #git
15:10 a_thakur joined #git
15:11 Starkythefox joined #git
15:14 NimeshNeema joined #git
15:14 adymitruk joined #git
15:15 thebope joined #git
15:16 jstimm joined #git
15:17 Snugglebash joined #git
15:20 Ryanar joined #git
15:22 subhojit777 joined #git
15:23 JeroenT joined #git
15:24 govg joined #git
15:24 diegoaguilar joined #git
15:26 elsevero joined #git
15:28 kyan joined #git
15:28 diegoaguilar hello, I mistakenly made a commit which affected a gitsubmodule
15:28 diegoaguilar I checked in a symlink (had deleted the submodule folder)
15:28 diegoaguilar how can I undo such commit for the submodule only?
15:29 refried_ joined #git
15:31 derk0pf joined #git
15:33 arduinoToy joined #git
15:36 Nysar joined #git
15:36 troulouliou_div2 joined #git
15:37 lmatteis joined #git
15:38 str_ joined #git
15:38 raspado joined #git
15:39 jstimm joined #git
15:40 rivarun joined #git
15:41 al-damiri joined #git
15:42 satya4ever joined #git
15:44 finalbeta joined #git
15:44 nettoweb joined #git
15:45 dysoco joined #git
15:45 dysoco Hello. Is there any way to generate some HTML or something to print the git log to paper?
15:46 nettoweb joined #git
15:46 mischat joined #git
15:47 canton7 dysoco, I'm sure there is, but nothing built in
15:47 dysoco nah I'm sure there's nothing builtin but maybe someone knew of a tool
15:48 _ikke_ I guess a combinator with Latex?
15:49 qsx _ikke_: please don’t bring any fetishes to #git
15:51 fenris_kcf joined #git
15:51 fenris_kcf saluton. what can be the reason that a merge after a pull fails with the message "error: merge died of signal 11"?
15:52 b3kN joined #git
15:53 oncall-pokemon joined #git
15:57 javajoe joined #git
15:58 madewokherd joined #git
15:59 svm_invictvs joined #git
15:59 Meteorhead joined #git
15:59 artisanIndia joined #git
16:00 artisanIndia I have a base directory and a sub directory I have different branch in base and sub diretcory
16:00 artisanIndia how to make sure that I am working on same branch on both base and sub directoyr
16:01 b3kN joined #git
16:02 anonymuse joined #git
16:03 roelmonn_ joined #git
16:05 b3kN left #git
16:05 b3kN joined #git
16:05 robotroll joined #git
16:06 Schrostfutz joined #git
16:10 ojdo joined #git
16:11 kyan joined #git
16:12 davidfetter_ge joined #git
16:13 _ikke_ How do you have two different branches?
16:13 rivarun joined #git
16:15 dreiss joined #git
16:16 howitdo joined #git
16:16 realz joined #git
16:16 los joined #git
16:17 los joined #git
16:18 Snugglebash joined #git
16:18 Schrostfutz _ikke_: What do you mean? How to create/switch between them?
16:18 _ikke_ Do you have two repositories?
16:19 Schrostfutz _ikke_: I use multiple remotes if thats what you mean
16:19 canton7 I think he's probably talking to artisanIndia?
16:21 _ikke_ I am
16:22 derk0pf joined #git
16:22 artisanIndia _ikke_: its the same repository
16:23 clemf joined #git
16:24 Schrostfutz Ah, I thought it was a general question
16:25 _ikke_ artisanIndia: Do you have submodules?
16:25 artisanIndia I have branches
16:25 _ikke_ A repository has only a single branch checked out at a specific moment
16:25 los joined #git
16:30 anonymuse joined #git
16:30 mischat_ joined #git
16:31 fahadash joined #git
16:32 mischat_ joined #git
16:32 tyreld joined #git
16:33 javajoe joined #git
16:35 tlaxkit joined #git
16:35 rominronin joined #git
16:36 javajoe How can I prevent a file modified in remote repository from being overwritten by push request from local repository
16:36 javajoe ?
16:36 virgil joined #git
16:36 jjhgwe joined #git
16:37 Schrostfutz Does someone here use meld?
16:37 osse javajoe: a pre-receive hook that checks the incoming history whether that file is changed or not
16:37 fenris_kcf Schrostfutz: i do
16:37 bremner javajoe: you don't push files, you push history. are you talking about some kind of deployment?
16:38 javajoe bremner: Yes
16:38 foist joined #git
16:38 einnjo joined #git
16:39 oaaao joined #git
16:40 bremner dunno much about that, see
16:40 bremner !deploy
16:40 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
16:40 Schrostfutz fenris_kcf: I havent used such tools before and I wonder how I would go about a change that I don't want in the final version. Using the arrows I can just use the changes, not discard them. Do I need to delete it manually if I don't want it?
16:40 Shentino joined #git
16:40 javajoe bremner: When I push from local repository to remote, I have to edit two files on server before the app can work properly. But when next I do another push from my local repository, it overwrites the changes I made with local copy despite not modifying the local copy
16:40 str joined #git
16:41 bremner see also !config
16:41 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
16:41 fenris_kcf Schrostfutz: if you don't use the changes, that the files simply won't be modified at the specific position
16:41 svm_invictvs joined #git
16:41 fenris_kcf *then the files
16:42 bremner javajoe: short answer, don't track those files in git
16:42 ayjay_t joined #git
16:43 clemf joined #git
16:43 tjbp joined #git
16:43 javajoe bremner: If I do that, it deletes the file on the remote repository when I do a push
16:45 Schrostfutz fenris_kcf: In my use-case the remote deleted a block, but I can only push it from the middle to the remote, not use the deletion. Is there an easier way then to delete it manually in the middle?
16:45 bremner javajoe: if you read the config file snippet, the approved method is to track a template file and copy / edit to your live config
16:46 inflames joined #git
16:46 Meteorhead I was reading a bit and would like to see if I understood correctly; Git stores commits in the forms of snapshots and those snapshots are trees of the project's structures where each file is stored as a blob ( binary object ?)
16:46 Meteorhead is that correct?
16:46 ToxicFrog Meteorhead: yes.
16:46 Electrometro joined #git
16:46 alex1a joined #git
16:46 rivarun joined #git
16:46 Meteorhead ToxicFrog: thanks a lot! :)
16:48 fenris_kcf hmm, Schrostfutz, good question, idk.
16:48 Electrom_ joined #git
16:48 mischat joined #git
16:48 synthroid joined #git
16:48 Schrostfutz fenris_kcf: Okay, thank you, at least I know now that I didn't miss anything obvious :)
16:49 israelzuniga joined #git
16:49 Pursuit joined #git
16:50 Schrostfutz In my merge I now fixed all the conflicts, but in the process I lost some functionality. Should I meak a commit and amend to it later when I readded it or should I keep the conflict-resolution in the staging area and only commit once I'm finished? Whats the best practice here?
16:51 nilg` joined #git
16:51 Snugglebash joined #git
16:51 afuentes joined #git
16:52 Snugglebash joined #git
16:52 emg joined #git
16:53 durham joined #git
16:54 batrick joined #git
16:54 g105b joined #git
16:55 e14 joined #git
16:56 InfoTest joined #git
16:56 derk0pf joined #git
16:56 jstimm joined #git
16:57 mehola joined #git
16:57 dodobrain joined #git
16:58 e14 joined #git
16:58 Guest91057 joined #git
16:58 meauses joined #git
17:01 javajoe is it possible to remove updates pertaining to a particular file before the pushed changes actually update
17:01 javajoe ?
17:01 mischat_ joined #git
17:02 davis once I saw someone use the cmdline to commit files in a filesystem where it had a prompt for each entry. Did he wrap in a script or was he using syntax as part of git?
17:02 berndl javajoe: use hooks
17:02 osse davis: add -p   maybe
17:03 osse davis: but that's adding, not committing
17:03 mischat__ joined #git
17:03 javajoe berndl: how do I do that with hooks?
17:03 davis osse: many thyanks
17:03 berndl osse: commit also has -p
17:03 davis ill try that
17:03 javajoe berndl: can it also been in post-receive hook?
17:03 exarch joined #git
17:03 osse ah true
17:04 berndl javajoe: it can be whereever you want to catch the change.
17:04 refried_ joined #git
17:06 solf1re joined #git
17:06 javajoe berndl: what command do I have to execute to do that?
17:07 WayToDoor joined #git
17:09 cagmz joined #git
17:09 ashokrajar joined #git
17:12 porsche944 joined #git
17:12 thiago joined #git
17:14 crayon joined #git
17:14 Topic for #git is now Welcome to #git, the place for git help and Blurnsball | 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.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-cherry-pick does not yield actual delicious cherries
17:15 arduinoToy joined #git
17:16 Vaelatern For doing a "fast forward", do I want git_branch_move() from libgit2?
17:16 Vaelatern Is moving a branch the same thing as renaming it, the same as changing the reference it points to?
17:17 Eugene That is an excellent question for which I would have to read the documentation and I'm not drunk at this hour
17:17 Eugene renaming a branch is just changing the name of the ref; that's probably not what you want
17:17 Vaelatern https://libgit2.github.com/libgit2/​#HEAD/group/branch/git_branch_move The documentation I'm trying
17:18 Eugene "changing the commit a ref points to" is what "update a branch" means, eg commit, fast-forward, merge, etc
17:18 KevinDF joined #git
17:18 Eugene That looks like its used for renaming, not updating a ref
17:19 Eugene So probably not right
17:19 KevinDF joined #git
17:20 Eugene But !tryit, I've not used the libgit2 C API directy so what do I know
17:20 gitinfo [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
17:21 Vaelatern Hm, having looked further for "references" I see this: https://libgit2.github.com/libgit2/#HEAD/​group/reference/git_reference_set_target
17:21 Vaelatern "Conditionally create a new reference with the same name as the given reference but a different OID target. The reference must be a direct reference, otherwise this will fail."
17:21 Vaelatern What might a direct reference be?
17:21 Vaelatern See, the branch moving having a double-pointer to reference suggests it does not use it as input. That and the variable name being "out"
17:22 ahmedelgabri joined #git
17:23 albel727 joined #git
17:24 Rodya_ joined #git
17:25 hahuang61 joined #git
17:25 madebymarkca joined #git
17:26 crayon joined #git
17:29 robotroll joined #git
17:30 eivarv joined #git
17:31 ashokrajar joined #git
17:31 Emperor_Earth joined #git
17:32 ashokraj_ joined #git
17:32 cebor_ joined #git
17:35 meauses joined #git
17:36 rominronin joined #git
17:36 lss8 joined #git
17:38 nilg` joined #git
17:39 Starkythefox joined #git
17:39 thebope joined #git
17:39 crayon joined #git
17:42 tribly joined #git
17:42 blackwind_123 joined #git
17:44 israelzuniga joined #git
17:45 mikecmpbll joined #git
17:45 djb-irc joined #git
17:45 rorro joined #git
17:46 stomplee joined #git
17:48 lindenle joined #git
17:49 Marbug joined #git
17:50 austin987 joined #git
17:52 sangy joined #git
17:52 snits joined #git
17:53 djb-irc joined #git
17:53 anonymuse joined #git
17:55 israelzuniga_ joined #git
17:56 jccn joined #git
17:56 thebope joined #git
17:59 sea-gull_ joined #git
18:04 nicksloan joined #git
18:04 ResidentBiscuit joined #git
18:04 ResidentBiscuit joined #git
18:06 isysd joined #git
18:07 Aboba joined #git
18:07 aax joined #git
18:09 Es0teric joined #git
18:09 Derperperd joined #git
18:11 nidr0x joined #git
18:12 djb-irc joined #git
18:15 xocket joined #git
18:16 ashokrajar joined #git
18:16 A5101 joined #git
18:17 tfrangio joined #git
18:18 jstimm joined #git
18:18 tfrangio joined #git
18:21 zacts joined #git
18:21 thebope joined #git
18:26 xock_stream joined #git
18:26 Rodya_ joined #git
18:26 anonymuse joined #git
18:28 cdown joined #git
18:28 todd_dsm joined #git
18:30 dhollinger joined #git
18:31 jstein_ joined #git
18:32 hariel joined #git
18:35 e14 joined #git
18:38 joshszep joined #git
18:40 Groscheri joined #git
18:40 N0tSure joined #git
18:40 railssmith joined #git
18:41 aard_ joined #git
18:41 meauses joined #git
18:43 m0viefreak joined #git
18:44 dhollinger joined #git
18:46 anonymuse joined #git
18:49 tcurdt joined #git
18:49 ochorocho__ joined #git
18:50 nicksloan joined #git
18:51 refried_ joined #git
18:52 dreiss joined #git
18:53 nicksloan joined #git
18:57 jeremyhall joined #git
18:57 cagedwisdom joined #git
18:57 Caelum my favorite git command of all time has to be: git push -fu origin HEAD
18:58 serialoverflow joined #git
19:01 Snugglebash joined #git
19:01 Rodya_ joined #git
19:02 thebope joined #git
19:02 hashpuppy joined #git
19:02 Vinnie_win joined #git
19:03 Rodya_ joined #git
19:06 rominronin joined #git
19:07 Zarthus Caelum: your collegues might disagree with you
19:07 SwiftMatt joined #git
19:08 crayon joined #git
19:08 t0by joined #git
19:11 crayon joined #git
19:12 Starkythefox joined #git
19:13 Sasazuka joined #git
19:14 chris2_ joined #git
19:15 GT4066 joined #git
19:15 Nysar joined #git
19:16 cdown joined #git
19:19 dsantiago joined #git
19:19 einnjo joined #git
19:22 lindenle joined #git
19:24 exxi joined #git
19:24 exxi can i have a diff between 2 branches ?
19:24 jstimm joined #git
19:24 Anja joined #git
19:25 adac joined #git
19:26 ToxicFrog exxi: yes; git diff <branch> <branch>
19:26 ToxicFrog cf 'git help diff'
19:26 xocket joined #git
19:26 _cyril_ exxi: Sure, just pass the 2 branch names to `git diff`
19:27 Jackneill_ joined #git
19:27 sssilver joined #git
19:30 shaggycat joined #git
19:31 donmichelangelo joined #git
19:31 donmichelangelo joined #git
19:32 ayjay_t joined #git
19:32 e14 joined #git
19:33 TylerEastman joined #git
19:35 exxi ToxicFrog, _cyril_ thanks
19:38 Vinnie_win_o joined #git
19:39 askhat joined #git
19:40 A5101 joined #git
19:42 alex1a joined #git
19:42 syq joined #git
19:43 djb-irc joined #git
19:45 mischat joined #git
19:45 meauses joined #git
19:46 rnsanchez_ joined #git
19:47 ianp_ joined #git
19:49 ianp_ left #git
19:49 ianp joined #git
19:49 jimi_ joined #git
19:49 ianp is there a script/easy way to merge all commits of a feature branch into a single commit?
19:50 ianp interactive rebasing is a bit more manual than I'd like
19:50 canton7 ianp, git merge --squash
19:50 kadoban ianp: merge with --squash probably
19:50 ianp but that's at the time I merge it back into another branch?
19:50 shinnya joined #git
19:51 ianp i.e.... git checkout master && git merge featurebranch --squash ?
19:51 ianp right
19:51 kadoban Yes
19:51 canton7 yep
19:51 ianp k, thanks
19:52 Eryn_1983_FL joined #git
19:52 Faylite joined #git
19:59 crayon joined #git
19:59 Electrometro joined #git
20:00 a3Dman joined #git
20:01 nicksloan joined #git
20:04 djb-irc joined #git
20:06 Rodya_ joined #git
20:07 jeffreylevesque joined #git
20:09 eivarv joined #git
20:11 Pyrogerg joined #git
20:14 cdown joined #git
20:22 kpease joined #git
20:24 guyz joined #git
20:24 Es0teric joined #git
20:25 kpease_ joined #git
20:26 xock_stream joined #git
20:26 done joined #git
20:26 elsevero joined #git
20:28 Doginal joined #git
20:34 btree joined #git
20:35 refried_ joined #git
20:37 LaptopBrain joined #git
20:37 btree left #git
20:38 whomp joined #git
20:38 rominronin joined #git
20:38 jokajak joined #git
20:39 gareth1 joined #git
20:39 nanonyme joined #git
20:40 leehambley joined #git
20:40 nanonyme Hey, does anyone here know the history over why .git directory has read-only files?
20:40 grawity why wouldn't it?
20:40 grawity since the objects are named after SHA-1 of their contents, it would be... unusual, for them to actually change.
20:41 nanonyme Well, you might want to delete them
20:41 grawity so a-w is something like a safeguard
20:41 grawity it doesn't stop you from deleting them, does it
20:41 grawity you still have +w on the directory itself
20:41 nanonyme Yes, it does. On *nix you have to uses force rm
20:41 nanonyme And in Windows you have to make them writable first
20:41 nanonyme It effectively makes deleting repos a lot more complicated
20:42 nanonyme I was wondering whether that's on purpose
20:42 canton7 hmm? I've never had a git repo where I didn't have +w
20:42 canton7 git deletes its own objects/packs all the time
20:42 nanonyme I'd expect it sets them writable before that at least on Windows
20:43 nanonyme Since you *cannot* delete a read-only file on Windows
20:43 nanonyme Even if you're the owner
20:43 gareth1 left #git
20:44 canton7 again, git has never messed about with the file permissions on a repo. never.
20:44 canton7 if you're seeing weird permission stuff, it's not git
20:44 grawity well
20:45 grawity it wouldn't be unusual if e.g. cygwin decided to map a-w to the Windows 'read only' attribute
20:45 grawity instead of NTFS ACLs like it should
20:46 shaggycat joined #git
20:49 vuoto joined #git
20:50 Starkythefox joined #git
20:50 nwkj86 joined #git
20:50 synbyte joined #git
20:51 morenoh149 joined #git
20:52 morenoh149 can anyone share a git workflow or documentation that discourages amending a commit if teammates have pulled the commit already
20:53 perlpilot changing history out from under people is rude unless you've notified them about it.
20:53 morenoh149 Im thinking https://git-scm.com/docs/git-rebas​e#_recovering_from_upstream_rebase
20:53 kadoban Seems fine
20:54 leehambley joined #git
20:54 mustmodify joined #git
20:54 mustmodify So I'm on master.
20:54 Es0teric joined #git
20:55 mustmodify Oh, nm. Failed to read.
20:55 jlebar joined #git
20:56 sea-gull_ joined #git
20:56 Gamecubic joined #git
20:59 TylerEastman joined #git
21:00 morenoh149 can git pull in an amended commit on a feature branch or would it complain that the branches are out of sync?
21:00 adac joined #git
21:00 HoierM joined #git
21:00 morenoh149 assuming someone rudely changed the history and I'd like to get that change
21:01 thebope joined #git
21:02 Random832 morenoh149: you can pull it but by default it'll try to merge it which they were probably hoping to avoid
21:02 nicksloan joined #git
21:03 cdg joined #git
21:04 javajoe joined #git
21:04 leehambley joined #git
21:05 b1tchcakes joined #git
21:05 javajoe What command can I use in post-receive hook to remove updates relating to a particular file before git updates the file
21:06 javajoe ?
21:06 treehug88 joined #git
21:07 kazantip joined #git
21:07 sssilver joined #git
21:08 kadoban javajoe: You should probably use 'update' hook instead. Also, you shouldn't be pushing to non-bare repos, so I'm not sure what you mean by "before git updates the file", since there's no actual file to update.
21:09 dsdeiz joined #git
21:09 dsdeiz joined #git
21:10 mischat joined #git
21:11 javajoe kadoban: I use git to deploy to my production server. The problem now is, when I make changes to a file on the server, git overwrites the changes when next I do a push to do updates, despite not modifying the file locally
21:11 aidalgol joined #git
21:12 kadoban Sounds like you have a couple of gross things interacting.
21:13 qqx javajoe: If you're using git to deploy, you shouldn't be modifying files that are tracked.
21:13 whomp joined #git
21:14 javajoe qqx: if I untrack the file locally, it deletes the remote copy
21:14 javajoe qqx: Is there a way to fix this right now?
21:15 kadoban !config would be good to look at
21:15 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
21:15 kadoban Once you decide how you want it set up, if untracking is the correct way, you can do that and then recover the file from history.
21:15 qqx javajoe: Without knowing more about how you're doing deployments I really can't say.
21:16 ayjay_t joined #git
21:17 ToBeCloud joined #git
21:19 WayToDoor joined #git
21:21 [cust] joined #git
21:22 t-richards joined #git
21:27 xocket joined #git
21:32 jeffreylevesque joined #git
21:32 Zamerick joined #git
21:33 tang^ joined #git
21:35 gargola joined #git
21:40 sword joined #git
21:41 vuoto joined #git
21:41 Lor_ joined #git
21:42 T-Sourcemaker joined #git
21:42 qws-user-1229 joined #git
21:42 T-Sourcemaker is it possible to migrate from svn to git without losing the commit history?
21:42 osse !svn2git
21:42 gitinfo For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763
21:43 nanonyme grawity, I guess this is MingW but anyway
21:44 T-Sourcemaker thank you
21:44 T-Sourcemaker what's wrong with git svn?
21:45 nanonyme canton7, also you're wrong. I do git clone foo, then rm -r repodir. It asks me whether I want to delete write-protected regular files
21:46 canton7 nanonyme, something's up with your filesystem, umask, or etc
21:46 Electrometro joined #git
21:46 nanonyme It's definitely *not* same as my umask so git is explicitly removing write and execute
21:46 canton7 or cygwin, if you're using it, is doing weird stuff
21:46 nanonyme No, that was Debian
21:46 canton7 again, git does not do that
21:46 osse T-Sourcemaker: nothing wrong with it. it just serves a different purpose
21:48 nanonyme canton7, you're wrong. Just reproduced on Fedora as well
21:48 Starkythefox joined #git
21:48 nanonyme canton7, TIAS, it will work like I said
21:48 canton7 nanonyme, I've literally been doing that for years
21:48 Noldorin joined #git
21:49 nanonyme canton7, which OS?
21:50 canton7 nanonyme, http://pastie.org/10962379
21:50 canton7 just TIASed on linux and windows both
21:51 nanonyme canton7, remove the -f
21:51 nanonyme Then reproduce what I said
21:52 nanonyme Force will remove these write-protected files
21:52 canton7 right, gotcha, my bad
21:52 jstimm joined #git
21:53 nanonyme IOW apparently someone somewhere wanted you not to be able to remove your git repo without passing force to removal
21:53 nanonyme I was wondering if anyone here knew the history
21:53 refried_ joined #git
21:58 dsdeiz joined #git
21:58 nanonyme On *nix it isn't *that* big a deal since calling file remove syscalls will just delete the file if you're the owner, read-only or not. On Windows it will actually block deletion
21:59 WaReZ joined #git
21:59 dsdeiz joined #git
21:59 nanonyme It's a bit of a PITA to manually remove read-only flag from every file before deletion
21:59 nanonyme (I think the rm -rf essentially does this on Windows)
22:00 mustmodify left #git
22:00 davis nanonyme: i imagine on windows you can write a powershell script, might be a solution to you
22:00 nanonyme Though as grawity said, this might be just a matter of some clueless person mapping read-only to the actual read-only flag instead of ACL's on Windows
22:01 snthsnth joined #git
22:01 davis got me. i feel for you. with drugs, counseling and shock therapy i recovered my windows days
22:02 cdown_ joined #git
22:02 nanonyme I'm still prone to just take the pain for now since I get paid to work with Windows but anyway
22:02 TylerEastman joined #git
22:02 osse money makes everything better
22:03 Es0teric joined #git
22:06 blackwind_123 joined #git
22:07 b1tchcak_ joined #git
22:08 anuxivm joined #git
22:08 skobes left #git
22:09 rominronin joined #git
22:09 ISmithers joined #git
22:10 _xor joined #git
22:10 _xor Hey guys, what's the recommended way to handle submodules these days?
22:10 sea-gull_ joined #git
22:11 _xor I know git-submodules is on the decline, right?  I know of git-subtree, and will look further into it later.  Anything else I should look into?
22:12 Hello71 !subproj
22:12 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
22:13 Hello71 not "on the decline" (whatever that means)
22:13 _xor On the decline was probably a poor way to phrase it, but the consensus feedback that I've gotten seems to be that if managing dependencies like this is a requirement, go for subtree over modules.
22:14 hackel joined #git
22:14 b1tchcakes joined #git
22:15 LBV_User joined #git
22:15 psuchan joined #git
22:16 b1tchcak_ joined #git
22:17 whomp joined #git
22:18 Starkythefox joined #git
22:20 blackwind_123 joined #git
22:20 mischat joined #git
22:21 mustmodify joined #git
22:21 mustmodify left #git
22:24 b1tchcakes joined #git
22:25 jimi_ joined #git
22:25 jimi_ joined #git
22:26 xock_stream joined #git
22:29 byte512 joined #git
22:29 whomp when i do a git merge master, i see that the commit hash is the same for the tip of master as it is for the equivalent commit in my newly merged branch. if i check out that commit, which history does it have, that of master, or that of my branch?
22:30 stnly joined #git
22:31 osse whomp: The histories are identical
22:31 osse In fact, there is only one.
22:31 kadoban whomp: It's apparently the same right now. Branches just point to particular commits (and move as you make more commits when they're checked out)
22:31 osse So the answer is both, or either one
22:32 whomp but my topic branch consists of commits from master up to where i first branched off and made some changes, those changes, then the commits from master when i merged. so the history is different from that of master
22:33 Hello71 actually, to be *really* pedantic, it's neither
22:33 anonymuse joined #git
22:33 Hello71 being "on" a branch means that git commit will change that ref
22:33 osse whomp: If the commit hashes are the same then that can't be true
22:34 whomp when i check out the commit, the history is that of master, and not of my branch
22:34 whomp osse, but i swear it is :) i even did str compare for all 40 chars
22:34 Hello71 what does that mean
22:34 whomp as in, the history doesn't include the earlier changes that i put onto my branch
22:34 whomp that are not in master
22:34 osse whomp: git log --decorate --oneline --graph  topic master
22:35 Hello71 !lol
22:35 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
22:36 rorro joined #git
22:37 atomicb0mb joined #git
22:39 Starkythefox joined #git
22:39 Sasazuka joined #git
22:39 qws-user-1228 joined #git
22:43 Project1989 joined #git
22:44 Rodya_ joined #git
22:46 byte512 joined #git
22:48 venmx joined #git
22:48 a3Dman joined #git
22:49 whomp joined #git
22:53 Dougie187 left #git
22:53 tm512 joined #git
22:54 elastix joined #git
22:54 rorro joined #git
22:54 Electrometro joined #git
22:55 rvolosatovs joined #git
22:56 go1111111 joined #git
22:57 arduinoToy joined #git
23:02 morenoh149 joined #git
23:05 BenderRodriguez joined #git
23:07 _xor joined #git
23:08 tubaman joined #git
23:10 _xor joined #git
23:10 Nysar joined #git
23:13 _xor joined #git
23:15 _xor joined #git
23:17 Jim- joined #git
23:19 Jim- quick submodule question -- let's say I make a submodule that tracks someone elses repository, and I want to make a local branch on my own repository with some temporary changes -- will those temporary changes properly be preserved by my remote?  forgive me for any ignorance on this question.
23:19 Hello71 what is "preserved by remote"
23:19 imMute Jim-: no, you need to push your changes somewhere - they are *not* stored in the parent repository.
23:19 imMute well, the parent's remote is a place you could push them, but such a thing is not automatic.
23:20 Jim- yea, just trying to see if I can preserve those temporary changes on my own repository rather than have to push it to the submodule's actual repository
23:21 imMute you can push them wherever, but that wherever needs to be in the .gitmodules file, otherwise others won't be able to fetch your changes automatically with  'git clone --recursive'
23:23 Jim- okay -- thank you for the clarification.
23:23 anonymuse joined #git
23:23 shashin joined #git
23:23 Jim- left #git
23:25 rvolosatovs joined #git
23:28 Starkythefox joined #git
23:28 sangy joined #git
23:30 Derperperd joined #git
23:33 lindenle joined #git
23:34 przemoc joined #git
23:34 dsdeiz joined #git
23:34 dsdeiz joined #git
23:35 SwiftMatt joined #git
23:38 raijin joined #git
23:40 diegoaguilar if I have commits A, B, C, D and I would like to make commits B and C be one (squash c into B)
23:40 rominronin joined #git
23:40 diegoaguilar how can I execute rebase?
23:41 phroa man git-rebase, find the "INTERACTIVE" section.  change 'pick' before C to 'squash' or 'fixup' depending on which you prefer
23:41 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
23:45 morenoh149 joined #git
23:47 whitby joined #git
23:49 anonymuse joined #git
23:51 nicksloan joined #git
23:51 elsevero joined #git
23:57 nettoweb joined #git
23:57 pks joined #git
23:57 pirate21994 joined #git
23:58 fmcgeough joined #git
23:58 pirate21994 joined #git

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