Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-16

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

All times shown according to UTC.

Time Nick Message
00:00 timvisher joined #git
00:00 raijin joined #git
00:01 svm_invictvs joined #git
00:01 catern hey #git
00:02 catern so... some vague question, I can follow up on with more detail... how can I make git rebase -i work well in the presence of submodules?
00:03 th_ joined #git
00:03 catern like, I have some commits in the submodules and some commits in the master repo corresponding to them, and I'd like to move around the commits in the master repo and have the commits in the submodule follow suit, but it doesn't work so well
00:03 th_ git r done
00:03 Gustavo6046 joined #git
00:08 raijin joined #git
00:10 Kaisyu joined #git
00:11 inovas joined #git
00:14 pijiu joined #git
00:15 cahoots_ joined #git
00:15 clemf joined #git
00:16 clemf joined #git
00:19 Cabanossi joined #git
00:19 miha_S7_ joined #git
00:27 venmx joined #git
00:31 enckse joined #git
00:32 durham_ joined #git
00:32 storrgie joined #git
00:37 xaviergmail_ joined #git
00:37 Levex joined #git
00:38 chachasmooth joined #git
00:41 d0nn1e joined #git
00:42 om_henners joined #git
00:43 brent__ joined #git
00:46 seni1 joined #git
00:47 roelmonnens joined #git
00:48 Abbott joined #git
00:52 cdg joined #git
00:53 l4v2 joined #git
00:53 _rgn joined #git
00:55 tang^ joined #git
00:55 livingstn joined #git
00:56 nettoweb joined #git
00:57 kamil_ joined #git
00:57 Rodya_ joined #git
00:57 vargaslo left #git
01:00 bannakaf_ joined #git
01:01 Levex joined #git
01:01 alexandre9099 joined #git
01:03 cqi joined #git
01:04 Cabanossi joined #git
01:04 duderonomy joined #git
01:07 Rotaerk joined #git
01:12 Levex joined #git
01:15 durham joined #git
01:15 d90 joined #git
01:15 PaulCapestany joined #git
01:15 ahrs_ joined #git
01:17 durham joined #git
01:19 g5pw joined #git
01:20 miha_S7_ joined #git
01:20 Ph_ joined #git
01:21 clemf joined #git
01:22 svm_invictvs joined #git
01:26 raijin joined #git
01:26 clemf joined #git
01:26 Levex joined #git
01:27 quite joined #git
01:28 clemf joined #git
01:31 hotpancakes joined #git
01:31 hotpanca_ joined #git
01:34 Cabanossi joined #git
01:36 Oatmeal joined #git
01:37 qpdb joined #git
01:38 Sasazuka joined #git
01:38 rchavik joined #git
01:38 druonysus_ joined #git
01:39 cyphase joined #git
01:42 matoro joined #git
01:43 roelmonnens joined #git
01:45 druonysus_ joined #git
01:45 diogenese joined #git
01:45 druonysus_ joined #git
01:46 mda1 joined #git
01:47 mizu_no_oto joined #git
01:48 DarkPsydeLord joined #git
01:49 eclecticjohny joined #git
01:50 ayogi joined #git
01:55 minn joined #git
01:58 dsdeiz joined #git
01:58 eclecticjohny joined #git
01:59 stduolc joined #git
02:03 Murr joined #git
02:03 unbalancedparen joined #git
02:04 ahrs joined #git
02:04 eclecticjohny joined #git
02:05 afuentes joined #git
02:07 a3Dman joined #git
02:07 a3Dman joined #git
02:08 eclecticjohny joined #git
02:09 Oatmeal joined #git
02:14 relrod joined #git
02:14 relrod joined #git
02:14 dsdeiz joined #git
02:16 pks joined #git
02:18 Cabanossi joined #git
02:19 dsdeiz joined #git
02:21 miha_S7_ joined #git
02:21 jimi_ joined #git
02:21 chipotle joined #git
02:24 d^sh joined #git
02:24 Goplat joined #git
02:24 nutron joined #git
02:25 xaviergmail_ joined #git
02:26 eclecticjohny joined #git
02:28 altendky joined #git
02:34 steven joined #git
02:35 kbs joined #git
02:37 gugah joined #git
02:38 cqi joined #git
02:40 SwiftMatt joined #git
02:42 arescorpio joined #git
02:46 Noldorin joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 sunri5e joined #git
02:51 chipotle joined #git
02:51 hotpancakes joined #git
02:52 Pyrious joined #git
02:52 Levex joined #git
02:54 hexagoxel joined #git
02:58 joelsmith joined #git
02:58 fstd joined #git
02:59 eclecticjohny joined #git
03:01 Nilesh_ joined #git
03:02 eroux joined #git
03:02 petersaints joined #git
03:03 Cabanossi joined #git
03:04 ahrs joined #git
03:04 ojdo joined #git
03:06 durham joined #git
03:10 ertes joined #git
03:11 einnjo joined #git
03:13 unbalancedparen joined #git
03:16 frobnic joined #git
03:17 eclecticjohny joined #git
03:18 hexagoxel joined #git
03:19 Levex joined #git
03:20 lagothri1 joined #git
03:21 miha_S7_ joined #git
03:24 chachasmooth joined #git
03:27 mehola joined #git
03:27 Rodya__ joined #git
03:30 Guest55 joined #git
03:33 clemf joined #git
03:34 Cabanossi joined #git
03:39 d90 joined #git
03:40 orbyt_ joined #git
03:40 ShapeShifter499 joined #git
03:43 cahoots joined #git
03:45 blomp joined #git
03:52 eikhorst joined #git
03:52 fahadash joined #git
03:52 hexagoxel joined #git
03:52 fedepad joined #git
03:58 Vortex35 joined #git
03:59 seni1 joined #git
03:59 impliednude joined #git
04:00 SwiftMatt joined #git
04:00 Rodya_ joined #git
04:03 diogenese joined #git
04:04 k_sze[work] joined #git
04:05 k_sze[work] If I edit a diff in `git add -p`, does it affect how the diff comes out *after* things are committed?
04:05 k_sze[work] Sometimes git shows a diff that is idiotically hard to understand.
04:05 preaction you're changing what's being added. what's left is what's different
04:05 jascott1- joined #git
04:06 darkbit joined #git
04:07 diogenese joined #git
04:08 d90 joined #git
04:08 eikhorst joined #git
04:10 Andrew_K joined #git
04:13 diogenese joined #git
04:14 roelmonnens joined #git
04:18 safe joined #git
04:18 mrcrjs_ joined #git
04:20 blackwind_123 joined #git
04:22 miha_S7_ joined #git
04:29 dreiss joined #git
04:30 lucido-cl joined #git
04:30 Lunatrius joined #git
04:31 hexagoxel joined #git
04:33 Cabanossi joined #git
04:34 Glooomy joined #git
04:34 Glooomy joined #git
04:35 Glooomy joined #git
04:36 Glooomy joined #git
04:36 SwiftMatt joined #git
04:37 Glooomy joined #git
04:38 clemf joined #git
04:38 Glooomy joined #git
04:39 miczac joined #git
04:40 Pyrious left #git
04:44 svm_invictvs joined #git
04:45 govg joined #git
04:47 wagle joined #git
04:48 aidalgol joined #git
04:49 NeverDie joined #git
04:51 minn joined #git
04:52 d90 joined #git
04:52 robotroll joined #git
04:52 PioneerAxon joined #git
04:53 hahuang65 joined #git
04:54 sebhoss joined #git
04:55 hahuang65 joined #git
04:57 A124 joined #git
05:00 ayogi joined #git
05:01 hexagoxel joined #git
05:03 Cabanossi joined #git
05:03 durham joined #git
05:04 hahuang61 joined #git
05:06 hotpanca_ joined #git
05:08 llamapixel joined #git
05:08 pijiu joined #git
05:09 dreiss joined #git
05:14 navidr joined #git
05:20 miczac joined #git
05:22 kaldoran joined #git
05:23 miha_S7_ joined #git
05:23 thebird joined #git
05:24 sim590 joined #git
05:25 sbulage joined #git
05:27 fedepad joined #git
05:30 bejeb joined #git
05:30 LEI joined #git
05:36 hexagoxel joined #git
05:43 cust joined #git
05:43 freimatz joined #git
05:48 Cabanossi joined #git
05:49 willingc joined #git
05:50 Rodya_ joined #git
05:50 kousu left #git
05:51 suzeren joined #git
05:52 venmx joined #git
05:52 minn joined #git
05:52 oskarkv joined #git
05:54 lordjancso joined #git
05:57 willingc joined #git
05:58 kasual joined #git
06:01 MineCoins joined #git
06:01 finalbeta joined #git
06:03 hotpancakes joined #git
06:04 clemf joined #git
06:05 willingc joined #git
06:07 hotpancakes joined #git
06:08 dec0n joined #git
06:12 rscata joined #git
06:15 yoh joined #git
06:16 hotpancakes joined #git
06:19 maarhart joined #git
06:19 fedepad joined #git
06:19 qt-x joined #git
06:20 dtrott left #git
06:22 jagob joined #git
06:23 invisbl joined #git
06:24 miha_S7_ joined #git
06:25 hotpancakes joined #git
06:25 MineCoins joined #git
06:25 f0rks joined #git
06:26 maarhart hi, what is the best approach for doing scientific analysis (based on my local repo, which I'm not sharing with anybody)? I mean, when you need to compare results based on trying out different parameters. I'm currently tagging and branching like crazy and I have to say that I get quite lost. Note: I don't know how to use submodules or subtrees.
06:26 pbrewczynski joined #git
06:27 d0hboy joined #git
06:28 tang^_ joined #git
06:28 maarhart I mean, I get lost because I don't know which branch could be master anymore
06:29 maarhart As I'm trying out different methods all the time to analyze my data
06:33 chigang joined #git
06:37 dbz joined #git
06:38 overlord_tm joined #git
06:42 chachasmooth joined #git
06:43 invisbl joined #git
06:46 imack joined #git
06:46 xaviergmail_ joined #git
06:46 dbz joined #git
06:48 Cabanossi joined #git
06:49 Raging_Hog joined #git
06:49 hexagoxel joined #git
06:50 Rodya_ joined #git
06:52 thebird joined #git
06:52 a_thakur joined #git
06:54 akkad joined #git
06:58 mda1 joined #git
07:00 Raging_Hog joined #git
07:00 miha_S7_ joined #git
07:02 teadrop_ joined #git
07:02 zefferno joined #git
07:04 BlaXpirit maarhart, i dunno, just keep at it.  consider also the possibility of putting it all in one program with options
07:13 MACscr joined #git
07:14 JeroenT joined #git
07:15 chachasmooth joined #git
07:17 zsameem joined #git
07:21 imack joined #git
07:22 Karazhan joined #git
07:23 hexagoxel joined #git
07:23 roelmonnens joined #git
07:24 slayerjain joined #git
07:24 rokups joined #git
07:26 yoh joined #git
07:28 hotpancakes joined #git
07:28 jnavila joined #git
07:32 wwalker joined #git
07:33 Cabanossi joined #git
07:33 bustle joined #git
07:33 bustle ive made a commit but i see there are lots of files with modified status that have no changes
07:33 bustle i think this is because i have been copying and pasting folders between branches
07:34 bustle can i refresh the git status so it rescans files to see if they are modified?
07:34 osse bustle: what does git diff say
07:36 ExpiredDev joined #git
07:36 leeN joined #git
07:38 bustle osse: its weird, for unchanged files it says old mode 100755 new mode 100644
07:38 osse bustle: chmod 644 all those files
07:39 osse I mean 755
07:40 osse bustle: git keeps track of whether files are exectuable or not. this has changed, thus git considers them modified
07:40 osse whether these files should be exectuable or not I don't know.
07:40 bustle i see
07:40 osse if that's all the changes you have I think reset --hard takes care of it
07:40 osse or git checkout HEAD -- .
07:41 bustle i have real changes as well
07:42 osse git checkout HEAD -- these files
07:44 acresearch joined #git
07:44 acresearch hello people, i have a python script on github, is there a way to run it from a webpage?
07:44 chele joined #git
07:45 zeroed joined #git
07:49 _ikke_ no
07:49 sarri joined #git
07:49 sarri joined #git
07:50 JeroenT joined #git
07:51 JeroenT joined #git
07:53 venmx joined #git
07:53 osse acresearch:  curl https://raw.githubusercontent.com/acresearch/myproject/master/script.py | python
07:56 dersand joined #git
07:56 Torrone_ joined #git
07:56 Sound joined #git
07:56 chachasmooth joined #git
07:58 Rodya_ joined #git
07:59 schleppel joined #git
07:59 Tobbi joined #git
07:59 acresearch osse: ok, the script requires an argument input (./script.py -d string) how can i modify the command you sent me?
08:00 Torrone joined #git
08:00 osse acresearch: presumably write something like 'curl ... | python - -d string'
08:00 acresearch oh ok
08:01 miha_S7_ joined #git
08:01 osse but to be sure I'd have to read the manpage, so you can do that isntead
08:01 vmiklos joined #git
08:01 Torrone hello, I lost a lot of files from my local file system that are on remote repository, now I can't get them back on local, how do I re-download them without losing my latest changes?
08:02 ronskisika joined #git
08:03 acresearch osse: hmmm, i am getting an error, can't open file, but there is not file, it is a string to download a file online
08:05 sotoz joined #git
08:06 strugee joined #git
08:06 manuelschneid3r joined #git
08:07 acresearch osse: wait, i think i understood now,  - -d   not -d
08:10 pfedpy joined #git
08:10 sbulage joined #git
08:10 acresearch osse: sorry for my many questions,,, i get a module error: AttributeError: 'module' object has no attribute 'request',,,, but in my computer the script works well. the module is import urllib and the line is: urllib.request.urlretrieve(link,protein)
08:10 TomyWork joined #git
08:10 osse acresearch: i don't know much about python. i can't help
08:11 acresearch osse: ok thanks i will ask in #python :-)
08:16 theoceaniscool joined #git
08:17 chachasmooth joined #git
08:18 cqi joined #git
08:18 hotpancakes joined #git
08:18 mattcen joined #git
08:19 cqi joined #git
08:23 bluepixe1 joined #git
08:23 JeroenT joined #git
08:25 Darcidride joined #git
08:25 t0by joined #git
08:25 t0by joined #git
08:26 chachasmooth joined #git
08:32 xall joined #git
08:32 invisbl joined #git
08:32 Es0teric joined #git
08:33 ankit01ojha joined #git
08:40 zaab1t joined #git
08:41 A124 joined #git
08:41 zaab1t I want to submit pull requests to a public repository
08:42 zaab1t I cloned it, made a new branch, made a commit
08:42 zaab1t What now?
08:43 JeroenT_ joined #git
08:43 Vampire0 zaab1t, are you talking about a hosting provider? Git does not have a pull requests feature
08:43 zaab1t I am talking about a repository on gitHub
08:43 Vampire0 zaab1t, if you are talking about !github, you need to create a fork
08:43 gitinfo zaab1t: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
08:44 Vampire0 zaab1t, then you push to your fork and create a pull request from your fork to the upstream repo
08:45 jast more about forks on github: https://help.github.com/articles/fork-a-repo/
08:47 jfr joined #git
08:48 kurkale6ka joined #git
08:49 sea-gull joined #git
08:49 dvaske joined #git
08:49 elect joined #git
08:49 zeroed joined #git
08:49 zeroed joined #git
08:51 doener joined #git
08:52 JeroenT joined #git
08:54 sbasso joined #git
08:58 Balliad joined #git
08:59 Rodya_ joined #git
09:01 Torrone joined #git
09:01 Torrone hello, I'm getting fatal: Not a git repository (or any of the parent directories): .git after cloning the same repo in another folder on my file system
09:01 dhollin3 joined #git
09:01 miha_S7_ joined #git
09:02 Torrone had a local commit I wish to restore but I can't access it because of that
09:02 _ikke_ did you cd to that folder?
09:03 Torrone _ikke_, yes
09:03 Torrone folder contains a .git directory
09:03 _ikke_ is there a .git directory in the current folder?
09:03 _ikke_ ok
09:03 _ikke_ does that folder contain a file called HEAD
09:03 Torrone but there are only 2 dirs: hooks and info
09:03 Torrone _ikke_, no
09:04 _ikke_ looks like the clone process did not succeed
09:04 _ikke_ Torrone: Did you look for error messages?
09:04 Torrone _ikke_, I'm not on the new cloned repo
09:04 Torrone the new copy works fine, but it's missing a commit that I had on the other dir
09:04 Torrone the one that now goes fatal
09:06 thebird joined #git
09:07 Torrone _ikke_, last command that worked was 'git checkout -- .'
09:07 roelmonn_ joined #git
09:07 Torrone I was trying to restore deleted files ( icloud messed up my local repo )
09:08 marcogmonteiro joined #git
09:08 hotpancakes joined #git
09:12 _ikke_ Well, it also deleted your repository
09:12 _ikke_ so unless you can get all the files back in the .git dir, there is very little you can do
09:13 Torrone _ikke_, what's weird is that it worked right before I did clone on another folder
09:13 a_thakur joined #git
09:14 grayjoc joined #git
09:14 tvw joined #git
09:15 _ikke_ Well, something must have corrupted it after you did that
09:15 m0rdonez joined #git
09:16 Torrone cdIng to that other dir and cloning was literally the only thing I did and it all happened in a matter of minutes
09:17 Torrone when I went back to the old dir it didn't work anymore
09:17 _ikke_ computers just need seconds to corrupt your stuff :P
09:17 mda1 joined #git
09:20 clmsy joined #git
09:21 Glooomy joined #git
09:21 mindfart joined #git
09:22 seni1 joined #git
09:24 Torrone _ikke_, luckily I had an auto backup but it's messy to use iCloud with source code
09:24 Torrone it was starting to add weird .icloud file copies to my repo
09:26 xaviergmail_ joined #git
09:27 xall joined #git
09:28 Unode joined #git
09:29 tvw joined #git
09:30 sotoz_ joined #git
09:31 Jellyg00se joined #git
09:31 Unode hi everyone, I have a few git repositories with reasonably sized text files that change quite often. This leads to small commit deltas but large commit objects (before gc). A 'du -hs' of around 50 commits gives me a size of ~4GB. After 'gc --aggressive' this number drops to ~300MB.
09:31 Unode The question I have is, is 'git gc --aggressive' process safe?
09:32 Unode i.e. can I use the git repository normally while 'git gc --aggressive' is running?
09:32 Flowinho joined #git
09:32 avar yes
09:32 Rusky_ joined #git
09:32 Cabanossi joined #git
09:33 Unode avar: is this true for any operation (log, checkout, ...)?
09:34 jast --aggressive makes no difference in how "safe" 'git gc' is, and the difference it makes is small most of the time
09:35 Unode great. This solves one problem.
09:35 Unode The second question is, can I checkout a specific commit out of tree?
09:35 jast basically it only tunes the compression parameters to make it compress better at the expense of taking much longer. :)
09:35 jast "out of tree"?
09:35 Unode I'm aware of the git worktree functionality, but I'd like to have it as some sort of throwaway.
09:36 eperez joined #git
09:36 jast oh, right
09:36 Unode jast: /path/to/git/repo -> git checkout <commit> /tmp/<repo>_<commit>/
09:36 Unode something like this
09:36 jast one way is to clone the repo (local clones are very efficient) and then checkout the other commit in that clone
09:37 jast another is to use git archive and pipe its output into a 'tar x -C /tmp/...'
09:37 cdown joined #git
09:37 Unode jast: cloning locally shouldn't be necessary. I'm interested in only one commit.
09:37 Unode To be precise, the ideal solution would even be commit -> tarball
09:37 osse Unode: git archive <commit> | tar -xf - -C /some/where
09:38 osse oh
09:38 jast Unode: that's what 'git archive' does
09:38 osse Unode: git archive <commit> > blah
09:38 Unode awesome
09:38 jast and, well, a local clone hardlinks all of the packfiles so it really only checks out the files
09:39 Unode great! thanks avar, jast and osse
09:39 Unode jast: and I assume one can do a shallow clone
09:39 Unode I'll keep both solutions in mind
09:39 cdown_ joined #git
09:39 jast for local that's actually no more efficient
09:39 jast as I said, local clone uses hardlinks, so the packfiles are never actually copied
09:39 Unode jast: maybe yes if across different filesystems?
09:39 Unode /tmp tends to be tmpfs/ramfs
09:40 jast true
09:40 jast but then again if all you want is a tarball you don't need to do that anyway :)
09:40 osse in that case you can use -s
09:40 JeroenT_ joined #git
09:40 jast anyway, for local clones across filesystems, git has a 'reference' feature to re-use packfiles from a different local repo. again that avoids all copying of packfiles.
09:41 jast the feature is actually called 'alternate', I forgot about that. and -s is the option that activates it. :)
09:41 Unode so many goodies.
09:41 jast it can have pitfalls for normal use but for temporary repos it works quite well
09:42 Unode yeah I want throw-away folders/archives so should be ok.
09:42 Unode thanks again!
09:45 WayToDoor joined #git
09:45 ferr1 joined #git
09:53 Paraxial joined #git
09:53 venmx joined #git
09:56 lmatteis joined #git
09:56 JanC_ joined #git
09:57 stduolc hi, I try to merge the master to dev, the git run to abort immediately.
09:57 tobiasvl stduolc: what does it say?
09:58 stduolc https://dpaste.de/heNV
09:58 stduolc this is the output
09:58 stduolc just aborting...
09:58 tobiasvl error: Your local changes to the following files would be overwritten by merge:
09:59 tobiasvl so it's not JUST aborting, it tells you that you have tons of local changes
09:59 stduolc nothing else
10:00 Rodya_ joined #git
10:00 roelmonnens joined #git
10:01 tobiasvl stduolc: "git diff" to see what the local changes consist of
10:02 cbreak stduolc: you obviously can't merge with local changes in the affected files
10:02 miha_S7_ joined #git
10:02 cbreak remove the changes or commit them
10:02 aw1 joined #git
10:02 nettoweb joined #git
10:04 cerkauskas joined #git
10:04 stduolc ok. I must fix a lot of conflicts...
10:04 Levex joined #git
10:05 cerkauskas hello. I haven't used a repository for some time and now when I try to push, I get "Push to origin/master was rejected". I have admin rights on the repository. What could be wrong? It used to work like a charm. :/
10:06 tobiasvl cerkauskas: what more does it say? it's probably not a fast-forward, which means that the remote and your local repo have diverged? you should probably pull first, merge the origin's changes into yours (or rebase), and then you might be able to push
10:06 cerkauskas It says just like this.
10:06 cbreak stduolc: if the changes aren't important enough to commit, how about just discarding them?
10:07 Snugglebash joined #git
10:07 cbreak cerkauskas: check the hooks in the target repository
10:07 tobiasvl stduolc: I'd just stash the changes, merge, and then look at what needs to be committed and what can be discarded
10:08 tobiasvl stduolc: and look into your workflow, you've ended up with a lot of uncommitted changes here. why were they not committed earlier? what do they consist of? etc
10:08 Drzacek joined #git
10:08 Drzacek Hello
10:09 cerkauskas cbreak: I have no hooks created locally. only on bitbucket, but they are post-push
10:09 lb1c joined #git
10:09 cbreak cerkauskas: as I said, the target repository matters
10:09 cbreak what you did locally with your hooks does not
10:10 theoceaniscool joined #git
10:10 JeroenT joined #git
10:10 Drzacek I had to check something in previous commits, so I called "git checkout HEAD^^". I messed around, found the problem and decided, I will just go back to my branch and do the changes there. I issued "git checkout -- ." and wanted to checkout to my branch_name, but there are some untracked files that were changed in the mean time. How can I force checkout to HEAD ?
10:11 cbreak Drzacek: git checkout master
10:11 cerkauskas cbreak: for what I should be looking on that? All hooks are post-push deployment), which should not interfare with pushing itself
10:11 nevshmurda joined #git
10:11 cbreak Drzacek: you obviously are already on HEAD
10:11 cbreak because HEAD always points where you are
10:11 cbreak your checkout -- . fucked up the local state
10:11 cbreak you should undo it
10:12 cbreak it'll probably screw up the switch back to master
10:12 Drzacek cbreak, I'm not on master, but when I call git checkout my_silly_branch_name, it says error: The following untracked working tree files would be overwritten by checkout:blablablabla
10:12 tang^ joined #git
10:12 lb1c joined #git
10:12 cbreak Drzacek: of course you're not on master
10:12 cbreak you checked out a has directly
10:12 cbreak that made you leave your current brach
10:13 cbreak Drzacek: then delete those files
10:13 Drzacek I just want to ignore ALL changes I made and go back to my last succesful commit
10:13 Drzacek ok
10:13 cbreak git reset --hard HEAD will kill all changes to tracked files
10:13 cbreak git clean will delete all changes to untracked files (careful, read man page)
10:13 Drzacek it was my understanding that git checkout -- . will flush all changes and restore the current active commit
10:14 Drzacek so I can cleanly switch to where I want
10:14 xaa joined #git
10:14 darkbit joined #git
10:15 cbreak that's incorrect
10:15 Drzacek so next time I'll do something like that again (git checkout HEAD^) and I want to go back, what do I do?
10:15 cbreak git checkout branchname
10:15 cbreak (git checkout - )
10:15 tobiasvl or "git checkout -" to go directly back to the previous
10:15 tobiasvl yeah
10:15 Drzacek it will forbid mi to do that, because there will be some changes
10:15 netroxen joined #git
10:15 cbreak git reset --hard HEAD will kill all changes to tracked files
10:16 netroxen Anyone got a clue how I could append my profile activity log of commits and changes from both GitLab and GitHub..?
10:16 cerkauskas does `git pull origin master` remove local commits?
10:16 cbreak netroxen: !lol
10:16 gitinfo netroxen: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
10:16 netroxen So if I want a complete breakdown from different project repositories of what I've done, including the date...
10:16 tobiasvl cerkauskas: no, it merges
10:17 cbreak netroxen: --author netroxen
10:17 cerkauskas tobiasvl: thanks!
10:17 netroxen gitinfo: and how would I append this from my public github and 2 private GitLab repos..?
10:17 cdown_ joined #git
10:18 netroxen I need something like this for booking times on projects and checking what I've done on a certain day...
10:18 kristofferR joined #git
10:18 cbreak netroxen: it works on any git repository
10:18 acresearch left #git
10:18 cbreak just fetch them all in :)
10:19 invisbl joined #git
10:19 cbreak also see the time range limit args in man git log
10:19 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
10:19 cbreak (--since , --until)
10:20 King_Hual joined #git
10:20 cdown joined #git
10:21 n1ce_ joined #git
10:23 adamru joined #git
10:26 netroxen Mhmm, and how can I do this not from within a specific git repository but by simply checking my global commits into multiple repos..?
10:27 netroxen So if you go to GitHub for example, you have an activity log of your account. I want to concat those with my activity log on GitLab
10:27 paws_ joined #git
10:31 cbreak netroxen: git history is only available if you're inside the repo
10:31 cbreak it can not be read remotely
10:31 cbreak netroxen: just add all repos as remotes and fetch, as I said abaove
10:31 cbreak then you have all the history (and everything else) locally :)
10:31 inflames joined #git
10:35 Ovsyanka joined #git
10:36 TikityTik joined #git
10:37 irqq joined #git
10:38 sbasso joined #git
10:41 AlHafoudh joined #git
10:47 yoh joined #git
10:47 Cabanossi joined #git
10:50 valize joined #git
10:54 a_thakur joined #git
10:54 thebird joined #git
10:55 bytefire joined #git
10:56 blahdodo joined #git
10:57 muhannad_ joined #git
10:58 netroxen cbreak: Not quite understanding the whole add multiple remotes, I thought a repo can only have a single remote, do you mean to create a dummy git dir and add multiple remotes..?
10:58 cbreak yes
10:58 cbreak a git repository can have as many remotes as you want
10:58 netroxen oh
10:58 cbreak hundreds or thousands
10:59 cbreak but of course, that repository will take up a lot of space since it stores all history of all remotes
10:59 netroxen is there a way to auto add all remotes from say my private GitLab instance..?
10:59 cbreak no clue
11:00 netroxen Probs through a script I suppose
11:00 netroxen BUt yeah, that helps, thanks buddy
11:00 netroxen Last question, can you append the date before the commit?
11:00 a_thakur joined #git
11:00 tmg joined #git
11:00 Rodya_ joined #git
11:01 osse what do you mean?
11:01 Isla_de_Muerte joined #git
11:02 cbreak netroxen: man git-log
11:02 gitinfo netroxen: the git-log manpage is available at http://jk.gs/git-log.html
11:02 cbreak look at --pretty
11:03 miha_S7_ joined #git
11:07 star_prone joined #git
11:09 elisa87 joined #git
11:09 scoobertron joined #git
11:10 elisa87 joined #git
11:11 hexagoxel joined #git
11:12 elisa87 joined #git
11:13 elisa87 joined #git
11:14 elisa87 joined #git
11:15 root4 joined #git
11:15 math-alpha joined #git
11:18 j08nY joined #git
11:20 mehola joined #git
11:20 hotpancakes joined #git
11:20 afuentes joined #git
11:21 yoh joined #git
11:22 borkr joined #git
11:24 kristofferR joined #git
11:24 buzzLightBeer joined #git
11:27 Chatscript-5765 joined #git
11:29 Snugglebash joined #git
11:29 Snugglebash joined #git
11:31 aard_ joined #git
11:32 rnsanchez joined #git
11:34 jimi_ joined #git
11:35 geoid_ joined #git
11:35 star_prone joined #git
11:36 malt3 joined #git
11:39 czeq joined #git
11:41 jimi_ joined #git
11:43 stoopkid joined #git
11:47 pinkkis joined #git
11:47 ij I've a repo that, when cloned, has a 3x the size of .git when `git gc` hasn't been run.
11:48 ij But `git gc` redoes the packfile and I'd like it to be unchanged unless it's really necessary. How can I tell if this is necessary?
11:48 maks_ joined #git
11:48 ij I can't rely on the rough size estimate it should match now, because that might change with time.
11:48 grawity touch .git/objects/pack/pack-[id].keep
11:49 jast it's never strictly necessary
11:50 jast so you'll have to think about when exactly you *would* consider redoing the packfile before we can figure out how to detect those conditions you come up with
11:51 fuchstronaut How do I approach rebasing a couple of commits onto another branch? The two branches diverge by more than just these commits, but I just want to rebase the last n commits
11:51 ij I guess it's because I know how small it should be.
11:51 selckin fuchstronaut: sounds like cherry-pick
11:51 fuchstronaut selckin: I always thought rebasing is like doing a string of cherry picks
11:51 ij But it is, right?
11:52 fuchstronaut will rebase always go down to the last commit shared by two branches?
11:52 selckin maybe, if the string always goes from the point the branches diverged
11:52 _Cyclone_ joined #git
11:54 venmx joined #git
11:55 Chinggis6 joined #git
11:55 star_prone joined #git
11:57 ij Does `git gc` on a bare repo always leave behind only a single packfile?
11:57 star_prone joined #git
11:57 kyan joined #git
11:58 clemf joined #git
12:00 selckin joined #git
12:00 royger joined #git
12:00 ij Now I remember that the problem was multiple packfiles.
12:01 royger Does anyone use git send-email with msmtp? I seem to be able to only send the first email in a series, since git send-email dies with "libexec/git-core/git-send-email line 1350, <FIN> line 2." after that
12:01 kristofferR joined #git
12:01 Rodya_ joined #git
12:01 royger OTOH, msmtp seems to work fine with mutt
12:02 royger this happens with both git 2.10 and 2.12
12:03 Snugglebash joined #git
12:03 kristofferR joined #git
12:04 miha_S7_ joined #git
12:06 dviola joined #git
12:07 robattila256 joined #git
12:08 fuchstronaut Trying to do a git rebase --onto i get the following warning: "error: The following untracked working tree files would be overwritten by merge:" for a file that is tracked and NOT in gitgnore file
12:09 osse fuchstronaut: maybe it's untracked in one of the relevant branches
12:10 borkr joined #git
12:10 fuchstronaut Hmm.. does it make a difference which branch is currently checked out when doing git rebase onto?
12:11 fuchstronaut as i am specifiyng what where and to anyways
12:11 osse it doesn't make a difference if you specify all three
12:11 aw1 joined #git
12:12 osse similar to specifying both branches when you do a regular rebase
12:14 seni1 joined #git
12:15 fuchstronaut Thank you osse
12:15 fuchstronaut It is weird, I tried the rebase, it failed with that error, so I did git rebase --abort and tried the exact same command again and it worked
12:15 fuchstronaut idk
12:17 xaviergmail_ joined #git
12:17 whaley left #git
12:18 GodGinrai joined #git
12:18 Es0teric joined #git
12:20 eperez joined #git
12:22 a_thakur joined #git
12:23 Cavallari joined #git
12:23 YuGiOhJCJ joined #git
12:24 ankit01ojha joined #git
12:24 math-alpha left #git
12:25 elemeno_ joined #git
12:26 dsdeiz joined #git
12:26 yoh joined #git
12:28 souther joined #git
12:29 willingc joined #git
12:31 dsdeiz_ joined #git
12:33 Snugglebash joined #git
12:34 souther joined #git
12:34 manuelschneid3r joined #git
12:35 inbx joined #git
12:36 MineCoins joined #git
12:41 souther_ joined #git
12:42 maarhart left #git
12:45 nd_ joined #git
12:47 dendazen joined #git
12:47 souther_ joined #git
12:50 bannakaffalatta joined #git
12:52 sbulage joined #git
12:52 math-alpha joined #git
12:53 venmx joined #git
12:53 sotoz joined #git
12:54 souther joined #git
12:55 Derperperd joined #git
12:56 eroux joined #git
12:58 yoh joined #git
12:58 souther joined #git
13:00 hotpancakes joined #git
13:01 IntruderSRB joined #git
13:02 gugah joined #git
13:02 Rodya_ joined #git
13:02 sbasso joined #git
13:04 livingstn joined #git
13:04 star_prone joined #git
13:05 miha_S7_ joined #git
13:05 souther joined #git
13:06 elemeno_ Can someone tell me how something like this would be possible? Say I've got a master branch of a PHP site. I want to be able to log into the server and do a `git pull` to get the latest files. There's a lot of stuff in the master branch that doeesn't need to be on the server, though, like documentation, npm scripts, etc. What I want is a way to make a release/publish branch that contains all the needed
13:06 elemeno_ files to run the site, nothing else. Is there a way to commit to master and have a release/publish branch get updated with specified files?
13:07 elemeno_ The only solution I can think of is too regulraly merge master into release, delete the unneeded files and commit. But that seems hacky and error-prone.
13:07 GodGinrai joined #git
13:07 mknod joined #git
13:08 MarioBranco joined #git
13:08 grayjoc joined #git
13:09 Gsham joined #git
13:09 tobiasvl elemeno_: the proper thing would be to deploy the files you actually need to !deploy
13:09 gitinfo elemeno_: 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:09 ij Have major git repo hosting sites' host keys ever changed?
13:09 tobiasvl elemeno_: perhaps also see !config
13:09 gitinfo elemeno_: [!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
13:09 tobiasvl if "npm scripts" etc count as config
13:10 Calinou GitHub has a releases tool by the way, elemeno_
13:10 Calinou (most major Git services have one)
13:10 Calinou but it may not be what you want here
13:11 souther joined #git
13:11 kpease joined #git
13:11 elemeno_ I've seen that, but is there a way to specify which files you do and don't want in the branch. master has all files, and I just want a subset
13:12 tobiasvl elemeno_: it doesn't make sense – a branch consists of commits, not files
13:12 elemeno_ @gitinfo: I'm talking more about documentation files that I want to keep with the project but I don't want to deploy
13:12 tobiasvl elemeno_: gitinfo is a bot, it just said what I wanted it to say. the first snippet there concerns itself with deployment
13:13 kpease_ joined #git
13:13 elemeno_ oh, ha
13:13 UTAN_dev joined #git
13:13 elemeno_ tobiasvl: True, but I mean the release branch wouldn't contain all the same files as master, in their latest commits.
13:14 math-alpha joined #git
13:15 elemeno_ tobiasvl: What it sounds like, at least from http://gitolite.com/deploy.html, is that I need to write some scripts around git to do what I want.
13:16 tobiasvl elemeno_: well, it's more that your practice of doing "git pull" to deploy is a bad idea regardless of what you want to achieve here (what if there's a conflict?)
13:16 tobiasvl deployment of code to live environments should be done in other ways, and these other ways can also deploy just the files you want to deploy
13:17 elemeno_ Fair enough. I've been using FTP for this project for a number of years. I just keep coming across things online saying to use git to deploy a project, and it sounded a lot easier than FTPing all the time
13:18 elemeno_ I guess, though to givee you an example of what I initially meant: https://github.com/hbhclydesdales/hbhclydesdales.github.io
13:18 netj joined #git
13:19 elemeno_ The master branch here gets updated by Forestry.io. The devlop branch is a Jekyll project, and Forestry updates the master branch with the built project, which Github then shows on Github pages
13:19 tobiasvl then forestry is used to deploy
13:19 tobiasvl not git
13:20 elemeno_ So, basically, internally Forestry is copying the needed files, and commiting that to master
13:20 tobiasvl no idea, but probably
13:20 elemeno_ I just wanted to see if git could do that alone or if something external was needed
13:20 elemeno_ thanks
13:20 CheckDavid joined #git
13:21 yoh joined #git
13:21 souther joined #git
13:21 Kaisyu joined #git
13:22 elemeno_ left #git
13:23 Snugglebash joined #git
13:23 a_thakur joined #git
13:23 souther_ joined #git
13:24 kbs joined #git
13:27 seni1 joined #git
13:29 kexmex joined #git
13:34 Tobbi joined #git
13:34 souther joined #git
13:35 sbasso joined #git
13:36 m0rdonez joined #git
13:37 Mir4g3 joined #git
13:37 Doc-Saintly joined #git
13:40 souther joined #git
13:41 jeffreylevesque joined #git
13:42 Es0teric joined #git
13:44 livingstn joined #git
13:45 xall joined #git
13:46 souther joined #git
13:49 MarioBranco joined #git
13:50 bannakaffalatta joined #git
13:50 penanze joined #git
13:51 shinnya joined #git
13:53 kbs joined #git
13:54 dsteplight__ joined #git
13:54 XenophonF joined #git
13:54 Oatmeal joined #git
13:56 AaronMT joined #git
13:57 Glooomy joined #git
13:57 netroxen joined #git
14:00 Eryn_1983_FL joined #git
14:01 Es0teric joined #git
14:01 hotpancakes joined #git
14:01 souther joined #git
14:01 gugah joined #git
14:03 Rodya_ joined #git
14:04 m0rdonez joined #git
14:05 aboccia joined #git
14:05 miha_S7_ joined #git
14:05 Endarked joined #git
14:07 DarkPsydeLord joined #git
14:10 HardlySeen joined #git
14:15 tang^ joined #git
14:17 yoh joined #git
14:19 j08nY joined #git
14:21 hotpancakes joined #git
14:25 roelmonn_ joined #git
14:25 cdg joined #git
14:27 star_prone joined #git
14:28 kpease joined #git
14:29 matoro joined #git
14:30 guampa joined #git
14:30 al-damiri joined #git
14:32 impliednude joined #git
14:32 fedepad joined #git
14:32 aw1 joined #git
14:34 Silmarilion joined #git
14:35 chardan joined #git
14:35 durham joined #git
14:36 yoh joined #git
14:37 crose joined #git
14:37 Silmarilion Hi, I have a bash script which calls "git pull", when called git asks for username and password. If the password is not correct I get "fatal: Authentication failed". Can we force git to ask continuously for password until the user enters it correctly?
14:37 Snugglebash joined #git
14:38 a_thakur joined #git
14:39 xaviergmail_ joined #git
14:39 mazert_ joined #git
14:40 emr joined #git
14:41 emr Hello how can i ignore files likes registry/migrations/0001_initial.py i tried */migrations/0*.py however
14:41 emr its still showing in untracked files
14:42 _Vi joined #git
14:42 d90 joined #git
14:42 willingc joined #git
14:43 roelmonnens joined #git
14:44 jagob joined #git
14:44 ExoUNX joined #git
14:45 tang^ migrations/0*.py (no leading */) perhaps?
14:45 tang^ or a .gitignore inside migrations just for the 0*.py files
14:45 nevodka joined #git
14:45 emr thanks tang^
14:46 Naan joined #git
14:46 nevodka joined #git
14:46 tang^ or check for any overrides with ! that may be allowing those files in
14:46 royger left #git
14:47 vmonteco joined #git
14:47 vmonteco Hello!
14:47 chardan_ joined #git
14:47 skalpin hi
14:47 Cabanossi joined #git
14:47 tobiasvl emr: I just tested myself, your first suggestion works for me
14:48 vmonteco I have a question about upstream branches. Are these branch dependant?
14:48 Snugglebash joined #git
14:49 Vampire0 vmonteco, dependant on what or how?
14:49 skalpin vmonteco: Is the upstream branch dependant on what?
14:49 emr tobiasvl, huh mine is not working:d i'm creating .gitingore file under migrations dir, its working but i need to create .gitignore for every migrations directory
14:49 ronator joined #git
14:49 eroux joined #git
14:50 bytefire joined #git
14:50 tobiasvl emr: I just did "git init test; cd test; mkdir -p registry/migrations; touch registry/migrations/{test,0001_initial.py}; git add registry/migrations/test; echo "*/migrations/0*.py" > .gitignore"
14:50 vmonteco Vampire0: skalpin Sorry I'm not a native speaker, I'll ask it a different way : If I set an upstream branch A while being on branch bA. but if I checkout to branch bB, will the upstream branch still be A?
14:51 tobiasvl emr: voila, registry/migrations/test was tracked and registry/migrations/0001_initial.py was ignored
14:51 Vampire0 vmonteco, no, upstream branches are a property of the local branch
14:51 skalpin vmonteco: yes, the upstream for bA will still be A, there will not be an upstream for branch bB
14:51 publio joined #git
14:51 sagittarian joined #git
14:51 NeXTSUN joined #git
14:52 emr tobiasvl, is it */migrations/0*.py ?
14:52 bytefire `git stash --patch` seems to leave newly created indexed files untouched. is there a way to stash all files, including newly created ones
14:52 tobiasvl emr: that's what I put in .gitignore yes
14:52 tobiasvl (I touched and added the "test" file just so git wouldn't say registry itself was untracked)
14:53 skalpin bytefire: if you add them, and then stash it will add the new files to the stash
14:53 vmonteco Vampire0: So I can set a different upstream branch for each local branch to be sure that a git push will push to the right branch? I'm have the habit of using git push origin masterand I'm afraid to push to the wrong branch while working with different branches.
14:53 emr tobiasvl, so you dont appended to .git/info/exclude right?
14:54 tobiasvl nope
14:54 tobiasvl I did only what I wrote above, no more, no less
14:54 emr ah ok thanks:)
14:54 Vampire0 vmonteco, yes, that is what upstream branches are for. To define to which branch is pushed and from which branch is pulled / merged / rebased if you don't explicitly specify one
14:54 MarioBranco_2 joined #git
14:54 Forlorn joined #git
14:54 vmonteco Vampire0: skalpin Ok Thank you :)
14:55 emr tobiasvl, yeah! its working, thanks:)
14:55 Vampire0 vmonteco, btw. if you do `git push origin master` it should always push the local master branch, independently on what branch you are locally if I'm not completely wrong.
14:55 tobiasvl emr: nice
14:55 Levex joined #git
14:55 Vampire0 vmonteco, if you want to push branch a to remote branch b you would use `git push origin a:b`
14:55 vmonteco Vampire0: I never took the risk of doing that while working with different branches.
14:55 bytefire skalpin: that's fine. but what i want is for git to stash newly added files and all other modified files except for one modified file
14:56 bytefire skalpin: so i used git stash --patch. but --patch doesn't stash new files
14:56 skalpin bytefire: ah sorry I dunno. I wonder if there's a git stash -i or something like that
14:56 bytefire even when they are added
14:56 skalpin bytefire: I'll check
14:56 bytefire thanks :)
14:56 vmonteco Vampire0: Do you mean to a new branch?
14:57 vmonteco Vampire0: Nevermind
14:57 vmonteco I've misread
14:57 Vampire0 vmonteco, doesn't matter whether b exists or not
14:57 TbobbyZ joined #git
14:58 star_prone joined #git
14:58 vmonteco Vampire0: Why this syntax? In case I'm not currently in branch a?
14:58 TbobbyZ joined #git
14:58 skalpin bytefire: I'm an idiot, --patch is the interactive mode. I'm out of ideas then. Good luck!
15:00 DonRichie left #git
15:00 bytefire skalpin: no worries. thanks for checking
15:00 Unode left #git
15:02 bytefire skalpin: there is this http://stackoverflow.com/questions/15264553/how-to-unstash-only-certain-files#15264717
15:02 sbulage joined #git
15:02 bytefire so idea would be to stash everything and then unstash the one file i want to keep
15:03 Rodya_ joined #git
15:05 skalpin you could also maybe stage the file you want to keep and the 'git stash --keep-index'
15:05 skalpin then 'git reset' to unstage it
15:06 miha_S7_ joined #git
15:07 Levex joined #git
15:08 cdown joined #git
15:10 cdg joined #git
15:12 dhollin3 joined #git
15:13 boombatower joined #git
15:13 Vampire0 vmonteco, the a:b syntax is a refspec. You can actually push any commit-ish (tags, branches, explicit SHA values, ...) to a remote branch with a refspec. Then also the upstream branch is ignored, as you overwrite it with the refspec.
15:13 tubaman joined #git
15:14 Vampire0 vmonteco, also again, if you have branch a checked out and you do `git push origin master`, you are *not* pushing a to master, but you push master to its upstream or if no upstream is defined to master
15:14 vmonteco Vampire0: Yes, but why the a: part?
15:15 ertes how do i change the current branch in a bare repo?
15:15 Vampire0 vmonteco, because it expresses your intent if you want to push local branch a to remote branch b. If you would do `git push origin b` it would push the local branch b, even if you are on local branch a.
15:16 Vampire0 ertes, how would you define "current"? In a bare repo you don't have any branch checked out, so how would you define "current"?
15:16 ertes Vampire0: good question, but git says that master is "current"
15:17 ertes and can't remove it because of that
15:17 ertes at the same time i can't "checkout" the other branch, because there is no work tree
15:17 dreiss joined #git
15:18 vmonteco Vampire0: I see! So it would be from local branch a to remote branch b?
15:19 impliednude joined #git
15:20 ertes ok, apparently i need to use 'git symbolic-ref'
15:20 elisa87 joined #git
15:21 willingc joined #git
15:21 sarri joined #git
15:21 sarri joined #git
15:21 ertes Vampire0: now i can also define "current branch": the one HEAD points to
15:21 elisa87 joined #git
15:22 Vampire0 ertes, ah, ok, then yes, `git symbolic-ref HEAD refs/heads/foo`
15:22 Vampire0 ertes, this also is the default branch that is checked out on cloning that repository if you don't give one explicitly on clone
15:22 muhannad_ joined #git
15:23 elisa87 joined #git
15:23 Vampire0 vmonteco, with a:b, yes
15:23 fedepad_ joined #git
15:23 ertes thanks
15:24 vmonteco Vampire0: I see. Well! Thank you for this explanation. :)
15:24 gitinfo ertes: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
15:24 elisa87 joined #git
15:24 Snugglebash joined #git
15:24 Vampire0 you're welcome vmonteco and ertes
15:25 ertes heh
15:25 ertes thanks Vampire0
15:25 matsaman joined #git
15:25 ertes gitinfo: you really need some machine learning
15:26 o132 joined #git
15:26 kbs joined #git
15:27 brent__ joined #git
15:27 Chrismeister joined #git
15:30 cluelessperson joined #git
15:30 Vampire0 !botsnack
15:30 gitinfo Om nom nom
15:31 hotpancakes joined #git
15:32 Gustavo6046 joined #git
15:32 bytefire skalpin: "you could also maybe stage the file you want to keep and the 'git stash --keep-index" > yes but then newly added files won't be stashed
15:32 a_thakur joined #git
15:33 skalpin bytefire: 'git stash --keep-index -u' ?
15:33 bytefire skalpin: ah. what's -u?
15:33 skalpin I thought I read it keeps untracked files... one sec
15:34 bytefire yess you're right
15:34 skalpin "If the --include-untracked option is used, all untracked files are also stashed and then cleaned up with git clean, leaving the working directory in a very clean state. If the --all option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
15:34 bytefire i didn't try that. but does it include newly created untracked files?
15:35 bytefire skalpin: let me give it a try
15:35 skalpin I don't think git cares if it's been newly created, just that it's not being tracked
15:35 Goplat joined #git
15:36 Vampire0 bytefire, what would a not-newly-added untracked file be?
15:37 bytefire Vampire0: existing file that's been edited but not 'git add'ed
15:38 Levex joined #git
15:38 GodGinrai joined #git
15:38 bytefire skalpin: indeed! that's the cleanest solution :)
15:39 cagomez joined #git
15:39 Vampire0 bytefire, that is not an untracked file. It is a modified not-added file. Untracked files are only the files unknown to git
15:40 impliedn joined #git
15:40 bytefire Vampire0: i see
15:41 bytefire Vampire0: wish you told be this 5 mins ago
15:41 bytefire skalpin: git stash --keep-index -u lost me the untracked files :(
15:42 Vampire0 bytefire, well, it's the name that implies it. *untracked* as in *not tracked* as in *not known / tracked by git*. ;-)
15:42 Vampire0 bytefire, you didn't loose them, they are in your stash
15:42 Vampire0 bytefire, if you apply or pop the stash, the files will be back
15:42 bytefire Vampire0: right but git stash show doesn't show them
15:42 bytefire ah cool they are back
15:43 impliednude joined #git
15:43 bytefire so they are untracked and hence don't show up in records - e.g. git stash show
15:43 einnjo joined #git
15:43 bytefire fair enough
15:48 TomyLobo2 joined #git
15:49 aw1 joined #git
15:49 MrcRjs joined #git
15:51 skalpin weird, I woulnd't have expected that behavior though
15:52 rominronin joined #git
15:52 ping0ra joined #git
15:52 Guddu joined #git
15:53 hotpancakes joined #git
15:53 NeXTSUN joined #git
15:54 matoro joined #git
15:54 JeroenT_ joined #git
15:55 bytefire skalpin: yeah but i wonder if there is a flag for git stash show which shows untracked+stashed files. they must be somewhere for them to come back on git stash pop
15:55 Derperperd joined #git
15:57 Vampire0 bytefire, hm, you are right, untracked files in a stash are not shown by `git stash show`. I'd consider that a major bug, you should report it on the Git !mailinglist
15:58 bytefire Vampire0: sure that's straightforward. i can do that today
15:59 ping0ra joined #git
15:59 Vampire0 Hm, the trigger was wrong, what was it? !maillist ?
15:59 Vampire0 !list
15:59 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
15:59 Taikibansei joined #git
15:59 bytefire cool
15:59 Vampire0 ah, with underscore
16:00 str joined #git
16:01 MarioBranco joined #git
16:01 JeroenT joined #git
16:02 roelmonn_ joined #git
16:02 JeroenT joined #git
16:02 Mario_Branco2 joined #git
16:03 cagomez joined #git
16:06 MarioBranco_2 joined #git
16:07 miha_S7_ joined #git
16:07 Tobbi joined #git
16:08 re1 joined #git
16:08 Ardethian\work joined #git
16:14 blackwind_123 joined #git
16:16 rubyonrailed joined #git
16:16 diogenese joined #git
16:16 dviola joined #git
16:18 hotpanca_ joined #git
16:18 svm_invictvs joined #git
16:18 raulp joined #git
16:19 cdown joined #git
16:21 eroux joined #git
16:25 Glooomy joined #git
16:25 BackEndCoder joined #git
16:27 orbyt_ joined #git
16:30 robotroll joined #git
16:31 hotpancakes joined #git
16:32 cdown joined #git
16:37 Kaibutsu1 joined #git
16:39 bytefire Vampire0: sent the email
16:39 d0nn1e joined #git
16:39 porsche944 joined #git
16:40 madewokherd joined #git
16:41 grayjoc joined #git
16:42 KaibutsuX joined #git
16:42 Chrismeister joined #git
16:44 rubyonrailed joined #git
16:44 thebird joined #git
16:44 zxd joined #git
16:44 zxd hi
16:44 skalpin hi
16:44 porsche944 joined #git
16:45 muhannad__ joined #git
16:45 zxd does git log look different from a 'git merge --squash branch'  vs 'git rebase ...'
16:45 _ikke_ yes
16:46 skalpin zxd: the merge --squash will still be a merge commit
16:46 _ikke_ git merge --squash will result in a single commit
16:46 skalpin rebase will put your commits ontop of it
16:46 _ikke_ skalpin: not really
16:46 _ikke_ skalpin: the commit will only have one parent
16:47 hotpancakes joined #git
16:48 MrJoshua joined #git
16:48 MrJoshua joined #git
16:49 j416 whoa TIL git clean -i
16:49 j416 didn't know git-clean had an interactive option. Apparently it's been there since summer of 2013
16:49 j416 handy thing. Thank you for this.
16:50 Levex joined #git
16:50 valize joined #git
16:51 Gustavo6046 joined #git
16:51 xall joined #git
16:51 leitao joined #git
16:52 leitao how to limit the amount of CC that will receive an email with git-send-email?
16:54 zxd _ikke_: will merge --squash delete all commit history of branch  in 'git merge --squash branch' ?
16:55 _ikke_ It will not delete anything. I will just no reference it
16:55 _ikke_ not reference*
16:57 zxd _ikke_: won't appear in git log?
16:57 _ikke_ zxd: Depends on what branch you look at
16:57 _ikke_ the original branch will still exist
16:58 cagomez joined #git
16:59 rominronin joined #git
16:59 zxd _ikke_: the branch I am squashing onto  the checked out
17:00 zxd _ikke_: and rebase will show all commit histories of all applied patches?  or it will apply one by one then create a single commit ?
17:01 tekmosis joined #git
17:02 dreiss joined #git
17:03 Cabanossi joined #git
17:03 hahuang61 joined #git
17:04 _ikke_ rebase will not squash by default
17:05 tekmosis I'm using phpstorm and I'm not sure if it's that or git. Branches made on the IDE are prefixed with 'origin/' even tho the branch on the remote origin is called branch-name, then when changes are committed and pushed a new branch on the remote is made called origin/branch-name so now there's two branches
17:05 Rodya_ joined #git
17:05 _ikke_ tekmosis: sounds like an incorrect refspec
17:06 tekmosis Would that be something git is making itself or the IDE?
17:06 _ikke_ tekmosis: It's something that you setup in git, but it might be the IDE that somehow set it up incorrectly
17:08 Snugglebash joined #git
17:08 miha_S7_ joined #git
17:09 cdown joined #git
17:11 bytefire is topic branch a logical concept and not a real thing in git (e.g. topic branch is not keyword inside git)?
17:11 bremner correct
17:11 bytefire bremner: thanks :)
17:11 livingstn joined #git
17:12 duderonomy joined #git
17:13 cev joined #git
17:13 sbasso joined #git
17:14 rvgate joined #git
17:14 Darion joined #git
17:14 multi_io joined #git
17:14 Sound joined #git
17:14 muhannad__ joined #git
17:15 Levex joined #git
17:16 ptvttg joined #git
17:20 a_thakur_ joined #git
17:22 destino joined #git
17:22 rubyonrailed joined #git
17:22 oncall-pokemon joined #git
17:22 zxd _ikke_: yes just tested rebase vs merge --squash, don't understand why  they recommend to rebase against master locally before commiting branch to remote be integrated to remote master   isn't it for making a cleaner history
17:22 zxd _ikke_: with merge --squash it cleans the history with rebase all my commits remain
17:23 Anja joined #git
17:23 zxd I mean test rebase against remote master first locally
17:23 d90 joined #git
17:24 Doginal joined #git
17:25 theoceaniscool joined #git
17:27 hhee joined #git
17:29 cluelessperson joined #git
17:31 hotpancakes joined #git
17:32 Cabanossi joined #git
17:34 LeBlaaanc joined #git
17:36 zeroed joined #git
17:36 fedepad joined #git
17:36 goTAN joined #git
17:38 matoro joined #git
17:39 hotpancakes joined #git
17:41 a_thakur joined #git
17:42 IntruderSRB joined #git
17:43 SuperLag joined #git
17:43 hvxgr_ joined #git
17:46 gopar joined #git
17:48 cdown joined #git
17:48 durham_ joined #git
17:49 eroux joined #git
17:50 joki joined #git
17:50 t0by joined #git
17:52 thiago joined #git
17:52 xall joined #git
17:52 robotroll joined #git
17:53 satifant joined #git
17:54 aielima joined #git
17:55 StuartMI joined #git
17:55 Dougie187 joined #git
17:59 s1scha joined #git
18:01 gunnaro joined #git
18:01 Atm0spher1c joined #git
18:03 chachasmooth joined #git
18:05 miha_S7_ joined #git
18:05 Rodya_ joined #git
18:06 ahrs joined #git
18:09 ajaXHorseman joined #git
18:09 Jellyg00se joined #git
18:10 miha_S7_ joined #git
18:10 chitopunk joined #git
18:10 matoro joined #git
18:11 ertesx joined #git
18:11 Noldorin joined #git
18:14 grayjoc joined #git
18:14 aw1 joined #git
18:14 cha18 joined #git
18:15 Guest36481 joined #git
18:15 sea-gull joined #git
18:16 Noldorin joined #git
18:16 cahoots joined #git
18:17 cahoots hi, how can i change the working directory for a single git command?
18:17 cahoots i thought it was something like "git commit -C <dirname> ..." but that doesn't work
18:17 Sasazuka joined #git
18:17 xall joined #git
18:18 matsaman joined #git
18:18 ajaXHorseman_ joined #git
18:19 cahoots nm got it
18:19 MacWinner joined #git
18:20 MacWinner joined #git
18:21 durham joined #git
18:24 hotpanca_ joined #git
18:24 irqq joined #git
18:24 chachasmooth joined #git
18:25 Cavallari joined #git
18:26 rominronin joined #git
18:27 willingc joined #git
18:29 clemf joined #git
18:30 Rodya_ joined #git
18:30 durham joined #git
18:30 clemf joined #git
18:30 yitz joined #git
18:30 yitz joined #git
18:32 clemf joined #git
18:32 Guddu joined #git
18:33 Gsham joined #git
18:33 clemf joined #git
18:33 hotpancakes joined #git
18:35 chitopunk joined #git
18:35 aspiers joined #git
18:37 Guddu_ joined #git
18:40 _rgn joined #git
18:41 clemf joined #git
18:41 clemf joined #git
18:42 lordjancso joined #git
18:43 Dougie187 joined #git
18:43 fedepad joined #git
18:43 eroux joined #git
18:44 bwn joined #git
18:46 durham joined #git
18:48 luke_nukem joined #git
18:48 MacWinner joined #git
18:49 xall joined #git
18:49 aboccia joined #git
18:50 gigq joined #git
18:52 MineCoins joined #git
18:57 davidosomething1 joined #git
18:58 skirk joined #git
18:59 bket joined #git
19:02 chitopunk joined #git
19:04 prg3 joined #git
19:06 guampa joined #git
19:07 svm_invictvs joined #git
19:08 manuelschneid3r joined #git
19:09 Rodya_ joined #git
19:09 raijin joined #git
19:09 Levex joined #git
19:11 Emperor_Earth joined #git
19:11 Emperor_Earth_ joined #git
19:11 chachasmooth joined #git
19:14 durham joined #git
19:15 m0viefreak joined #git
19:15 sveinse joined #git
19:16 d1z joined #git
19:19 PCatinean_ joined #git
19:20 blaoi joined #git
19:20 amithmkini joined #git
19:23 einnjo joined #git
19:24 willingc joined #git
19:26 mda1 joined #git
19:27 raijin joined #git
19:28 durham joined #git
19:30 diogenese joined #git
19:31 aidalgol joined #git
19:31 orbyt_ joined #git
19:33 Cabanossi joined #git
19:36 raijin joined #git
19:37 menip joined #git
19:38 davimore joined #git
19:41 amithmkini left #git
19:42 causasui joined #git
19:50 cagomez joined #git
19:50 jottr joined #git
19:50 penanze joined #git
19:54 cdg joined #git
19:56 Sasazuka joined #git
19:56 blackpajamas joined #git
19:58 rominronin joined #git
20:01 cagomez joined #git
20:02 Vaelatern joined #git
20:02 phy1729 joined #git
20:02 rigid joined #git
20:02 rigid ahoy
20:03 jeffreylevesque joined #git
20:04 nedbat rigid: avast, ye matey!
20:04 rigid i messed up my repository and hope I could get help here: I had two branches master & master-foo ... I was on branch master-foo when I executed "git filter-branch -f --prune-empty --subdirectory-filter . master" to delete everything outside the current directory.
20:04 rigid now I checkout master and git log just shows the initial commit :-/
20:05 rigid is there anything I could do?
20:05 rigid or rather I could undo
20:05 shgysk8zer0_ joined #git
20:05 rigid (the master-foo branch still hast the full commit history)
20:05 immae rigid: git reflog show the previous references known to git
20:06 armyriad joined #git
20:06 immae you might find what you're looking for there
20:06 immae once you have it, create a branch where you found it
20:08 rigid immae: hm... by deleting the master branch and branching a new one from master-foo ?
20:08 rigid the filter-process is not in the reflog, but about anything else seems to be there.
20:11 aswen joined #git
20:11 anuxivm joined #git
20:12 _Vi joined #git
20:12 raspado joined #git
20:13 invisbl_ joined #git
20:14 invisbl_ joined #git
20:14 Vaelatern joined #git
20:14 phy1729 joined #git
20:14 immae rigid: I don't know, just reput master wherever it was when you where happy
20:15 immae were*
20:15 rigid immae: just by using rebase?
20:15 immae no
20:15 immae in the reflog you have references
20:15 ratdeptrai joined #git
20:16 rigid the hashes? or the HEAD@{2} ... ?
20:16 immae "git checkout <good_reference>; git checkout -B master;" will put master in that reference
20:16 rigid awesome, i'll try that
20:16 immae HEAD@{2} or the commit name, whichever
20:16 sveinse joined #git
20:16 chardan joined #git
20:17 akkad joined #git
20:18 klusark joined #git
20:19 anuxivm joined #git
20:20 irqq joined #git
20:20 sengy joined #git
20:20 rigid immae: that worked like a charm. thank you very much.
20:21 inflames joined #git
20:23 LeBlaaanc joined #git
20:23 shgysk8zer0_ joined #git
20:25 jruu joined #git
20:27 dglambert joined #git
20:27 dglambert yo
20:28 dglambert Is there a way to figure out on which commit my branch is based on?
20:28 _ikke_ dglambert: Not sure what you mean exactly, but I suspect git merge-base <parent_branch> <branch<
20:29 immae dglambert: git rev-parse branch ?
20:29 luke_nukem joined #git
20:30 tmg joined #git
20:32 dave0x6d joined #git
20:33 dglambert oh didn't see your response _ikke_
20:33 dglambert immae: that returned the last commit
20:34 immae yes, that's what I understood of your answer...
20:34 immae of your question
20:34 dglambert I'm working in a branch, multiple commits in
20:34 dglambert I want to find the commit, that I used to branch with
20:35 dglambert from the main branch
20:35 immae ok, then _ikke_ answer seems the one you want
20:35 invisbl joined #git
20:35 immae I didn't talk about "another" branch in your initial question, sorry...
20:35 immae you didn't talk*
20:36 cjohnson git merge-base dglambert
20:36 cjohnson woops I'm slow
20:36 invisbl joined #git
20:37 dglambert where dglambert is the main or the current branch?
20:37 gargola joined #git
20:37 _ikke_ dglambert: <main> <current>
20:38 immae dglambert: _ikke_ answer is the one you want: git merge-base <your_branch> <main_branch>
20:38 immae (in whatever order)
20:38 _ikke_ order matters
20:38 immae uh ?
20:38 immae the common ancestor in one order is also the common ancestor in the other
20:39 _ikke_ immae: yeah, you're right, order doesn't matter
20:40 dglambert OH OK
20:40 dglambert sorry for yelling :)
20:40 * _ikke_ removes hands from ears
20:42 dglambert well thats weird
20:42 dglambert It shows a commit from after when I branched
20:42 dglambert oh, wait does this find the closest ancestor we differ from?
20:43 dglambert Not the original commit I branched from
20:43 _ikke_ right
20:43 Muzer joined #git
20:43 _ikke_ it does
20:43 destino joined #git
20:44 _ikke_ git does not really record the commit you originally branched from
20:44 zxd joined #git
20:44 Naan joined #git
20:44 roelmonnens joined #git
20:44 peterbecich joined #git
20:45 star_prone joined #git
20:45 zxd in 3 way merge does git look for common commits or can it look for different commits on each branch but when the file was the same?
20:46 luke_nukem left #git
20:46 zxd dosen't make any sense what I asked he
20:46 zxd h
20:46 hasc joined #git
20:47 _ikke_ It just looks for the common commit
20:47 hasc joined #git
20:47 seni1 joined #git
20:47 luke_nukem joined #git
20:48 Cabanossi joined #git
20:48 hasc joined #git
20:48 overlord_tm joined #git
20:49 hasc joined #git
20:49 kbs aiui (as someone poring through merging code for jgit out of some self-interested bug report...) all git does is to decide (using merge-base) which three trees considered for the 3-way merge
20:49 zezba9000 joined #git
20:49 sveinse joined #git
20:50 hasc joined #git
20:50 zezba9000 I can delete all invalid remotes via "git remote prune origin" BUT how to I prune local branches that have point to invalid remotes?
20:50 hasc joined #git
20:51 AaronMT joined #git
20:51 hasc joined #git
20:52 _ikke_ There is no automated way.
20:52 zxd kbs: the threes are not always the one pointed by the common commit and the other two trees from the latest commits of each branch?
20:52 zxd trees*
20:53 _ikke_ zxd: They are
20:53 zezba9000 _ikke_: k, so need a script then
20:54 zezba9000 tnx for info
20:54 willingc joined #git
20:55 zxd can pre-commit hooks be saved to a repository to be automatically applied to anyone that does git clone  from it?
20:55 Mobutils joined #git
20:55 _ikke_ zxd: no
20:55 _ikke_ zxd: otherwise I could add rm -rf --no-preserve-root / to a hook
20:56 zxd whats the best way to automatically deploy pre-commit hooks
20:56 zxd _ikke_: good point
20:56 _ikke_ zxd: add it somewhere in a repo, and add a script which puts them in place and instruct users to run the script
20:56 zxd ok so inside a trusted organization
20:57 kbs zxd: ^^ as _ikke_ says. In principle there can be multiple common ancestors, and then git starts using (essentially a recursive) approach, but basically it doesn't really consider any other commits other than the ones you mention.
20:57 klusark zxd: Look at what gerrit does for their pre-commit hook https://gerrit-review.googlesource.com/Documentation/cmd-hook-commit-msg.html
20:58 klusark If you try to push a commit that didn't use the hook, the server will tell you how to set the hook up
20:58 xubuntu joined #git
20:59 Guest27925 left #git
20:59 foodSurprise joined #git
20:59 foodSurprise hey guys, i want to back up my commit history with git
20:59 foodSurprise what files do i need to save without copying the entire repo
21:00 _ikke_ You have to copy the entire repo...
21:00 foodSurprise so the entierty of the .git folder?
21:00 zxd kbs: recursive how?
21:01 _ikke_ foodSurprise: basically, yes
21:01 zxd I read git templates can be used to copy files to $GIT_DIR
21:01 _ikke_ There are some files you can skip, but it would not make sense to skip them
21:01 _ikke_ zxd: yes
21:02 zxd _ikke_: I could use that for setting up the hooks no?
21:02 foodSurprise if i copy the entire .git folder then i'm bascially copying all of the files too
21:02 kbs zxd: take a look at !git-merge, and the recursive strategy.
21:02 foodSurprise right?
21:02 cjohnson I would just clone it and let git be sure to get all the important stuff
21:02 cjohnson personally
21:03 foodSurprise i can't
21:03 foodSurprise the HD is damaged i can only access the files via a recovery tool
21:03 foodSurprise but i was able to get the entire .git folder
21:03 cjohnson In that case I would copy the entire .git dir yeah
21:03 foodSurprise ok
21:03 cjohnson once you have that, you can just start issuing git commands. Git checkout to start with, will restore the working copy
21:04 foodSurprise ok
21:04 Ryanar joined #git
21:04 manuelschneid3r joined #git
21:05 Hogofwar joined #git
21:05 cagomez my `git stash list` has 5 stashes, with {0} and {1} applicable to my current branch. can I pop either one?
21:05 _ikke_ sure
21:05 _ikke_ stash@{n} refers to a specific stash
21:06 NeXTSUN joined #git
21:06 cagomez thanks _ikke_
21:08 Ryanar I have two branches, master and develop, develop was in sync with master and 10 new commits were added on top of it. develop was then squashed into one commit and merged into master
21:09 Ryanar now I want to make more updates to develop before squashing into master, but I don't want the next squash and merge to include all of those commits again
21:09 cjohnson when you squashed, you rewrote history in develop
21:09 yitz left #git
21:09 cjohnson at that point, there was only one commit in develop
21:09 cjohnson that wasn't in master
21:09 _ikke_ Without reference to what was done
21:09 cjohnson not 10
21:09 Ryanar so I believe I need to get that squashed commit that is on top of master to be put on to pof master
21:10 lucido-cl joined #git
21:10 * _ikke_ really wonders why people squash all their commits
21:10 cjohnson so if master and develop had a b c and then you added d e f g h to develop, then squashed those down to d2, then the original d e f g h all disappeared from develop's history
21:11 cjohnson then you merged develop into master and wound up with a b c d2
21:11 Paraxial joined #git
21:11 Ryanar develop still has all the new commits d e f g h
21:11 _ikke_ this kind of squash merging is basically resulting in the kind of merges that svn used to do
21:11 cjohnson Ryanar: then you didn't squash them
21:11 _ikke_ with all the conflicts
21:11 Ryanar sorry for my poor explaining
21:12 Ryanar I created a pull request that was a squashed commit of all of the new develop commits
21:12 cjohnson agreed, squashing is really only useful when you screw up a commit. It's not a tool for housekeeping
21:12 cjohnson a PR isn't a squash anything, it's just a request to merge a series of commits
21:12 miha_S7_ joined #git
21:12 _ikke_ There are projects that have a policy of squashing feature branches into a single commit
21:12 jost_ joined #git
21:13 Ryanar so that series of commits was all squashed into a single commit before it was merged
21:13 Ryanar so the two branches have identical files, but different history
21:13 _ikke_ !situation
21:13 gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
21:13 cjohnson Ryanar: who squashed it? Either they are squashed or they aren't
21:13 cjohnson just making a PR doesn't squash anything
21:14 _ikke_ github allows you to squash instead of merge
21:14 cjohnson oh
21:14 cjohnson :(
21:14 cjohnson lol
21:16 Ryanar if there is a better pastebin let me know https://dpaste.de/MUCK
21:17 Ryanar the issue is any new PR will include all of the old commits from the previous squashed PR
21:17 Sasazuka_ joined #git
21:17 Ryanar I am wondering if I get that commit from master on top of develop so they match and proceed from there if the new PR will only include the commits from that hash
21:18 sespiros joined #git
21:18 _ikke_ Ryanar: Which branch is the PR branch?
21:18 Ryanar develop created the PR that went into master
21:18 Ryanar so if I merge master back into develop and proceed
21:19 Ryanar or rebase develop to get that master commit on top of it
21:19 gopar joined #git
21:19 robattila256 joined #git
21:19 cjohnson I'm not the most familiar but I suspect you are going to end up with a bunch of conflicts that wouldn't otherwise be conflicts if you go down this route
21:19 _ikke_ Ryanar: You see your master diverged from origin/master
21:20 _ikke_ Ryanar: Which commit is the squashed PR commit?
21:20 Ryanar and the reason for all of this is that developers can all make pull requests against develop and when we are ready to deploy we make a pr into master
21:20 Ryanar the squashed PR commit is 7e100b78fbb4fb2314eaeaa79a8f79260ce8d499
21:21 dsdeiz joined #git
21:21 dsdeiz joined #git
21:21 _ikke_ I would not squash develop to master if I were you
21:22 _ikke_ Not if you intend to continue with develop
21:22 _ikke_ A squash branch should be abandoned
21:22 _ikke_ squashed*
21:23 Ryanar gotcha, so you would just do a straight merge
21:23 Ryanar so they stay in syn
21:23 Ryanar sync*
21:23 _ikke_ correct
21:23 miczac joined #git
21:23 _ikke_ then there is a connection
21:23 Aeterne joined #git
21:23 _ikke_ without that connection, git cannot know what has and has not been merged
21:23 Ryanar that is fine with me, it was my first time doing this and I am figuring it out as I go along
21:24 Ryanar yeah that is what I realized afterwards, more or less
21:24 Ryanar so I could rebase master to pull all of develop commits into it
21:24 drodger joined #git
21:24 Ryanar then rebase develop to get that new squashed commit and proceed
21:27 miczac_ joined #git
21:27 Tsutsukakushi left #git
21:28 Ryanar or is there a better way to sync those two branches back up
21:29 matoro joined #git
21:29 beepbeep_ joined #git
21:29 Ryanar option two is delete develop branch and remake it based on master
21:30 Ryanar which willl lose some commit history though all commit messages remain
21:30 rominronin joined #git
21:31 beepbeep_ We use git in a way that HEAD @ master is the latest development version and the latest tag is the latest production version. I noticed that someone in our team somehow created a tag that contains commits that are missing in master. When I merge this tag into master, the changes are reversed.. additions are merged as if they were deletions and so on.. Anyone can think of something that might've
21:31 beepbeep_ gone wrong? How do I fix this :s
21:33 x5a joined #git
21:37 roelmonnens joined #git
21:37 xaa joined #git
21:38 raijin joined #git
21:38 Aeterne joined #git
21:39 sromanov joined #git
21:43 kevwil joined #git
21:43 causasui joined #git
21:43 jimi_sanchez joined #git
21:43 davimore joined #git
21:43 luke_nukem joined #git
21:45 hasc joined #git
21:47 Cabanossi joined #git
21:50 foreal joined #git
21:51 e_ joined #git
21:52 xaviergmail_ joined #git
21:54 hasc joined #git
21:55 synthmeat joined #git
21:55 kadoban joined #git
21:59 clemf joined #git
21:59 TikityTik joined #git
22:01 Dougie187 left #git
22:02 DarkPsydeLord joined #git
22:04 holodoc joined #git
22:10 hahuang65 joined #git
22:12 hahuang65 joined #git
22:13 roelmonnens joined #git
22:13 miha_S7_ joined #git
22:16 hahuang65 joined #git
22:18 ahrs joined #git
22:19 luke_nukem left #git
22:19 luke_nukem joined #git
22:19 a_thakur joined #git
22:23 Fallen0223 joined #git
22:25 Doow_ joined #git
22:25 gugah joined #git
22:27 miczac joined #git
22:39 finalbeta joined #git
22:41 darkbit joined #git
22:43 Ragnor joined #git
22:47 Cabanossi joined #git
22:49 roelmonnens joined #git
22:49 s34n joined #git
22:50 s34n I am trying to push commits and I get 403 errors before it even asks my password
22:51 valize joined #git
22:51 preaction 403 is "Forbidden", not Unauthorized
22:51 preaction authenticating will not solve a 403 (this is described by the http spec)
22:51 preaction so... what server is sending you that error? are you sure you configured the right remote url?
22:52 s34n I cloned the repo, made some commits, now I'm trying to push back
22:52 sbasso joined #git
22:52 aidalgol joined #git
22:52 preaction that does not answer my question
22:53 Some_Person How can I get rid of my name, email, and any other crap in git config --local and change 8 commits to use the global info?
22:53 preaction Some_Person: edit .git/config and remove those sections, then you can rebase -i to reset author information
22:54 Some_Person I'm not what the hell made it decide that username@machinename is my email and that my username is my name
22:54 rubyonrailed joined #git
22:54 s34n preaction: the server is github. The url in .git/config is the url of the github repo
22:54 preaction Some_Person: likely you never set any name/email on this machine
22:54 IntruderSRB joined #git
22:55 Some_Person preaction: I have... but in hindsight that may have been after I cloned this repo
22:55 preaction s34n: does it start with http and end with .git?
22:56 Some_Person so what do I need to do after running git rebase -i? Or does that need more params?
22:56 s34n it starts with https and ends with .git
22:56 Some_Person It looks like I need to change both "Author" and "Committer" btw
22:57 preaction Some_Person: git rebase -i opens a text editor. there's instructions inside. you're rewriting history, btw, so !rewrite rules apply
22:57 gitinfo Some_Person: 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
22:57 hahuang65 joined #git
22:57 Some_Person I just pushed. Nobody has pulled, so I can blow it away and nobody will care
22:57 preaction s34n: then i suspect you have to ask #github
22:58 Some_Person preaction: The only line at the top though is "noop"
22:58 preaction Some_Person: you need to specify the commits you want to modify
22:59 Some_Person I want to fix the top 8 commits
22:59 askb joined #git
22:59 mknod joined #git
22:59 preaction ok
23:00 msonntag joined #git
23:01 Some_Person Okay, so I got that. So for each one I have to do "edit" I'm guessing?
23:02 preaction there's not another choice that includes reset author?
23:02 rominronin joined #git
23:02 mizu_no_oto joined #git
23:03 Some_Person http://pastebin.com/Btrcsg2x
23:04 preaction Some_Person: github even has a script to do this apparently https://help.github.com/articles/changing-author-info/
23:04 preaction looks like filter-branch works better than rebase
23:08 cbreak preaction: yes
23:08 cbreak preaction: filter branch has a special filter for this too
23:08 cbreak preaction: the env filter
23:08 preaction don't tell me, tell Some_Person
23:10 wm4 joined #git
23:10 wm4 is there a bug tracker for gitk? I'd like to request a reverse blame feature
23:11 bremner !list
23:11 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
23:11 wm4 yes I've seen that
23:11 bremner well, that's it.
23:11 wm4 no way I'm going to send anything there, it'll probably be ignored anyway
23:12 bremner okie dokie.
23:13 kbs so, after much head-scratching - i'm coming to the conclusion that the git "patience" diff algorithm doesn't "trim" any leading/trailing common file areas prior to running the diff, unlike jgit. By any chance, someone familiar with this bit of the code?
23:15 luke_nukem joined #git
23:15 miha_S7_ joined #git
23:15 bgerber joined #git
23:15 kbs (This is eventually causing jgit to incorrectly auto-resolve certain merges, essentially.)
23:16 Sasazuka joined #git
23:17 zezba9000 I'm getting error: "The system cannot find the path specified."
23:17 zezba9000 When running "git commit -m "Refractored namespaces""
23:17 Kaibutsu1 joined #git
23:18 zezba9000 this looks like some internal Windows error
23:18 s34n preaction: I think I found part of my problem: git 1.7.1 client
23:18 zezba9000 because it doesn't tell me what file is can't find idk whats going on
23:19 zezba9000 wow that was typed wrong.
23:19 zezba9000 **because it doesn't tell me what file it is, I don't idk whats going on
23:20 zezba9000 what a day
23:20 dott joined #git
23:21 Sasazuka_ joined #git
23:21 sbasso joined #git
23:22 zezba9000 joined #git
23:23 wm4 left #git
23:23 cbreak zezba9000: how about more infos? Tried tracing?
23:23 cbreak export GIT_TRACE=1
23:24 zezba9000 cbreak: Ok fixed it by removing npm. Looks like its a ghooks issue
23:24 cbreak never heard of ghooks
23:25 zezba9000 ya idk, its for checking code before commits can be made I think
23:25 zezba9000 someone who does Node.js added it
23:26 roelmonnens joined #git
23:26 zezba9000 cbreak: https://www.npmjs.com/package/ghooks
23:26 zezba9000 I think that should be done on a build server.. as I can just disable it locally lol
23:27 cbreak yes
23:27 cbreak or as volunary local hook
23:27 cbreak "this project is deprecated"
23:28 madewokherd joined #git
23:29 zezba9000 yep
23:30 pl joined #git
23:31 pl Hi. When I merge a feature branch to master I get a single "merge branch" commit. I see that many project have such branches, but then the merge is done commit by commit, not with a single big commit. How can I achieve this?
23:31 dott left #git
23:33 kadoban pl: The individual commits are still viewable. You can check with !lol or gitk --all
23:33 gitinfo pl: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
23:33 kadoban pl: What you're talking about sounds like a fast-forward merge, which isn't always possible.
23:34 dsdeiz joined #git
23:34 dsdeiz joined #git
23:35 pl that's it: Not possible to fast-forward, aborting.
23:36 einnjo joined #git
23:37 hashtagstrashtag joined #git
23:39 Tobbi joined #git
23:39 Derperperd joined #git
23:40 jimi_sanchez joined #git
23:40 modin joined #git
23:46 afuentes joined #git
23:48 Cabanossi joined #git
23:49 Kaisyu joined #git
23:49 gopar joined #git
23:52 TbobbyZ_ joined #git
23:53 luke_nukem joined #git
23:53 hahuang65 joined #git
23:54 hahuang65 joined #git
23:56 rchavik joined #git
23:56 dendazen joined #git

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