Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-17

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

All times shown according to UTC.

Time Nick Message
00:02 mattfoo joined #git
00:03 IWishIKnew joined #git
00:06 |2701 joined #git
00:06 |2701 joined #git
00:07 fuchstronaut joined #git
00:08 BlessJah joined #git
00:09 rkazak joined #git
00:09 mischat joined #git
00:09 surfnturf_ left #git
00:10 texinwien_ joined #git
00:12 stantonk joined #git
00:15 drewo joined #git
00:17 Noldorin joined #git
00:22 clemf joined #git
00:25 John joined #git
00:26 John joined #git
00:26 waterCreature joined #git
00:27 R34PER joined #git
00:28 cr0mulent joined #git
00:28 Gsham joined #git
00:29 R34PER joined #git
00:30 tomog999 joined #git
00:31 arescorpio joined #git
00:32 R34PER_ joined #git
00:33 R34PER joined #git
00:37 andyhoang-work joined #git
00:39 cagmz joined #git
00:40 govg joined #git
00:42 wagle joined #git
00:42 waterCreature joined #git
00:43 fahadash joined #git
00:43 daynaskully joined #git
00:46 pampeho joined #git
00:46 maestrojed joined #git
00:51 citizen-stig joined #git
00:54 pampeho joined #git
00:55 bronson joined #git
00:58 jrm joined #git
00:58 Nikesh joined #git
00:59 AciD` having A <- B <-C (branch foo), and A <- D (master), how can I 'move' the commit from foo onto master (while still having uncommited files in foo)? so I get A <- B <- D <- C (master) and just A <- uncommited files on foo? (A is the oldest commit, C is the youngest)
01:02 milki AciD`: you cant do that with uncomitted files using the git cli
01:03 milki AciD`: if you can just commit your uncomitted files, then you can use git rebase
01:03 AciD` well, following thiago's advice yesterday, I commited those files to the 'foo' branch
01:03 AciD` I guess it's temporary
01:03 milki yes
01:03 AciD` but then...
01:03 AciD` :)
01:03 milki commits are lightweight
01:03 milki you dont lose anything by committing
01:03 AciD` yep
01:04 AciD` to sum up, I commited 2 commits....but a few days later just found out I mixed the branch I was on. Those 2 commits should have been done on the master branch
01:05 AciD` I read that cherry-picking as some nasty side effects on history, so I'm not sure about using it
01:05 AciD` depends of what the git gurus here think :)
01:06 ceaucari joined #git
01:06 milki theres no nasty side effects unless you have a goal that cant be fixed with rewriting history
01:06 govg joined #git
01:06 milki im sure some people have some tough requirements that dont allow them to rewrite history
01:06 milki either way, _you_ will need to rewrite history since you are inserting D before C
01:06 HenriettaSalt joined #git
01:07 milki you have 2 options
01:07 milki 1 - cherrypick B and C onto D in master. rebase D - B - C into the correct order. reset foo to A' with your committed uncommited changes
01:08 milki 2 - from master, rebase foo. rebase B - C - D into the correct order. reset foo to A' with your committed uncomitted changes
01:08 AciD` hum
01:09 pks joined #git
01:09 hahuang65 joined #git
01:09 AciD` any preferences?
01:09 fuchstronaut joined #git
01:09 ochorocho__ joined #git
01:09 milki the results are the same
01:10 milki and rebase is just a form of cherrypicking anyways
01:10 milki rebase is cleaner if you know how to use it
01:11 mischat joined #git
01:11 AciD` I'll try that
01:12 xall joined #git
01:14 AciD` milki -> when you say 'rebase foo', do you mean `rebase -i <shaOfTheLastCommit>`?
01:15 govg joined #git
01:18 kasisnu joined #git
01:18 Vauff joined #git
01:19 kasisnu_ joined #git
01:19 jimi_ joined #git
01:19 cece joined #git
01:20 liquidjamm joined #git
01:20 kasisnu__ joined #git
01:21 kasisn___ joined #git
01:22 tobyn joined #git
01:22 HenriettaSalt joined #git
01:22 kasis____ joined #git
01:23 kasisnu joined #git
01:25 Levitator joined #git
01:25 jagob joined #git
01:25 kasisnu_ joined #git
01:25 milki AciD`: yeah, if you want to change the order of commits
01:27 Aut0maton joined #git
01:27 AciD` ok, so having A <- B <- C <- E (branch foo) and A <- D (master), I'll have to `git checkout master && git rebase -i C`, then go from there? (or should I include E, to ditch it during the rebase)?
01:32 meloc_ joined #git
01:33 stantonk joined #git
01:37 jaguarmagenta joined #git
01:37 Limes_ joined #git
01:52 fmcgeough joined #git
01:53 raz left #git
01:54 ojdo joined #git
01:56 SpeakerToMeat joined #git
01:58 ajf- joined #git
02:02 dreiss joined #git
02:04 joki joined #git
02:06 cece joined #git
02:06 zivester joined #git
02:09 kellytk joined #git
02:10 fuchstronaut joined #git
02:10 kellytk Is it possible to configure git to not look for system or user .gitconfig files when building up the configuration state, and use only the repo's .gitconfig file?
02:10 sagerdearia joined #git
02:11 theskillwithin joined #git
02:13 harish joined #git
02:17 aizex joined #git
02:17 jaguarmagenta joined #git
02:18 thiago joined #git
02:19 gaen joined #git
02:22 dreiss joined #git
02:24 hexagoxel joined #git
02:24 dreiss_ joined #git
02:25 dreiss joined #git
02:25 netj joined #git
02:29 eletuchy joined #git
02:29 arooni joined #git
02:31 kasn joined #git
02:32 AfroThundr joined #git
02:34 sd512 joined #git
02:34 chachasmooth joined #git
02:34 nevodka joined #git
02:35 mwhooker joined #git
02:35 nnyk_ joined #git
02:39 jonmorehouse joined #git
02:39 Khisanth joined #git
02:40 inflames joined #git
02:45 |ifei5g00d joined #git
02:52 peepsalot joined #git
02:53 milki kellytk: --local?
02:55 kellytk left #git
02:55 Gsham joined #git
02:56 durham joined #git
02:57 zalatovo joined #git
02:58 durham joined #git
02:58 mwhooker joined #git
03:03 Kallis joined #git
03:03 mizu_no_oto joined #git
03:05 Buk joined #git
03:05 mehola joined #git
03:09 alex1a joined #git
03:11 st0opkid joined #git
03:11 ochorocho__ joined #git
03:15 EduardoMartins joined #git
03:18 jonmorehouse joined #git
03:19 Gsham joined #git
03:20 ruskie joined #git
03:21 MarkyC joined #git
03:22 MarkyC_ joined #git
03:23 fscala joined #git
03:24 govg joined #git
03:30 MarkyC joined #git
03:32 bgamari joined #git
03:38 bgamari joined #git
03:39 Goplat joined #git
03:40 d4rklit3 joined #git
03:40 eletuchy joined #git
03:41 alex1a joined #git
03:41 sto0pkid joined #git
03:44 talexb joined #git
03:44 talexb Bless me Father, it's been 18 months since my last visit.
03:45 talexb But seriously .. I lost a commit today and I'm trying to figure out how to get it back.
03:45 MattMaker joined #git
03:46 talexb I was working on the master branch, did a commit that fixed a bug, then did a hard reset to go back to an earlier version. I was using gitk to navigate through all of this.
03:46 talexb I hadn't refreshed gitk, so the new commit did appear. It was a busy day, and by the time I needed to get back, I had no way to select the new commit.
03:46 KevinMGranger joined #git
03:47 talexb So I'm currently at (n-1) on the master branch, but have no idea how to get to n.
03:47 talexb Suggestions?
03:48 ojacobson git reflog master; git reflog HEAD
03:48 ojacobson odds are, the offending commit will appear there, right after a line indicating your reset
03:50 HenriettaSalt joined #git
03:54 a_thakur joined #git
03:57 Raging_Hog joined #git
03:57 talexb ojacobson, Owen? Thanks a bunch, I think I owe you another beer. Sigh.
03:57 ojacobson That's my name. :)
03:58 talexb You helped me out a while back, and I bought you a beer on King Street.
03:58 ojacobson Come down to Trinity Common on a Tuesday (and warn me you're coming) - a bunch of broadly smart folks meet up there for beer on a weekly basis
03:58 ojacobson Aye, I remember. I had a good time talking to you. :)
03:58 talexb Still at Freshbooks?
03:58 ojacobson Nah, at Heroku now riding herd on `git push heroku master` actually :)
03:59 talexb Cool.
04:00 ojacobson What are you up to these days?
04:00 talexb Sounds cool -- I will come out some Tuesday when I am not so tight for time.
04:00 talexb I am on contract at Manulife, doing ETL work.
04:00 elsevero joined #git
04:01 ojacobson Oh, nice.
04:02 talexb ojacobson, Thanks again! Cheers, the next beer's on me.
04:02 ojacobson o/
04:05 KevinMGranger joined #git
04:05 ceaucari joined #git
04:06 jaguarmagenta joined #git
04:06 SporkWitch joined #git
04:10 PCatinean joined #git
04:10 dreiss joined #git
04:11 fuchstronaut joined #git
04:11 jonmorehouse joined #git
04:12 kuzetsa joined #git
04:12 ochorocho__ joined #git
04:22 mbreedlove joined #git
04:22 MutantMahesh joined #git
04:24 sanketdg joined #git
04:25 aavrug joined #git
04:26 ManikM joined #git
04:28 MarkyC joined #git
04:29 Maxis joined #git
04:31 lindenle joined #git
04:33 st0opkid joined #git
04:35 jonmorehouse joined #git
04:42 d4rklit3 joined #git
04:44 MattMaker joined #git
04:46 khmarbaise joined #git
04:48 Cabanossi joined #git
04:48 KevinMGranger joined #git
04:50 akushner joined #git
04:51 HenriettaSalt joined #git
04:51 nilg joined #git
04:52 pwnz0r joined #git
04:53 citizen-stig joined #git
05:00 bronson joined #git
05:01 mischat joined #git
05:04 mercyfall joined #git
05:05 tref joined #git
05:11 MutantMahesh joined #git
05:12 pancakes9 joined #git
05:14 joako joined #git
05:16 HerrThees joined #git
05:17 jontmorehouse joined #git
05:20 aizex joined #git
05:21 netj joined #git
05:21 muthu joined #git
05:22 raijin joined #git
05:24 nnyk_ joined #git
05:25 yaewa joined #git
05:26 st0opkid joined #git
05:26 a_thakur joined #git
05:33 lindenle joined #git
05:36 subhojit777 joined #git
05:36 mda1 joined #git
05:47 sauvin joined #git
05:50 xall joined #git
05:51 Bear13tye joined #git
05:52 lindenle joined #git
05:55 a_thakur joined #git
05:56 sto0pkid joined #git
05:58 leeN joined #git
05:58 LucaTM joined #git
06:02 ochorocho__ joined #git
06:03 apotry joined #git
06:06 emPi joined #git
06:09 mflow joined #git
06:10 st0opkid joined #git
06:10 citizen-stig joined #git
06:10 Mandevil left #git
06:12 fuchstronaut joined #git
06:13 rscata joined #git
06:13 jstimm joined #git
06:14 Balliad joined #git
06:15 sans_s3r1f joined #git
06:17 d0nn1e joined #git
06:17 Felishia joined #git
06:18 norc joined #git
06:18 acolson joined #git
06:18 norc Hi. On one of my repositories, tab completion with git is horrendously slow. What could be the cause for this?
06:19 lamppid joined #git
06:20 PCatinean joined #git
06:21 aizex joined #git
06:21 LeMike joined #git
06:22 HenriettaSalt joined #git
06:24 elsevero joined #git
06:24 bayman joined #git
06:24 raininja joined #git
06:24 neanderslob joined #git
06:26 bayman how do i restore my master branch that i deleted
06:26 selckin !reflog
06:26 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`
06:26 Shentino joined #git
06:27 kellytk joined #git
06:28 kellytk Would $GIT_DIR/info/exclude and other files within my repo's .git directory be shared?  I'm making a decision as to which level to specify ignore patterns
06:31 fakenullie no they won't get shared
06:31 fakenullie use .gitignore for shared ignore
06:32 qt-x joined #git
06:33 kellytk When I share a currently local-only repo (working style created with `git init`) to GitHub which contents of the .git directory will be shared?
06:33 cbreak kellytk: history
06:33 cbreak that's it.
06:33 cbreak nothing else
06:34 kellytk Thank you I understand now
06:34 cbreak that means: history referenced by the branches, tags and other refs you push
06:34 kellytk Is it customary to load global repo ignores into .gitignore rather than rely on people to configure their own $GIT_DIR/info/exclude files?
06:35 fakenullie kellytk: .git/info/exclude is only for clone-specific ignores
06:35 fakenullie which aren't useful for others
06:36 kellytk I understand that, I'm now asking about customary practice to apply a project's conventions
06:36 fakenullie like you use some idiosyncratic ide and don't want other people see your ignores
06:36 fakenullie it's rarely used actually
06:36 kellytk That feels like a missed opportunity
06:36 fakenullie or you have your own tools in your clone
06:37 fakenullie no it is not
06:37 MutantMa_ joined #git
06:37 fakenullie it's very special case
06:38 kellytk If each working repo was configured with an appropriate exclude, .gitignore would be relieved for use with actual untracked project assets, such as build output
06:38 nnyk_ joined #git
06:38 kellytk Then its place at the root of a repo's working directory would make even more sense to me.  What do you think?
06:38 fakenullie but you'll end up with most people replicating exclude of other pople
06:38 fakenullie by hand
06:39 kellytk That's an implementation detail :-D
06:39 fakenullie that's wasted time and source of potential errors
06:39 kellytk Why should the world know anything of my .DS_Store?
06:39 fakenullie because they may have it too
06:39 kellytk (practically, I agree with you I'm merely exploring another idea)
06:39 aidalgol joined #git
06:40 fakenullie I've only use exclude for my own tools
06:40 fakenullie that nobody else could have
06:40 fakenullie because I've developed them and did not publish yet
06:40 kellytk I think info/privategitignore would be more descriptive
06:42 roelof joined #git
06:43 muthu_ joined #git
06:45 goTAN joined #git
06:47 bayman if updates have been made to a repo, can i just git clone it again?
06:48 thiago you can
06:48 thiago but you can just fetch those updates too
06:48 thiago git pull = git fetch   followed by git merge of the changes downloaded
06:48 rkazak joined #git
06:48 bayman do i need permission for git fetch
06:48 JeroenT joined #git
06:48 thiago the same permission that is required for cloning
06:49 mischat joined #git
06:49 moei joined #git
06:49 stantonk joined #git
06:51 kellytk cbreak: Where is history within the .git directory?
06:51 nnyk joined #git
06:51 thiago kellytk: all over the place
06:52 thiago kellytk: what are you looking for and why?
06:52 cbreak kellytk: in the objects and refs directories
06:52 kellytk What is actually shared from a .git directory when pushing to a remote repo
06:52 kellytk I didn't find it in there, is that because I've no commits yet?
06:52 cbreak no commits means no history
06:52 thiago kellytk: right, if you have no commits, there is no history
06:52 kellytk Thanks
06:53 kellytk I read that the description files doesn't need to be customized, is that correct?
06:53 thiago correct
06:53 thiago that's entirely optional
06:53 jjido joined #git
06:53 kellytk :-)
06:54 jjido how do I revert a single file to a previous hrev?
06:54 dan2k3k4 joined #git
06:54 jjido and make it head
06:54 thiago jjido: git checkout that-rev -- filename && git commit
06:54 bayman if I have my source i'm working on from my laptop and i pushed it to my bitbucket repo, how should i pull it on my app hosting server so i can also pull future updates when changes are made?
06:54 jjido ok thanks thiago!
06:55 MutantMahesh joined #git
06:55 thiago bayman: git pull
06:56 vmiklos joined #git
06:56 lindenle joined #git
06:57 citizen-stig joined #git
06:59 jceb joined #git
06:59 MutantMa_ joined #git
07:00 kyledr_ joined #git
07:01 Alienpruts joined #git
07:02 weyer joined #git
07:02 ximvan joined #git
07:02 _nadim joined #git
07:03 bronson joined #git
07:03 zeroed joined #git
07:03 zeroed joined #git
07:05 [Brain] joined #git
07:07 bayman how do i change my git init location to go up one folder from \project\source to \project
07:08 Guest60129 joined #git
07:08 thiago bayman: cd up
07:08 thiago cd ..
07:08 rxgcow joined #git
07:09 Sceorem joined #git
07:09 bayman i mean i want my git repo include everything in \project also
07:09 bayman bit i already started in \project\source
07:10 thiago can you delete the .git dir and init again?
07:10 thiago will you lose too much?
07:10 bayman what would that make me lose
07:10 bayman the commit comments?
07:10 thiago yes
07:10 bayman i'm fine w/ losing that
07:10 thiago ok, you can do this: rm .git/index; mv .git ..
07:10 thiago then re-add all the files
07:10 bayman ok
07:11 bayman do i need to delete the repo on my bitbucket
07:11 Psychiatrist joined #git
07:11 thiago no
07:11 Alienpruts joined #git
07:14 Xethron joined #git
07:14 fuchstronaut joined #git
07:14 isxek joined #git
07:14 groundnuty joined #git
07:15 lared joined #git
07:17 heftig meh, i wish you could attach notes to refs too
07:17 jast they're called tags ;)
07:18 heftig jast: no, you can't tag refs, either
07:18 heftig (not that that would make any sense)
07:18 jast dang, apparently I'm not very awake yet
07:19 heftig eat more coffee
07:19 jast not a fan of coffee
07:19 rkazak joined #git
07:20 heftig eat more tea
07:20 jast not a fan of tea
07:20 jast fan of eating, though :}
07:21 heftig eat more fans
07:21 jast I'll look into that
07:21 rominronin joined #git
07:22 aizex joined #git
07:22 sans_s3r1f joined #git
07:23 HenriettaSalt joined #git
07:23 fwdit joined #git
07:25 kellytk left #git
07:25 xbob joined #git
07:28 mischat joined #git
07:31 Balliad joined #git
07:33 Kulrak joined #git
07:33 Kulrak joined #git
07:38 Meteorhead joined #git
07:40 xelxebar joined #git
07:40 ahmedelgabri joined #git
07:43 baba_ joined #git
07:44 eletuchy joined #git
07:45 eletuchy joined #git
07:47 mflow joined #git
07:48 wicope joined #git
07:50 Ch4rAss joined #git
07:52 Brain joined #git
07:52 LeMike joined #git
07:56 Sendoushi joined #git
08:00 ferr joined #git
08:01 jontmorehouse joined #git
08:02 Ch4rAss joined #git
08:02 ochorocho__ joined #git
08:03 raijin joined #git
08:03 josuebrunel joined #git
08:03 clmsy joined #git
08:04 _pix joined #git
08:06 btree joined #git
08:06 acetakwas joined #git
08:06 btree left #git
08:08 aizex joined #git
08:09 neanderslob joined #git
08:09 dreiss joined #git
08:10 drewo joined #git
08:12 josue joined #git
08:12 harish_ joined #git
08:12 acetakwas joined #git
08:12 stantonk joined #git
08:13 Alienpruts joined #git
08:13 fracting joined #git
08:14 Jellyg00se joined #git
08:16 bongjovi joined #git
08:17 vrandkode joined #git
08:17 ShapeShifter499 joined #git
08:17 josuebrunel joined #git
08:18 Alienpruts joined #git
08:18 ahmed_elgabri joined #git
08:21 FunkyAss joined #git
08:22 marcogmonteiro joined #git
08:24 HenriettaSalt joined #git
08:25 cyan__ joined #git
08:25 matt__ joined #git
08:25 dsdeiz joined #git
08:26 jontmorehouse joined #git
08:27 kurkale6ka joined #git
08:27 dimi1947 joined #git
08:30 noteness joined #git
08:30 Fijit joined #git
08:30 _noblegas joined #git
08:35 a_thakur joined #git
08:36 Guest20491 left #git
08:37 ronny joined #git
08:38 eme joined #git
08:39 TomyWork joined #git
08:41 dan2k3k4 joined #git
08:41 citizen-stig joined #git
08:42 MutantMahesh joined #git
08:43 matt__ left #git
08:43 MutantMa_ joined #git
08:43 Kicer86 joined #git
08:46 ewet joined #git
08:46 jontmorehouse joined #git
08:47 a_thakur joined #git
08:49 rivarun joined #git
08:50 eletuchy joined #git
08:52 eletuchy joined #git
08:53 mischat joined #git
08:53 JeroenT joined #git
08:54 yuhlw joined #git
08:56 yuhlw joined #git
08:56 neanderslob joined #git
08:56 JeroenT joined #git
08:56 [Brain] joined #git
09:00 lindenle joined #git
09:00 Master_Kenway joined #git
09:03 brodul_2 joined #git
09:04 fujinuma joined #git
09:04 drewo joined #git
09:05 bronson joined #git
09:05 liamonade joined #git
09:05 fujinuma after I changed the parent directory of the repository the make command doesn't works? should I did anything else?
09:06 selckin make sense
09:07 fujinuma selckin: so what should I do?
09:07 selckin realise git has notting todo with make
09:07 fujinuma oK
09:07 Shashikant86 joined #git
09:09 ximvan joined #git
09:11 notebox joined #git
09:11 EY joined #git
09:11 JeroenT joined #git
09:15 fuchstronaut joined #git
09:15 citizen-_ joined #git
09:15 kyledr joined #git
09:17 henk joined #git
09:18 citizen-stig joined #git
09:18 Master_Kenway left #git
09:19 henk hi, I have almost 100 branches in one repository and need to rename most of them. I’m looking for an efficient and painless way to do that. typing "git branch -m some<TAB> foobar/other_name" is not efficient at all. Any ideas, hints, experience?
09:20 selckin simple bash script?
09:20 troulouliou_div2 joined #git
09:21 gajus joined #git
09:21 henk selckin: doing what? there is no pattern btw, or it would probably be a lot simpler …
09:21 gajus How to get list of commits that have not been pushed?
09:21 selckin henk: you could ask gandalf
09:22 cbreak henk: what's the problem?
09:22 cbreak henk: just type the names you want and you're done?
09:23 JeroenT joined #git
09:23 henk ok, thanks guys
09:24 citizen-_ joined #git
09:25 HenriettaSalt joined #git
09:25 selckin git branch -a > script; vim script, %s:/^/git branch -m/
09:26 eletuchy_ joined #git
09:27 citizen__ joined #git
09:27 henk selckin: ah, right, something like that works, thanks (:
09:30 guardian hello, I have a script that rename things in a bare repository and does git update-index --cacheinfo 100644,$blob,"$line"
09:30 guardian is there a way to do the same without touching the mode?
09:31 deltab joined #git
09:32 King_Hual joined #git
09:32 Balliad joined #git
09:35 cbreak selckin: git for-each-ref :)
09:35 selckin the problem is keeping track of the ones he renamed already so not really git problem
09:36 guardian in fact how can I get the current mode for a file in a bare repository, knowing that I'm parsing git-grep output of the form "ref:path/to/file"
09:36 sanketdg joined #git
09:36 cbreak guardian: mode?
09:37 cbreak guardian: there are no working dir files in bare repositories
09:37 guardian cbreak: indeed, I'm working in bare repositories
09:37 guardian cbreak: the fact that my script hardcodes 100644 when doing git update-index removes +x on scripts
09:37 JeroenT joined #git
09:38 cbreak why can you not use git mv --cached?
09:38 cbreak hmm...
09:38 cbreak it doesn't exist :(
09:38 guardian I'm doing search/replace inside files
09:38 guardian from bare repositories
09:38 guardian so I'm parsing git-grep output
09:39 _0xAX joined #git
09:39 cbreak sounds hairy
09:39 guardian checkout to temporary file, sed -f, hash-object then update-index
09:39 a_thakur joined #git
09:39 guardian I have 400 repositories to upadte in bulk :) works well beside that minor quirk about .sh scripts file modes that I'm reverting to 644
09:40 cbreak guardian: man git-ls-files --stage
09:40 gitinfo guardian: the git-ls-files manpage is available at http://jk.gs/git-ls-files.html
09:40 nnyk joined #git
09:42 cbreak that should give you the infos you want about every file in the index
09:43 guardian hmm
09:43 guardian rather ls-tree
09:44 cbreak guardian: that'd give you the infos about the tree
09:44 cbreak NOT the current index
09:45 guardian I can't get git ls-files --stage to output anything in that repo I'm testing
09:45 henk selckin, cbreak: thanks guys, that made it much easier
09:46 fuchstronaut joined #git
09:46 citizen-stig joined #git
09:47 cbreak guardian: well...
09:47 cbreak guardian: you did say it's bare, so it doesn't have an index
09:48 cbreak guardian: but since you said you'd use update-index, you should see the result of that at least
09:48 andyhoang-work joined #git
09:48 nnyk joined #git
09:48 Brain joined #git
09:49 citizen-_ joined #git
09:52 Shashikant86 joined #git
09:54 dsdeiz joined #git
09:55 rafalcpp_ joined #git
09:57 henk left #git
09:57 guardian the result of what? I think I stopped following
09:58 [Brain] joined #git
09:58 guardian so far, it seems I can git ls-tree -r $head | grep "$file" | cut -d' ' -f1 to get the mode before I touch the file
09:58 Ali1 joined #git
09:58 guardian but you mentioned ls-tree is likely not what I want
09:59 drewo joined #git
10:00 JeroenT joined #git
10:03 prsn joined #git
10:03 pol123456 joined #git
10:03 ochorocho__ joined #git
10:05 eletuchy joined #git
10:06 eletuchy joined #git
10:07 rafalcpp joined #git
10:07 rafalcpp geordi:  template <class T> T f(T a) { return a+1; } template<> int f(int a); int f(int a) { return a+100; } int main() { cout << f(5); }
10:07 rafalcpp sorry wrong channel
10:10 dustinm joined #git
10:10 aavrug joined #git
10:13 MutantMahesh joined #git
10:14 styx_ joined #git
10:17 Dro joined #git
10:19 Sceorem joined #git
10:22 mj12` joined #git
10:25 gaen joined #git
10:25 HenriettaSalt joined #git
10:26 hwlog joined #git
10:31 texinwien_ joined #git
10:31 ThomasLocke joined #git
10:31 prsn joined #git
10:33 bollullera joined #git
10:35 jbitdrop joined #git
10:36 tlaxkit joined #git
10:37 cbreak guardian: you wrote that you would be using update-index
10:37 cbreak that only works if you have an index and want to manipulate it
10:37 cbreak if you have an index, use ls-files to look at the files in it
10:38 cbreak guardian: if you do not have an index, and want to get the infos from the tree that is attached to a commit, or similar, then ls-tree can do that
10:38 cbreak but then, using update-index wouldn't work either
10:39 cbreak guardian: maybe you want to use read-tree to get the tree into the index prior to manipulation?
10:43 sdothum joined #git
10:47 guardian I do
10:47 narendraj9 joined #git
10:48 mingwandroid joined #git
10:48 dimi1947 joined #git
10:48 guardian so I do have an index, populated with git read-tree
10:49 guardian so yeah now I understand why I can't get git ls-files to work, I'm doing it in a bare repo where I didn't do git read-tree
10:49 sanketdg joined #git
10:50 sdothum joined #git
10:50 josuebrunel joined #git
10:51 guardian thanks for explanations cbreak
10:51 cbreak guardian: in a normal repository, you would have an index, and you would not have to do read-tree of course
10:51 toogley joined #git
10:51 guardian rephrasing: I was testing git ls-files commands in a bare repository, without an index file, while my script indee does git read-tree /tmp/index etc
10:52 mdw joined #git
10:52 guardian s/indee/indeed
10:53 drewo joined #git
10:53 johnmilton joined #git
10:53 Shashikant86 joined #git
10:56 JeroenT joined #git
10:58 Gonzo89 joined #git
10:59 mdw_ joined #git
10:59 m_antis joined #git
10:59 umdstu joined #git
11:01 cdg joined #git
11:01 kam270 joined #git
11:01 mizu_no_oto joined #git
11:02 dustinm joined #git
11:02 lindenle joined #git
11:02 Xethron joined #git
11:03 digidog joined #git
11:06 Gamecubic joined #git
11:06 Levitators joined #git
11:07 bronson joined #git
11:08 digidog joined #git
11:09 Kallis joined #git
11:09 ferr joined #git
11:11 WayToDoor joined #git
11:13 stantonk joined #git
11:14 netj joined #git
11:14 digidog joined #git
11:15 zalem-developer joined #git
11:15 zalem-developer is anyone awake?
11:16 RichiH no
11:16 kyledr joined #git
11:16 cbreak two
11:18 rnsanchez joined #git
11:19 zalem-developer i'm using a mac and i use iterm2 for terminal functions.   i'm trying to get it to show my git brances, etc.   something about git-completion but it's not clear on how to set it up or install it
11:19 RichiH to show git branches, use git branch or git branch -a
11:20 fahadash joined #git
11:20 RichiH anything beyond that, you will need to rephrase your question
11:20 zalem-developer my coworker uses iTerm2 and it always show which branch he's on/using
11:20 zalem-developer it's like he installed a plug in or something
11:21 WayToDoor joined #git
11:21 FilipNortic joined #git
11:21 dan2k3k4 joined #git
11:23 moritz not a question of the terminal
11:23 moritz but rather of the shell prompt configuration
11:23 moritz !prompt
11:23 gitinfo The bash completion script developed with git (http://en.newinstance.it/2010/05/23/git-a​utocompletion-and-enhanced-bash-prompt/) and the one for zsh shipped with zsh (http://gitready.com/advanced/2​009/01/28/zsh-git-status.html) both support showing the status of your repo in the prompt string, at a glance
11:23 moritz zalem-developer: ^^
11:24 Ch4rAss joined #git
11:24 Levitators left #git
11:25 Levitator joined #git
11:25 Levitator Ok, so, obviously I have no idea what I'm doing with git.
11:25 Levitator So, I made a bunch of commits on master, or so I thought.
11:25 Levitator I decided the current edit was going nowhere, so I stashed it, branched, then forgot to pop the stash and commited my reverted working directory to the new branch.
11:26 Levitator But when I go back and look at the history, master is sitting way back several commits in the past, and most of my commits are on the new branch I just created. How the hell?
11:26 HenriettaSalt joined #git
11:26 zalem-developer i'm on a mac and the docs say something about adding to your .profile.  /usr/local/git/contrib/comp​letion/git-completion.bash    i don't even have a folder called contrib
11:26 lss8 joined #git
11:26 zalem-developer and i have the latest version of git  2.8.2
11:27 moritz Levitator: it seems you changed to the new branch before adding the commits
11:27 Levitator I thought all of my commits were already on master, except for the last one
11:27 moritz zalem-developer: do a search for git-completion.bash and try to find where it is?
11:27 moritz Levitator: seems you are wrong.
11:27 zalem-developer i have and i don't that file
11:28 Levitator Ok, but even if my commits went to the wrong branch by accident, how is it possible that when I branched, they scooted laterally onto that new branch retroactively?
11:28 zalem-developer i don't have that file
11:28 Levitator That makes no sense whatsoever.
11:29 Levitator I make commits a,b,c,d onto branch A. I stash. Then I branch to B, and when I go look at its history, a,b,c,d are on branch B instead of A. How the hell?
11:30 Levitator Well, I branch to B and commit, to be exact.
11:30 ilmari Levitator: "branch to" as in "git checkout -b B"?
11:30 digidog joined #git
11:30 ilmari or chekc out an existing branch from before you created branch A?
11:31 Levitator ilmari: git checkout -b B
11:32 prsn joined #git
11:32 Levitator git stash; git checkout -b B; git commit
11:33 ilmari Levitator: that creates a new branch from where you were, so that's exctly what you'd expect
11:34 ilmari so after 'git checkout -b B', branches A and B point to the same commit
11:35 lowellcayce joined #git
11:35 Levitator But master is pointing way back in the past.
11:35 Levitator And the commits which I thought went to master are now on B.
11:36 Levitator So the question is, where could they have been going such that they have been retroactively shifted onto B upon its creation.
11:36 noidea joined #git
11:36 noidea joined #git
11:36 lowellcayce joined #git
11:37 Levitator Well, I screwed something up. I guess I can just merge B back into master and not worry about  it.
11:37 lowellcayce joined #git
11:37 grawity joined #git
11:39 lowellcayce joined #git
11:42 mohabaks joined #git
11:42 nettoweb joined #git
11:43 |2701 joined #git
11:43 fscala joined #git
11:45 fuchstronaut joined #git
11:45 liamonade joined #git
11:47 jimmybuffet joined #git
11:47 drewo joined #git
11:47 nadim joined #git
11:48 Psychiatrist joined #git
11:48 Dro joined #git
11:50 fuchstronaut joined #git
11:51 Gsham joined #git
11:55 ojdo joined #git
11:57 rossome joined #git
11:58 beautifulmind joined #git
11:58 eme joined #git
11:59 fstd joined #git
12:00 prsn joined #git
12:00 rafalcpp is there some alias or shortcut for current branch?
12:01 rafalcpp is there some alias or shortcut for current branch? e.g. when you  do  git merge someone-somewhere/thecurrentbranch  and such.  so you don't need to type thecurrentbranch always
12:02 rafalcpp the one shown in git PS bash prompt
12:02 blaa joined #git
12:03 moritz if there's just one upstream breanch, you can use @{u}
12:03 JeroenT joined #git
12:03 moritz git merge @{u}
12:03 mbreedlove joined #git
12:04 moritz also, enable git-aware tab completion, it allows you to tab-complete branch names
12:04 ochorocho__ joined #git
12:05 rafalcpp @{u} ?
12:05 Sceorem joined #git
12:05 rafalcpp fatal: remote part of refspec is not a valid name in @{u}
12:05 rafalcpp moritz: tab works, but got few branches with similar name
12:08 moritz rafalcpp: what command did you try with @{u}?
12:08 * boingy discovered 'tig' just now and is crying tears of joy
12:08 EY joined #git
12:08 moritz the nice thing about tig is that it's *fast*
12:09 SporkWitch joined #git
12:09 boingy it cuts a lot of typing indeed
12:09 Bear13tye joined #git
12:10 andyhoang joined #git
12:10 synthroid joined #git
12:12 wviana joined #git
12:13 rossome joined #git
12:15 * _ikke_ uses tig too
12:18 nnyk joined #git
12:20 JeroenT joined #git
12:20 prsn joined #git
12:23 Raging_Hog joined #git
12:26 flaguy48 left #git
12:27 HenriettaSalt joined #git
12:29 HenriettaSalt_ joined #git
12:30 espindola joined #git
12:31 Mateon1 joined #git
12:33 Shentino joined #git
12:34 Corneliu joined #git
12:37 dstarh joined #git
12:37 fwdit joined #git
12:39 variable joined #git
12:41 drewo joined #git
12:42 zarel joined #git
12:42 rgrinberg joined #git
12:42 Panacea joined #git
12:45 Bear13tye joined #git
12:46 italoacasas joined #git
12:46 zeroed joined #git
12:48 liquidjamm joined #git
12:50 zivester joined #git
12:51 liquidjamm joined #git
12:52 apotry joined #git
12:52 ocbtec joined #git
12:53 liquidjamm joined #git
12:53 fuchstronaut joined #git
12:53 fuchstronaut joined #git
12:54 Asiajey joined #git
12:55 qt-x joined #git
12:55 Maxou joined #git
12:56 mahendra_ joined #git
12:56 Maxou Hey I use my github to collborate with a teamate school on a project how he can add his work on it ?
12:56 mbrzuzy joined #git
12:57 qt-x joined #git
12:57 iooner left #git
12:59 _ikke_ What do you mean with his work exactly?
12:59 Maxou we just start the project
13:00 Maxou so we have our inital file project on my github
13:00 Maxou he git clone this repo on his computer
13:00 perlpilot Maxou: he clones the repo, adds his work, then pushes back to github
13:00 perlpilot Maxou: same as you
13:00 Maxou but he can push with his login on my github ?
13:00 dopesong joined #git
13:01 perlpilot Maxou: if you allow it.  There's some github interface for adding collaborators
13:01 tach joined #git
13:01 EY__ joined #git
13:02 Maxou I want to allow it ! but how
13:02 MutantMahesh joined #git
13:03 perlpilot Maxou: That's more of a #github question than a #git question.  or maybe try help.github.com ?
13:03 ftnsdf joined #git
13:03 Maxou oh true sorry
13:03 perlpilot Maxou: or even just google it.
13:03 MarkyC joined #git
13:04 livingstn joined #git
13:04 CheckDavid joined #git
13:04 baba_ joined #git
13:04 johnmilton joined #git
13:04 lindenle joined #git
13:04 daynaskully joined #git
13:06 Bear13tye joined #git
13:06 Gsham joined #git
13:07 ilmgb joined #git
13:07 marcv joined #git
13:07 puff Good morning all.
13:08 ash_workz joined #git
13:08 livingstn joined #git
13:09 sangy joined #git
13:09 bronson joined #git
13:10 marcv Hi. I've got /web/uploads/* in my .gitignore file. Now I created a .gitkeep file in web/uploads/photo-pinboard/large/ and added !web/uploads/photo-pinboard/large/.gitkeep in my .gitignore. However the .gitkeep file doesn't show up when I git status. Anyone knows why?
13:10 gitinfo [!deploy] 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:11 JeroenT joined #git
13:11 spito joined #git
13:12 Dan0maN_Work joined #git
13:12 keller joined #git
13:12 baba__ joined #git
13:12 durham joined #git
13:13 rnsanchez_ joined #git
13:14 jimi_ joined #git
13:15 abc123 joined #git
13:15 dopesong_ joined #git
13:16 kyledr joined #git
13:16 liamonade joined #git
13:18 CEnnis91 joined #git
13:20 grift joined #git
13:21 prsn joined #git
13:22 Ch4rAss joined #git
13:23 toogley1 joined #git
13:23 liamonade joined #git
13:24 gajus I am getting an error "fatal: Needed a single revision" when attempting to rebase
13:25 diegoaguilar joined #git
13:25 gajus http://paste.linux.chat/view/42d6da07
13:25 gajus context
13:26 Shentino joined #git
13:26 gajus What am I doing wrong?
13:26 gajus I want to simply change message of the last 4 commits
13:26 moritz invalid upstream @~4
13:26 dimi1947 joined #git
13:27 moritz did you mean HEAD~4 ?
13:27 moritz (that was for gajus)
13:27 gajus isn't @ and HEAD synonymous?
13:28 moritz man gitrevisions says:
13:28 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
13:28 moritz @
13:28 moritz @ alone is a shortcut for HEAD.
13:28 moritz emphasis on *alone*
13:28 moritz @ folloed by funny characters typically has special meaning
13:29 moritz *followed
13:30 dopesong joined #git
13:30 gajus Thank you
13:32 algae joined #git
13:33 mbreedlove joined #git
13:35 qt-x joined #git
13:35 drewo joined #git
13:36 MadHatter42 joined #git
13:36 EduardoMartins joined #git
13:38 grawity well, @~ and @^ are still equal to HEAD~ and HEAD^
13:38 SimonNa joined #git
13:38 grawity the alias is somewhat recent though
13:40 fakenullie is there difference between ^ and ~ ?
13:40 dimi1947 joined #git
13:40 heftig yes. ~3 means ~~~ while ^3 means the third parent
13:41 heftig only merge commits have more than one parent
13:41 Dougie187 joined #git
13:42 fakenullie thanks
13:42 idmistir joined #git
13:42 baba_ joined #git
13:42 prsn joined #git
13:43 f3r70rr35f joined #git
13:43 rivarun joined #git
13:44 kyledr joined #git
13:44 dimi1947 joined #git
13:45 AaronMT joined #git
13:45 crose joined #git
13:46 Bear13tye joined #git
13:48 johnmilton joined #git
13:50 qt-x joined #git
13:50 anu0 joined #git
13:50 exarch joined #git
13:51 swilsonau joined #git
13:53 johnmilton joined #git
13:54 astrofog joined #git
13:54 baba_ joined #git
13:54 gajus I am getting an error 'remote: error: GH003: Sorry, force-pushing to first-version is not allowed.'
13:54 mj12` joined #git
13:54 gajus I have checked github, Branches and first-version is not a protected branch
13:54 rainbyte joined #git
13:54 gajus anything else I am overlooking?
13:55 Felishia left #git
13:56 linuxmint joined #git
13:56 T4nk5bb0t joined #git
13:58 atrigent joined #git
13:58 quizzi joined #git
13:59 Darcidride joined #git
13:59 fracting joined #git
14:00 quizzi joined #git
14:02 zarel joined #git
14:04 m_antis joined #git
14:05 ochorocho__ joined #git
14:06 Bear13tye joined #git
14:06 LBV_User joined #git
14:07 guampa joined #git
14:07 madewokherd joined #git
14:09 mbreedlove joined #git
14:11 jwest joined #git
14:11 hobodave joined #git
14:15 ajf- joined #git
14:15 relipse2 joined #git
14:15 Sendoushi joined #git
14:16 rkazak joined #git
14:18 stantonk joined #git
14:20 jaafar joined #git
14:26 mase-tech joined #git
14:26 Bear13tye joined #git
14:26 Vgr_ joined #git
14:27 phaleth joined #git
14:28 flaguy48 joined #git
14:28 T4nkAbb0t joined #git
14:29 drewo joined #git
14:29 johnwhitton joined #git
14:31 TankAbb0t joined #git
14:33 quizzi joined #git
14:34 synthroid joined #git
14:35 clemf joined #git
14:35 cdg joined #git
14:35 Vgr joined #git
14:36 NeverDie joined #git
14:37 eletuchy joined #git
14:39 tehtraveler2321 joined #git
14:41 MadHatter42 joined #git
14:41 Slyde joined #git
14:41 jstimm joined #git
14:41 marcv left #git
14:44 Noldorin joined #git
14:45 Zamyatin joined #git
14:47 Bear13tye joined #git
14:47 chrisshattuck joined #git
14:47 Zamyatin joined #git
14:47 baba_ joined #git
14:48 thiago joined #git
14:51 efco joined #git
14:52 dopesong joined #git
14:52 Gsham joined #git
14:53 hizzard joined #git
14:54 mda1 joined #git
14:56 WayToDoor joined #git
14:57 LMDS joined #git
14:57 LMDS left #git
14:58 hizzard left #git
14:58 guampa joined #git
14:58 anyhoo joined #git
14:59 circ-user-iSXQf joined #git
15:00 robotroll joined #git
15:00 fuchstronaut joined #git
15:01 bcc joined #git
15:01 bcc joined #git
15:01 Vgr_ joined #git
15:01 stantonk joined #git
15:02 hashpuppy joined #git
15:02 Sendoushi joined #git
15:03 zivester joined #git
15:03 Celelibi joined #git
15:05 kilo_bravo joined #git
15:06 lindenle joined #git
15:07 Bear13tye joined #git
15:08 R34PER joined #git
15:09 R34PER joined #git
15:10 madewokherd joined #git
15:10 R34PER joined #git
15:10 josuebrunel joined #git
15:10 bango2 joined #git
15:11 R34PER joined #git
15:11 kpease joined #git
15:11 bronson joined #git
15:13 Iux joined #git
15:14 Dan0maN_Work left #git
15:15 nilsi joined #git
15:17 Pqeu joined #git
15:18 Gloomy joined #git
15:18 jceb joined #git
15:19 voiter joined #git
15:20 fahadash joined #git
15:21 quizzi joined #git
15:21 voiter i use composer (PHP) for dependency management. the vendor directory is not in .gitignore. when i run "git status" then i see no changes in my working branch. when i want to change to another branch it lists the files of a package i just installed: "error: The following untracked working tree files would be overwritten by checkout"
15:22 voiter what is the reason that "git status" does not show those files?
15:23 rgrinberg joined #git
15:23 MadHatter42 joined #git
15:23 rnsanchez_ joined #git
15:24 rgrinberg joined #git
15:24 neanderslob joined #git
15:24 Erati joined #git
15:25 eme2 joined #git
15:25 DolphinDream how do you compare two git repositories to prove that they are identical ?
15:26 DolphinDream e.g that the history is the same, that the refs are the same tc
15:26 DolphinDream etc
15:27 heftig DolphinDream: compare the output of git show-ref --head
15:27 Bear13tye joined #git
15:28 lss8 joined #git
15:28 jbitdrop joined #git
15:28 DolphinDream aha.. but that does not show the full history
15:28 heftig DolphinDream: you don't need to
15:28 DolphinDream hm... because of the way the git commits are structured ?
15:29 DolphinDream if you have the tips you ahve the rest ?
15:29 heftig the id of a git object is its hash
15:29 heftig a commit contains the id of its parents
15:30 zincrokx joined #git
15:30 heftig hence, any change in history necessarily makes for a different set of ids
15:30 heftig (within the collision chance of sha1)
15:31 DolphinDream i have a bare repo that i pushed to the remote.. then i re-clone the pushed repo locally to another folder so i can do a check between the bare repo and the re-cloned repo to validate that the pushed worked correctly. (validating some scripts)
15:31 Eugene Well, that won't cover the case of a shallow clone
15:32 eme joined #git
15:32 Eugene But those are dumb anyway
15:33 Alienpruts joined #git
15:33 mikecmpbll joined #git
15:35 eparis_ left #git
15:35 dunk I had some overlapping changes in a checkout and I wanted to create a different branch to commit them to. From the branch I was in, and with the changes uncommitted, I did a git checkout -b, and committed the changes to that branch instead. However, when I go to create a pull request, all the changes from both branches are in it. How can I avoid that?
15:35 eparis joined #git
15:35 leeN joined #git
15:35 eparis is there a way to figure out "where was HEAD of branch master Jan 1 2015"
15:37 canton7 eparis, git log "master@{Jan 1 2015}" or so
15:38 thirax joined #git
15:39 nilsi joined #git
15:40 rgrinberg joined #git
15:40 TomyLobo joined #git
15:40 Gsham joined #git
15:41 MarkyC_ joined #git
15:42 tach_ joined #git
15:42 peepsalot joined #git
15:42 kinokoio joined #git
15:43 sbogg joined #git
15:44 subhojit777 joined #git
15:47 m_antis joined #git
15:47 Bear13tye joined #git
15:49 jsilva joined #git
15:49 EY__ joined #git
15:50 lindenle joined #git
15:51 b1tchcakes joined #git
15:52 purrkode joined #git
15:56 drewo joined #git
15:57 mohabaks joined #git
15:58 eletuchy joined #git
15:58 baba_ joined #git
16:00 c0ded joined #git
16:01 LeMike joined #git
16:02 fuchstronaut joined #git
16:02 diegoaguilar joined #git
16:03 thiago joined #git
16:03 smithbone joined #git
16:03 diegoaguilar joined #git
16:04 synthroid joined #git
16:04 IWishIKnew joined #git
16:05 ochorocho__ joined #git
16:06 baba_ joined #git
16:06 prsn joined #git
16:06 ahmedelgabri joined #git
16:06 CubiK joined #git
16:07 Bear13tye joined #git
16:09 mischat_ joined #git
16:10 jceb joined #git
16:10 Apasmara joined #git
16:11 nwf joined #git
16:11 prsn_ joined #git
16:11 maestrojed joined #git
16:12 howdoi joined #git
16:12 tokkee joined #git
16:13 netj joined #git
16:13 fuchstronaut joined #git
16:13 anu1 joined #git
16:13 _ikke_ reflog only keeps records for 90 days or so, so probably that has already been expired
16:14 _ikke_ (late answer)
16:15 CJKinni joined #git
16:15 bollullera left #git
16:16 nettoweb joined #git
16:18 blackwind_123 joined #git
16:18 robotroll joined #git
16:19 EduardoMartins1 joined #git
16:20 netj joined #git
16:21 Samual joined #git
16:21 crayon joined #git
16:23 jost joined #git
16:24 spito left #git
16:24 ferr joined #git
16:28 Bear13tye joined #git
16:29 dreiss joined #git
16:33 thirax left #git
16:33 b1tchcakes joined #git
16:34 LeMike joined #git
16:34 daanavitch joined #git
16:36 ceaucari joined #git
16:39 cdg joined #git
16:39 kpease joined #git
16:42 mase-tech joined #git
16:42 circ-user-iSXQf joined #git
16:43 Guest16722 joined #git
16:43 Zamyatin joined #git
16:44 HappyLoaf_ joined #git
16:44 mischat joined #git
16:47 OnBrokenWings joined #git
16:47 SteffanW joined #git
16:48 Bear13tye joined #git
16:50 dreiss joined #git
16:55 mikecmpbll joined #git
16:56 jost joined #git
16:56 AndroidLoverInSF joined #git
16:58 drewo joined #git
17:00 dopesong joined #git
17:00 kyledr joined #git
17:01 baba_ joined #git
17:03 rgrinberg joined #git
17:04 King_Hual joined #git
17:04 King_Hual joined #git
17:05 LeBlaaanc joined #git
17:07 Dro joined #git
17:08 Bear13tye joined #git
17:10 rominronin joined #git
17:10 Gamecubic_ joined #git
17:13 zivester joined #git
17:13 miklcct joined #git
17:14 bronson joined #git
17:14 Gamecubic__ joined #git
17:15 MrWoohoo joined #git
17:15 AaronMT joined #git
17:15 Gianormagantrous joined #git
17:15 relrod_ joined #git
17:15 relrod_ joined #git
17:16 mozzarella joined #git
17:16 LeBlaaanc joined #git
17:16 piling joined #git
17:17 shinnya joined #git
17:17 zalatovo joined #git
17:18 sangy joined #git
17:21 LeBlaaanc joined #git
17:22 Gamecubic joined #git
17:22 mozzarel1 joined #git
17:23 Darcidride joined #git
17:24 notebox joined #git
17:28 sharpy joined #git
17:30 d4rklit3 joined #git
17:30 hahuang65 joined #git
17:32 m_antis joined #git
17:32 jontmorehouse joined #git
17:34 dan2k3k4 joined #git
17:34 nwf joined #git
17:35 Mateon1_ joined #git
17:35 netj joined #git
17:36 LeBlaaanc joined #git
17:37 fracting joined #git
17:38 Limes_ joined #git
17:40 nwf joined #git
17:40 FunkyAss joined #git
17:41 daanavitch joined #git
17:41 Noldorin joined #git
17:44 leeN joined #git
17:45 Sasazuka joined #git
17:46 jagob joined #git
17:47 Gamecubic joined #git
17:48 Artynok joined #git
17:51 Artynok hey everyone
17:51 gitinfo Artynok: 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.
17:51 unbalancedparen joined #git
17:52 LeBlaaanc joined #git
17:52 Artynok I got some trouble with git
17:52 Artynok can anybody help me?
17:52 Artynok please?
17:52 drewo joined #git
17:53 _ikke_ !just_ask
17:53 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
17:55 Dyonisos joined #git
17:56 xbob joined #git
17:57 khmarbaise joined #git
17:57 LeBlaaanc joined #git
18:00 Artynok I've been working with a repo since 6 months ago, using gitlab in my own server. Now new people is joining to our team. So I did a clone, deleted many files, commit and push to this clone in the server, so the new guy fork and work on it. Later with merge request we join the work.
18:00 mdw joined #git
18:00 Artynok now the problem is when i merge both repos the main repo is getting the same files that i deleted on the little one
18:01 Artynok how can I avoid this action?
18:01 piling joined #git
18:01 fscala joined #git
18:01 romankl joined #git
18:02 nofacade joined #git
18:02 Artynok is getting erased the same files*
18:02 cbreak Artynok: you made a change, the deletion of files
18:02 cbreak it is only natural that merging  your change will also merge your change
18:02 NoImNotNineVolt left #git
18:02 LeBlaaanc joined #git
18:02 cbreak -> also delete the files
18:03 cbreak that's the whole point of git
18:03 d4rklit3 joined #git
18:03 stantonk_ joined #git
18:03 Sendoushi joined #git
18:03 csd_ joined #git
18:05 cbreak Artynok: you can make a new commit restoring the deleted files
18:05 csd_ I have an existing commit. I'd like to roll back to an earlier commit and save some of the changes to a stash. To do so, I git reset --soft HEAD^; git add/commit the files I want to keep; and then try to git stash save. But the git commit ends up also committing those other changes that I just want to stash. What's going on?
18:06 stantonk_ joined #git
18:06 Artynok I know, that's why I'm asking if can I avoid the deletion just on that files
18:06 Artynok on the big one
18:06 ochorocho__ joined #git
18:06 daanavitch joined #git
18:08 ilbot3 joined #git
18:08 Topic for #git is now Welcome to #git, the place for git help and tig welding | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Error: insufficient entries in https://madeitwor.se/git-jokes
18:09 narendraj9 joined #git
18:09 Artynok yea, I think the same way
18:09 Artynok but how can i restore them?
18:09 cbreak Artynok: git checkout someearliercommit -- files
18:09 cbreak then commit
18:10 Artynok i used HEAD@{1}
18:10 cbreak csd_: what for?
18:10 csd_ cbreak: what for what?
18:10 rominronin joined #git
18:10 cbreak csd_: why do you want to stash?
18:10 Artynok git checkout HEAD@{1}
18:10 csd_ cbreak: instead of branching
18:10 Artynok after the "bad" merge
18:10 kyledr joined #git
18:10 cbreak csd_: sounds exceptionally stupid
18:10 csd_ why?
18:11 mikecmpbll joined #git
18:11 cbreak because stashes are easily lost and hard to handle
18:11 cbreak and more complex than simply branching
18:11 cbreak a stash is a series of commits
18:11 csd_ cbreak: it's not a ton of code and it's code that might end up being discarded, so i figured why create a branch for it
18:11 cbreak csd_: because creating a branch is simpler and easier
18:12 cbreak csd_: git stash will commit all your changes, staged and unstaged
18:12 cbreak after that, the changes will be removed from the working dir
18:12 HerrThees joined #git
18:12 cbreak you don't get to chose what gets stashed
18:12 siklos joined #git
18:12 cbreak there are options that give you the option to keep some changes in the working dir though
18:13 csd_ cbreak: i'm not actually getting to the point of being able to stash though, because after running git commit, it commits even changes to files that i didn't add, so the working directory is clean
18:13 cbreak csd_: nope
18:13 cbreak git commit only commits what you tell it to
18:13 cbreak csd_: check git status before the commit
18:13 cbreak you'll see
18:13 cbreak (or git diff --cached)
18:13 csd_ oh. i see you're right, i was misreading it
18:13 brandonw joined #git
18:14 cbreak git reset --soft will NOT unstage anything
18:14 csd_ i always expect reset --soft to unstage too
18:14 cbreak nope
18:14 cbreak that's the whole point of --soft
18:14 cbreak it tells git to not unstage anything
18:14 siklos Hi, I added a new package to my project , I am using IntelliJ and now wanted to push the new package to GIT (including the two classes in there), it is not possible, any advice?
18:14 csd_ so i guess i wanted --mixed
18:14 Artynok cbreak: after the "bad" merge I use: git checkout HEAD@{1} // git merge --no-commit master
18:14 cbreak csd_: which is the default
18:14 Artynok and it says already-to-date
18:15 csd_ cbreak: ok so i guess what i should do is reset the stuff i want to branch off. commit the other changes. then create a branch for the other changes?
18:15 cbreak Artynok: it is
18:15 cbreak Artynok: pick a commit where the file still existed
18:15 cbreak maybe HEAD~1?
18:15 cbreak csd_: your choice.
18:16 csd_ ok well thank you
18:16 cbreak siklos: read error message.
18:16 vinod joined #git
18:16 Artynok oooh i though HEAD@{1} was the earlier previous to merge
18:16 Artynok thought*
18:16 maucar joined #git
18:16 cbreak Artynok: nope
18:16 cbreak it's the commit you were on last
18:16 Artynok -_- my terrible bad
18:16 cbreak @{..} is the reflog
18:16 Artynok yes
18:16 Artynok i read the documentation
18:16 Artynok i thought that was the way
18:17 purrkode joined #git
18:17 cbreak if you're not sure about the shorthands, you can simply use the commit hash too
18:17 kadoban joined #git
18:17 Artynok word, hold on i'm going to try with HEAD~1
18:18 jstimm joined #git
18:18 Panacea joined #git
18:18 zarel joined #git
18:20 Artynok one more thing.. if i want to restore entire directories i just put: git add directory1/*?
18:20 j416 define restore
18:20 j416 (the answer is no, by the way)
18:20 Artynok git checkout head~1
18:21 ahmedelgabri joined #git
18:21 cbreak Artynok: you can check out whole directories
18:21 cbreak also, this is case sensitive
18:22 zjaffee joined #git
18:24 Artynok cbreak: can you correct my syntax? git checkout master directory1
18:24 Artynok git add directory1
18:24 cbreak what's the problem?
18:26 Artynok path spec 'directory1' did not match any  file(s) known to git
18:27 Artynok after checkout on directory
18:27 cbreak Artynok: so it didn't exist on master
18:28 cbreak Artynok: pick a commit where it does exist
18:29 sangy joined #git
18:30 bittin joined #git
18:31 fuchstronaut joined #git
18:32 Artynok ok this is a pain in the boot.. should I merge master in the previous? because is deleting the files of that commit too
18:33 satifant joined #git
18:33 j416 Artynok: I'd recommend !book
18:33 gitinfo Artynok: 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
18:35 fakenullie !bottomup
18:35 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)
18:35 cbreak Artynok: what you want to merge is irrelevant to this
18:36 cbreak Artynok: just recover the files from a commit where they existed
18:36 LeBlaaanc joined #git
18:38 lb bottum link is dead
18:39 lb bottomup link*
18:39 lb hm at least for me
18:41 ahmedelgabri joined #git
18:43 relipse2 joined #git
18:45 SimonNa joined #git
18:45 Artynok cbreak: im in the  previous commit right now I see the directories i deleted
18:46 Artynok git checkout HEAD~1
18:46 Artynok NOW HOW CAN I RESTORE FROM THIS POINT?
18:46 Artynok oow sorry caps
18:46 cbreak Artynok: then git checkout HEAD~1 -- file will restore it, as I told you
18:46 MDRXB95AP joined #git
18:47 Artynok ooh ok hold on
18:47 LeBlaaanc joined #git
18:54 csd_ joined #git
18:54 daanavitch joined #git
18:55 mwhooker joined #git
18:57 jay-m joined #git
18:57 LeBlaaanc joined #git
18:58 geekbri joined #git
19:00 lf94 joined #git
19:01 lf94 Is there a way to get git to record when a file was modified, within a changeset?
19:01 lf94 Or do any other VCSs do that?
19:02 kadoban lf94: Like you want the modification time of a specific file recorded in the commit?
19:02 lf94 kadoban, yeah :)
19:02 WayToDoor joined #git
19:02 kadoban I don't think git can do that. I don't know of any other VCS that can either.
19:02 kadoban What do you want it for?
19:03 lf94 Just adds more context to the history.
19:03 lf94 It can tell me what files I was modifying before others
19:03 fakenullie commit more often
19:03 j416 lf94: what's the use-case?
19:04 lf94 I just gave one
19:04 fakenullie why do you need it to tell what files you was modifying before the others?
19:04 j416 lf94: "more context" is not a use-case, it's an explanation of what it would give
19:04 j416 lf94: what is a problem that it solves+
19:04 j416 ?
19:04 lf94 Because normally files that were edited before another means the changes there are more "vital" than the others, since the author started there first.
19:05 LeBlaaanc joined #git
19:05 j416 I wouldn't bet on that at all.
19:05 ceaucari joined #git
19:05 lf94 That was terribly worded - files that were edited earlier
19:05 lf94 Another use case is to just go back and know what you were working on at a certain point in time, for say, a timesheet.
19:05 fakenullie lf94: just make commit after vital changes
19:05 j416 I typically start with whatever is logically good to start with and what I'm most motivated to do
19:05 fakenullie lf94: then made another commit with non-vital ones
19:06 j416 it's not necessarily the most "vital" part
19:06 lf94 Thank you for the workarounds, but I'm not looking for them :)
19:06 fakenullie we think that what you're trying to do is a workaround
19:06 fakenullie you're trying to avoiding commits for some reason
19:06 lf94 You're working around the fact there is no feature for what I've described
19:07 lf94 No, I want changesets still.
19:07 fakenullie if ti was a feature, someone would implement it
19:07 lf94 Clearly not
19:07 cbreak lf94: git doesn't have changesets
19:07 j416 lf94: you've yet to give a valid use-case, which is why it's hard for us to see why that feature would be useful
19:07 cbreak git history consists of commits, that record the author and committer time stamps, and the current state of the repository
19:08 lf94 I've given 2 use-cases that you don't like, that's ok.
19:08 cbreak lf94: nothing else
19:08 cbreak no other times
19:08 lf94 cbreak: Mmm, I thought changeset was interchangeable with commit
19:08 cbreak file meta data is limited, it does not include dates
19:08 cbreak lf94: no
19:08 stantonk joined #git
19:08 cbreak changesets is for SCMs that track change
19:08 lf94 Ok, thanks for clarification
19:08 cbreak git does not track change, it tracks state
19:09 cbreak change gets computed on demand, should you require it
19:09 cbreak i.e. for git blame, git diff, and so on
19:09 BSaboia joined #git
19:09 cbreak or at a lower level, for git repack
19:10 Sendoushi joined #git
19:11 lf94 I know there are pre and post commit hooks - is there a hook where I can insert additional data into a commit's metadata?
19:11 rominronin joined #git
19:11 lf94 Or would it just be better to modify source
19:11 rahtgaz joined #git
19:11 dsdeiz joined #git
19:11 cbreak there is a hook to format a commit message template
19:12 lf94 Mmm, I could store files' modification times there I guess...
19:12 cbreak don't try anything stupid, like committing a meta data file
19:12 lf94 (Which is a bad idea, since I'll be polluting commit messages)
19:12 fuchstronaut joined #git
19:12 LeBlaaanc joined #git
19:13 cbreak you'll pollute something
19:13 ahmedelgabri joined #git
19:13 cbreak maybe an annotated tag? :)
19:13 xall joined #git
19:13 lf94 I know what a tag is, but not annotated
19:14 lf94 Don't I have to invoke git tag manually
19:14 stantonk joined #git
19:14 lf94 Or would this be a pre-commit thing
19:14 pandeiro joined #git
19:14 lf94 (not sure about anything)
19:15 multi_io joined #git
19:15 mwhooker joined #git
19:15 bronson joined #git
19:16 d0nn1e joined #git
19:17 Tim-SEM joined #git
19:17 Tim-SEM left #git
19:17 Balliad joined #git
19:18 Balliad_ joined #git
19:20 nilsi joined #git
19:21 jost joined #git
19:22 lucasem joined #git
19:23 rgrinberg joined #git
19:24 mwhooker_ joined #git
19:25 Artynok cbreak: sorry I had to go out, but it works like charm thank you very much!!!!!!!!
19:25 editshare-ericf joined #git
19:25 cbreak no problem :)
19:25 HenriettaSalt joined #git
19:25 Artynok +10 for you help xD
19:26 ajf- joined #git
19:28 elastix joined #git
19:31 LeBlaaanc joined #git
19:36 MikeChernev joined #git
19:38 arooni joined #git
19:39 dopesong joined #git
19:41 LeBlaaanc joined #git
19:41 Gsham joined #git
19:41 mischat joined #git
19:44 ahmed_elgabri joined #git
19:45 pantsman- joined #git
19:47 LeBlaaanc joined #git
19:48 MihaiTodor joined #git
19:49 jimmybuffet joined #git
19:52 FuzzySockets joined #git
19:52 mwhooker joined #git
19:52 LeBlaaanc joined #git
19:53 Sendoushi joined #git
19:53 johnny56_ joined #git
19:55 efco joined #git
19:59 LeBlaaanc joined #git
20:00 Blkt_ joined #git
20:00 zalatovo joined #git
20:01 elastix joined #git
20:06 jstimm joined #git
20:07 nwkj86 joined #git
20:07 ochorocho__ joined #git
20:09 doebi joined #git
20:09 MattMaker joined #git
20:10 doebi how can i remove a single large file from my git repo, i accidentally checked in?
20:11 _ikke_ Last commit
20:11 _ikke_ ?
20:11 moritz !public
20:11 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
20:11 moritz !bfg
20:11 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
20:11 doebi nope older one
20:11 nettoweb joined #git
20:11 doebi i just did "git ls-tree -r -t -l --full-name HEAD | sort -n -k 4" and i cant find it anymore
20:12 doebi but my .git still has > 400MB
20:12 doebi maybe i already removed that commit, but the blob is still there. how to fix that?
20:12 moritz man git repack
20:12 gitinfo the git-repack manpage is available at http://jk.gs/git-repack.html
20:12 rominronin joined #git
20:12 moritz you also might need to expire your reflog
20:12 d4rklit3 joined #git
20:12 moritz !expire
20:12 moritz nope :(
20:13 moritz it's in man git reflog
20:13 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
20:13 MattMaker joined #git
20:14 Blkt joined #git
20:15 doebi so what exactly do i need there?
20:15 HenriettaSalt joined #git
20:15 Blkt joined #git
20:16 j416 doebi: is it a problem that it is there?
20:16 j416 doebi: it will go away eventually.
20:17 bronson joined #git
20:17 doebi i got a folder with 431MB, 429MB are in .git
20:18 j416 that doesn't answer the question
20:18 yqt joined #git
20:18 MattMake_ joined #git
20:18 doebi i want to sync that folder to a remote. and not sync useless data
20:18 doebi so yes, its a problem
20:18 liquidjamm joined #git
20:18 j416 if you push it using git, that data will not get sent
20:18 doebi i am using owncloud
20:18 xall joined #git
20:18 j416 only what is referenced by what you push will get sent
20:19 j416 I don't know what owncloud is
20:19 doebi how can it be a problem to want an organized git repo?
20:19 j416 doebi: you can clone it, that way it'd not copy any of the unreachable objects.
20:19 doebi owncloud == opensource dropbox
20:19 doebi j416: so pushing it to remote + fresh clone fixes it?
20:20 daanavitch joined #git
20:20 j416 doebi: you probably have a ton of unreferenced things anyway. If you were constantly trying to delete all of that you'd have no time left for anything else. git is built like that by design, to prevent you from loosing data.
20:20 j416 doebi: after some time, it'll expire and be garbage collected, so why bother
20:21 j416 doebi: just clone is enough.
20:21 doebi what is "some time" ? and by which rules?
20:21 j416 I don't remember
20:21 j416 some weeks/months
20:22 mdw joined #git
20:22 j416 I don't understand the second question
20:22 doebi how can i clone it if the local copy is the only one?
20:22 j416 doebi: just clone that?
20:22 zarel joined #git
20:22 purrkode joined #git
20:22 j416 be sure to copy any config
20:22 HenriettaSalt joined #git
20:22 j416 might want to clone with --mirror
20:22 j416 and hooks if you have
20:22 j416 really though, why bother with it
20:23 cdg joined #git
20:23 serapath joined #git
20:23 doebi i just did: git clone /home/user/Projects/broken fresh
20:24 LeBlaaanc joined #git
20:24 doebi and fresh/.git still has 429MB
20:24 zjaffee joined #git
20:24 j416 so you still have a reference to the commit that introduced that file.
20:24 j416 branch, tag, something.
20:24 doebi i dunno, how can i tell?
20:24 j416 git log --all -- thatfile
20:24 j416 for example
20:25 am0eba joined #git
20:26 j416 doebi: actually, I'm not sure if it just creates a hardlink to your packfile
20:27 j416 doebi: try cloning with --no-hardlinks and see if that makes it smaller.
20:27 doebi i dont get it
20:27 j416 did you understand the last thing I wrote?
20:27 doebi i dont get my repo
20:27 doebi i think i already created a new one back in the days
20:28 j416 you're going to have to be more specific than that
20:28 j416 what is the question?
20:28 doebi ~10 commits
20:28 doebi 80-100 bytes in size each
20:28 Gsham joined #git
20:28 zeroed joined #git
20:28 zeroed joined #git
20:29 j416 doebi: please try reading what I wrote, and see if that helps
20:29 LeBlaaanc joined #git
20:29 jontmorehouse joined #git
20:30 radsy joined #git
20:31 fuchstronaut joined #git
20:32 MarkyC joined #git
20:35 LeBlaaanc joined #git
20:39 LeBlaaanc joined #git
20:39 zincrokx joined #git
20:40 nnyk joined #git
20:41 doebi i dont get it
20:42 lf94 left #git
20:42 Panacea joined #git
20:43 j416 what part don't you get?
20:43 doebi is there no command to clean some useless shit out?
20:43 j416 there is.
20:43 doebi why my .git is 99%
20:43 j416 clone is probably the easiest, but you can use what was suggested above it.
20:43 doebi j416: clone changes nothing
20:43 doebi -no-hardlink is exactly the same
20:43 j416 that's not a valid option
20:44 j416 did you mean --no-hardlinks
20:44 j416 in that case, my best guess is that you still have a reference to that file
20:45 j416 doebi: did you commit it?
20:45 knutstrut Hi, what would be a good way to fork a repo with git? I have a small template for my C projects on a git repo, I don't wanna clone it. I want to just pull down the files
20:45 j416 knutstrut: you can use git archive --remote; but clone is probably easiest.
20:46 knutstrut but I don't wanna risk making changes to the git repo
20:46 j416 what do you mean
20:46 j416 ?
20:46 doebi j416: i did the pragmatic way
20:46 knutstrut j416, like accidently commit and push something
20:46 doebi deleted that objects-folder containing the data
20:46 j416 knutstrut: so don't :)
20:46 knutstrut j416, I'll try the git archive method, thanks
20:47 knutstrut j416, how do you deal with templates?
20:47 j416 knutstrut: I don't know what a template is
20:47 ajf- joined #git
20:47 knutstrut like a small boilerplate not even that
20:47 j416 ah.
20:47 dsdeiz joined #git
20:47 dsdeiz joined #git
20:47 j416 I don't have those.
20:48 nevodka joined #git
20:48 mda1 joined #git
20:48 knutstrut j416, like, http://sprunge.us/iYeQ
20:48 j416 knutstrut: if I did have such a template, I'd probably keep it in a separate repo and copy the parts of that that I need in some other project
20:48 nettoweb joined #git
20:48 j416 knutstrut: I tend to just copy parts from other projects.
20:49 dunk I've read around and tried various methods to create a patch, and then apply that patch, but I always get "patch does not apply"
20:49 j416 dunk: you need to apply it to the same thing or something that it.. well, applies to.
20:49 knutstrut j416, I see
20:50 j416 dunk: you can try passing -3 to git-apply
20:50 dunk j416: still fails :-/
20:50 dunk it's to the same code tree
20:50 j416 dunk: then I don't know. works for me.
20:50 dunk I just cocked up my repo and am having to reapply the patches to a fresh checkout
20:51 j416 sounds unncecessarily complex.
20:51 j416 what's the issue?
20:51 m0viefreak joined #git
20:52 LeBlaaanc joined #git
20:52 dunk j416: here is the patch https://gist.github.com/dunk/26​295c157224aca81838fe5fa6819be4
20:52 dunk is that format going to work with git apply?
20:52 j416 dunk: no, what is the issue?
20:52 dunk or have I got some extraneous stuff in there?
20:53 dunk j416: I had branched from other branches
20:53 dunk couldn't create a clean history to start again from
20:53 j416 dunk: use git rebase.
20:53 dunk j416: how can you rebase across branches?
20:53 j416 dunk: man git-rebase
20:53 gitinfo dunk: the git-rebase manpage is available at http://jk.gs/git-rebase.html
20:54 dunk j416: you said that my diff format is wrong. I've had this issue in the past. I am unable to do a git diff and git apply ever. What am I doing wrong in generating that patch?
20:55 j416 that's not what I said no to, I meant no, that's not what I wanted to know
20:55 dunk I see
20:55 j416 the problem is that you're going the wrong way of solving the issue
20:55 j416 but I can't help more than this without details.
20:56 dunk so "git diff HASH > some-file.patch; git apply patch;" should work?
20:56 razieliyo joined #git
20:56 dunk there's not some secret magic to remove extraneous codes from the diff?
20:57 razieliyo hi
20:57 _ikke_ A diff is a proper patch
20:57 j416 dunk: so, it seems you're not reading what I write, so I'll just stop here.
20:57 j416 razieliyo: !just_ask
20:57 gitinfo razieliyo: You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
20:57 razieliyo j416, wait, I just noticed about that git-jokes page
20:57 dunk j416: I'll look at rebase, but I can still never patch!
20:58 j416 dunk: git diff hash^..hash > file.patch && git checkout hash^ && git apply file.patch
20:58 j416 that should work
20:58 j416 next problem.
20:59 LeBlaaanc joined #git
21:00 razieliyo j416, okay, my issue was solved, I was forgetting something
21:00 j416 razieliyo: no idea what your issue even was.
21:00 razieliyo I basically was adding two remotes and wanted to sync both; forgot to do the git fetch remote1 master, git pull remote1 master
21:01 razieliyo I added two remotes via git remote add rA git@meh.git; then directly git push --all rA, wasn't working
21:01 razieliyo forgot the fetch/pull part
21:02 carif joined #git
21:02 elsevero joined #git
21:03 ceaucari joined #git
21:04 vrandkode joined #git
21:04 WaReZ joined #git
21:04 bmbouter joined #git
21:04 bmbouter oh how I love git!
21:04 bmbouter so freaking great
21:04 bmbouter ok question time
21:06 bmbouter I have a binary file in the git history of a project then a commit that deleted it, now I want to bring it back but I don't want to incur the overhead of adding the new binary back to the repo
21:06 j416 bmbouter: if it's the same file the repo will not change in size by resurrecting it.
21:06 osse bmbouter: there is no overhead.
21:06 bmbouter whoaaaaa
21:06 * bmbouter mind blown
21:07 osse if two commits contain the same version of a file then the file contents is only stored once.
21:07 osse that holds true even if the commits are years apart
21:07 bmbouter this is great
21:07 piling_ joined #git
21:07 bmbouter j416, osse thanks!
21:08 jimmybuffet joined #git
21:08 j416 bmbouter: git stores data by content, so if two files have the same content (anywhere in the repo, old or new commit), that content will only be stored once
21:08 Zeedox joined #git
21:08 j416 er.. stores data by content.. stores files by content, is perhaps a better way to put it
21:09 osse if it didn't store the data by content a lot of people would be disappointed :p
21:09 j416 haha
21:09 j416 repo would double in size for every commit
21:09 Zeedox Hi, I'm trying to write a small git script that lists all my local branches, and shows if they're tracking a remote. But I'm having trouble, since rev-parse gives me an error if @{upstream} is missing or not configured.
21:10 Zeedox How can I check if an upstream exists or is configured? I can't seem to find it in the docs.
21:10 j416 Zeedox: why not just do git branch -v
21:10 j416 er, git branch -vv.
21:10 WayToDoor joined #git
21:10 zifnab git remote -v maybe too?
21:10 acetakwas joined #git
21:11 cagmz joined #git
21:11 j416 zifnab: he said branches.
21:11 zifnab ah
21:11 zifnab nevermind
21:11 Zeedox j416: Then I'd have to parse the output, and that wont tell me if the remote is existing or not. I'd prefer to write the script with plumbing commands.
21:12 razieliyo now I do have a question: I have added two remotes with git add remote git@repo1.git and same with 2; now I'm pushing to both via git push --set-upstream remote1 master; git push --set-upstream remote2 master; is there any way to automatically push to both upstreams without having to push twice?
21:12 bmbouter j416: git will recognize the new content even at a new path?
21:12 osse Zeedox: git config branch.$branch.remote and branch.$branch.merge
21:12 j416 bmbouter: yes.
21:12 bmbouter yay
21:12 bmbouter thanks
21:12 Zeedox osse: Ah, it's a repo config?
21:13 osse yes
21:13 Zeedox osse: Thanks a lot! Which manpage would be best to read more in?
21:13 Zeedox git-config I guess
21:13 osse Zeedox: I don't think you can have an upstream branch that doesn't point to a valid ref.
21:14 Ali1 joined #git
21:14 osse i suppose the remote can stop existing suddenly...
21:14 Zeedox osse: Oh, it's quite common actually.
21:14 rominronin joined #git
21:14 IWishIKnew joined #git
21:15 drewo joined #git
21:15 Zeedox I checkout a coworkers branch, which creates a remote tracking local branch, and when my coworker deletes their branch on the remote, it will be missing.
21:16 osse Zeedox: I would use git for-each-ref. it can print the upstream, or an empty string
21:16 osse Zeedox: see this for example: https://github.com/Osse/git-​scripts/blob/master/git-brv
21:16 osse Zeedox: if you need *that* kind of validation then your only choice is to fetch
21:16 osse specifically, fetch --prune
21:18 Zeedox osse: Yeah, I fetch now and then (mostly during a pull, but eh).
21:18 Zeedox osse: I'm writing a little script to list my branches, and am adding an indicator if the branch's remote tracker is missing.
21:18 leonarth joined #git
21:19 nnyk joined #git
21:19 neanderslob joined #git
21:19 dsdeiz joined #git
21:20 boombatower joined #git
21:20 aubar joined #git
21:20 Zeedox osse: Thanks for the tip about for-each-ref upstream. I'm already using it for refname:short, so I guess adding upstream there would be natural
21:21 rahtgaz joined #git
21:21 bamb joined #git
21:22 Zeedox And then I can use rev-parse -q --verify on the upstream part. Neato.
21:24 mellernoia joined #git
21:25 Dougie187 left #git
21:26 ocbtec joined #git
21:29 LeBlaaan_ joined #git
21:30 madewokherd joined #git
21:31 WaReZ joined #git
21:32 gaen joined #git
21:32 fuchstronaut joined #git
21:34 LeBlaaanc joined #git
21:35 acetakwas joined #git
21:35 Artynok left #git
21:36 aubar joined #git
21:37 bmbouter left #git
21:38 apotry joined #git
21:38 durham joined #git
21:39 EduardoMartins joined #git
21:39 LeBlaaanc joined #git
21:39 durham joined #git
21:41 drewo joined #git
21:43 LeBlaaanc joined #git
21:44 diogenese joined #git
21:46 _28_ria joined #git
21:46 aidalgol- joined #git
21:47 mwhooker joined #git
21:47 aidalgol- joined #git
21:49 aidalgol joined #git
21:49 durham_ joined #git
21:50 durham_ joined #git
21:55 LeBlaaanc joined #git
21:55 bollullera joined #git
21:55 neilthereildeil joined #git
21:55 bamb left #git
21:55 johnmilton joined #git
21:56 neilthereildeil left #git
21:56 neilthereildeil joined #git
21:56 neilthereildeil hi
21:57 neilthereildeil when i run git diff on a commit, it says that i deleted a whole file and then re-added it with '-' before each line in red and a + before each line in green. how can i make it show me a real diff?
21:57 neilthereildeil actually i ran git show on that commit...
21:59 CheckDavid joined #git
22:01 johnmilton joined #git
22:01 stantonk_ joined #git
22:02 netj joined #git
22:05 gaen joined #git
22:08 kn-928 joined #git
22:08 ochorocho__ joined #git
22:08 bitkiller joined #git
22:08 mykespb joined #git
22:09 diogenese joined #git
22:11 fahadash joined #git
22:14 fscala joined #git
22:15 rominronin joined #git
22:18 johnmilton joined #git
22:20 greg joined #git
22:20 prsn joined #git
22:23 osse !eol
22:23 gitinfo The option/attribute to use when you need to care about different line-endings in your file: https://help.github.com/articl​es/dealing-with-line-endings/
22:23 aghalarp joined #git
22:24 osse neilthereildeil: something changed the line endings
22:24 osse neilthereildeil: does 'git diff -b' show nothing, or alternatively only the changes you'd expect?
22:25 neilthereildeil yea that works. thanks
22:26 _28_ria joined #git
22:26 crayon joined #git
22:29 ToBeCloud joined #git
22:30 BSaboia joined #git
22:31 ximvan_ joined #git
22:33 nettoweb joined #git
22:34 jimi_ joined #git
22:38 crayon joined #git
22:39 sangy joined #git
22:43 italoacasas joined #git
22:45 fuchstronaut joined #git
22:46 R34PER_ joined #git
22:47 BSaboia joined #git
22:48 aubar joined #git
22:50 FuzzySockets joined #git
22:50 mischat joined #git
22:54 medeirosthiiago joined #git
22:55 kyledr joined #git
22:57 oich joined #git
22:59 CentaurWarchief joined #git
23:00 absk007 joined #git
23:00 zjaffee joined #git
23:01 aghalarp joined #git
23:01 ximvan__ joined #git
23:04 mizu_no_oto joined #git
23:08 WaReZ joined #git
23:08 bitkiller joined #git
23:12 hahuang65 joined #git
23:17 rominronin joined #git
23:19 Synthead joined #git
23:19 bronson joined #git
23:20 ffabi joined #git
23:23 durham joined #git
23:24 aghalarp joined #git
23:25 jimmybuffet joined #git
23:25 JanC_ joined #git
23:25 neilthereildeil also, if i have a local git repo and backup git repo in another directory and i have committed changes locally, how should i backup my changes to the backup? just copy the .git folder or push or pull?
23:30 rvsjoen joined #git
23:31 knutstrut joined #git
23:35 mwhooker joined #git
23:36 ahhughes joined #git
23:37 rkazak joined #git
23:37 stantonk joined #git
23:37 ahhughes Is it valid to pull from a folder wtihin a repo, such as "git pull https://_____.com/username/myrepo.git/some-folder"   ?
23:37 stantonk joined #git
23:38 Arahael ahhughes: ex
23:38 Arahael ahhughes: example.com thanks you.
23:38 stef204 joined #git
23:40 gnoel joined #git
23:41 chris2 joined #git
23:41 ahhughes well I am using maven's SCM plugin... and the project the plugin is running on is not at the root ./  - which is causing the plugin to run the following command... cmd.exe /X /C "git pull https://bitbucket.org/username/m​y-project.git/maven-sub-project master"
23:41 ahhughes I dont know if that command is even valid or not.
23:41 serapath_ joined #git
23:42 ahhughes actually... seems very correct.
23:44 Gsham joined #git
23:44 neilthereildeil left #git
23:47 fuchstronaut joined #git
23:51 oich I'm trying to split a repo. git subtree split -P blah/asdf/fdsa -b fdsa seems to discard the path. Or, cd ../somewhere && git init && git pull ../original populates the directory with the files that were in the subdirectory without a path. Is there a way to keep the path using subtree?
23:56 arescorpio joined #git
23:59 fstd joined #git

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