Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-30

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

All times shown according to UTC.

Time Nick Message
00:00 ealfonso joined #git
00:01 romerocesar joined #git
00:01 paws_ joined #git
00:02 thiago blob SHA1 shows up in git diff too
00:09 mischat joined #git
00:11 tesuji_ joined #git
00:11 NwS joined #git
00:12 hahuang61 joined #git
00:12 hlysig joined #git
00:15 lindenle joined #git
00:23 fscala joined #git
00:27 Guest6548 joined #git
00:28 hlysig joined #git
00:28 Rodya_ joined #git
00:29 crayon joined #git
00:31 romerocesar joined #git
00:31 vbsales joined #git
00:31 aeo1ack joined #git
00:31 akushner joined #git
00:34 dreiss joined #git
00:36 raijin joined #git
00:36 tarkus joined #git
00:40 fstd_ joined #git
00:41 mablae joined #git
00:41 ForeignBiscuit joined #git
00:47 espindola joined #git
00:47 xaviergmail joined #git
00:48 ome joined #git
00:49 akushner joined #git
00:52 mwhooker joined #git
00:56 akushner joined #git
00:57 ochorocho__ joined #git
00:57 efdetonator joined #git
00:58 tomboy64 joined #git
00:59 milki git hash-object <file>
01:00 livingstn joined #git
01:01 boombatower joined #git
01:01 romerocesar joined #git
01:02 thiago also: hash-file() { (echo -ne blob `stat -c %s $1`\\0; cat $1) | sha1sum; }
01:02 thiago then you can use that shell function
01:07 hlysig joined #git
01:07 Impaloo joined #git
01:07 yude joined #git
01:16 arthurl joined #git
01:17 mingramm_ joined #git
01:18 kn-928 joined #git
01:18 ekinmur joined #git
01:19 GandalfTheWizard joined #git
01:19 Sonicbit joined #git
01:22 ajf- joined #git
01:22 edude03 joined #git
01:23 eletuchy_ joined #git
01:25 eletuch__ joined #git
01:26 arthurl joined #git
01:27 espindola joined #git
01:29 eletuchy joined #git
01:29 cqi joined #git
01:31 Impaloo joined #git
01:32 durham joined #git
01:32 romerocesar joined #git
01:32 eletuchy_ joined #git
01:34 eletuch__ joined #git
01:36 eletuchy joined #git
01:38 mingrammer_ joined #git
01:38 fission6 joined #git
01:38 Vaelatern joined #git
01:39 mingrammer_ joined #git
01:39 eletuchy_ joined #git
01:40 mingrammer_ joined #git
01:40 inflames joined #git
01:40 pks joined #git
01:41 mingrammer_ joined #git
01:41 eletuch__ joined #git
01:42 mingrammer_ joined #git
01:46 eletuchy joined #git
01:46 nettoweb joined #git
01:46 mingrammer_ joined #git
01:46 ahr3n_ joined #git
01:46 Mateo_W joined #git
01:46 jaguarmagenta joined #git
01:46 eletuchy_ joined #git
01:46 stantonk joined #git
01:48 grassass joined #git
01:49 eletuchy joined #git
01:51 romerocesar joined #git
01:52 eletuchy_ joined #git
01:52 Vinnie_win_d joined #git
01:52 dreiss joined #git
01:53 fracting joined #git
01:54 eletuch__ joined #git
01:57 eletuchy joined #git
01:59 SwiftMatt joined #git
01:59 ochorocho__ joined #git
01:59 Guest6548 joined #git
02:00 shgysk8zer0 joined #git
02:01 eletuchy_ joined #git
02:01 stantonk joined #git
02:02 sangy joined #git
02:04 eletuchy joined #git
02:05 ahr3n joined #git
02:06 eletuch__ joined #git
02:08 eletuchy_ joined #git
02:09 eletuchy joined #git
02:10 Goplat joined #git
02:11 earational joined #git
02:11 raijin joined #git
02:11 eletuch__ joined #git
02:13 hahuang61 joined #git
02:13 earational hey
02:15 eletuchy joined #git
02:15 edude03 joined #git
02:16 bobdobbs joined #git
02:16 eletuchy_ joined #git
02:17 lindenle joined #git
02:18 edude03 joined #git
02:18 lamba joined #git
02:19 lamba if i want to checkout a specific commit of a specific branch, with no back history, into an existing non-empty dir. Is there a quick way to do that ?
02:20 eletuchy joined #git
02:20 dmto joined #git
02:23 justanotheruser joined #git
02:23 prefix joined #git
02:23 eletuchy_ joined #git
02:23 f3r70rr35f joined #git
02:25 eletuch__ joined #git
02:28 fracting joined #git
02:28 dingus joined #git
02:30 drose379 joined #git
02:31 drose379 If I create a branch, and edit a file. Then that file is also edited on another branch, and I pull from that branch, what will happen to the file I edited?
02:31 drose379 Will the other changes be merged with my changes?
02:32 crose joined #git
02:32 hexagoxel joined #git
02:37 maestrojed joined #git
02:38 chid joined #git
02:38 Sonderblade joined #git
02:40 chachasmooth joined #git
02:40 akiva joined #git
02:41 eletuchy joined #git
02:42 chid_ joined #git
02:44 aidalgol joined #git
02:45 whomp joined #git
02:50 chigang_ joined #git
02:54 Neobenedict joined #git
02:54 Neobenedict hi guys
02:55 Neobenedict i did git pull, there were conflicts
02:55 Neobenedict then i tried to undo that by doing git reset head@{1}
02:55 Neobenedict that messed up my status further
02:55 Neobenedict then tried git reset head@{0} and git reset
02:55 Neobenedict i have no clue how to undo all of this
02:56 rewt try:  git reset --hard remotes/origin/branchname
02:56 rewt make sure it's the same remote branch as the one you're on
02:57 rewt git status to check
02:57 Neobenedict that has got rid of all the deleted/modified but there are now new untracked files
02:57 ahr3n joined #git
02:57 Neobenedict the untracked files occured from one of the previous commands, not that one
02:58 rewt that reset your working dir to what the remote has in the branch ... you can delete those untracked files
02:58 mischat joined #git
02:58 rewt well, not what the remote has, but what's in the commit pointed to by the remote branch
02:59 Neobenedict right it now looks like it did
03:00 ochorocho__ joined #git
03:00 Neobenedict going to let someone more experienced fix that merge issue before pulling again
03:00 Neobenedict thanks
03:02 rewt conflicts will happen if both sides modified the same file(s) in the same place(s)... just resolve and commit
03:04 aavrug joined #git
03:04 f3r70rr35f joined #git
03:04 ealfonso joined #git
03:04 watabou joined #git
03:05 aavrug joined #git
03:06 rubyonrailed joined #git
03:07 tesuji joined #git
03:09 arthurl joined #git
03:12 tristanp joined #git
03:14 xaviergmail joined #git
03:15 ealfonso joined #git
03:15 zivester joined #git
03:21 k3rn31 joined #git
03:31 stantonk joined #git
03:37 whomp joined #git
03:41 MattMaker joined #git
03:46 jaguarmagenta joined #git
03:50 david007 joined #git
03:58 robotroll joined #git
03:59 chrisshattuck joined #git
04:00 ochorocho__ joined #git
04:01 barteks2x joined #git
04:02 ajf- joined #git
04:05 jab416171 joined #git
04:05 dmto joined #git
04:06 eletuchy joined #git
04:09 whomp joined #git
04:10 ajf- joined #git
04:12 mehola joined #git
04:12 romerocesar joined #git
04:14 kriskropd joined #git
04:14 hahuang61 joined #git
04:15 f3r70rr35f joined #git
04:19 lindenle joined #git
04:22 thiago joined #git
04:23 nilg joined #git
04:24 romerocesar_ joined #git
04:30 oich joined #git
04:31 pR0Ps joined #git
04:32 fracting joined #git
04:33 nnyk_ joined #git
04:34 whomp joined #git
04:35 chrisshattuck joined #git
04:36 fscala joined #git
04:39 ajf- joined #git
04:40 zumba_addict joined #git
04:41 tristanp joined #git
04:44 ajf- joined #git
04:44 zumba_addict joined #git
04:45 dmto joined #git
04:45 ctpr joined #git
04:45 skylite joined #git
04:46 elsevero joined #git
04:46 mischat joined #git
04:49 zumba_addict joined #git
04:52 subhojit777 joined #git
04:56 oich joined #git
04:59 Cabanossi joined #git
05:00 quetz joined #git
05:00 whomp joined #git
05:01 inflames joined #git
05:01 ochorocho__ joined #git
05:05 oich joined #git
05:07 oich in the man page for subtree, in an example of using split, is there a reason that the repo that split subtree is pushed to is created with --bare?
05:08 kadoban oich: Pushing to non-bare repositories is generally a pretty terrible idea. You have to consider what it is supposed to do to whatever is checked out when the ref that is HEAD is now something else.
05:09 romerocesar joined #git
05:09 oich kadoban ah ok that makes sense
05:11 d4rklit3 joined #git
05:15 hahuang61 joined #git
05:17 piattino joined #git
05:20 psprint How to download (via clone) all branches?
05:23 sauvin joined #git
05:24 romerocesar joined #git
05:28 stuh84 joined #git
05:30 ajf- joined #git
05:33 sostenuto joined #git
05:34 stantonk joined #git
05:35 ojacobson clone.
05:35 ojacobson git-clone creates cached copies of all branches automatically (as 'origin/foo')
05:40 phanimahesh joined #git
05:41 GandalfTheWizard joined #git
05:42 ThomasLocke_ joined #git
05:44 Raging_Hog joined #git
05:46 hahuang61 joined #git
05:47 whomp joined #git
05:47 jaguarmagenta joined #git
05:48 PCatinean joined #git
05:48 qt-x joined #git
05:49 nwkj86 joined #git
05:51 phanimahesh joined #git
05:53 whomp joined #git
05:54 jchonig joined #git
05:54 eletuchy joined #git
05:55 d5sx43 joined #git
05:55 Andrew_K joined #git
05:56 rscata joined #git
05:56 afuentes joined #git
05:56 ahmedelgabri joined #git
05:57 cyphase joined #git
05:59 cdown joined #git
05:59 TomyLobo joined #git
06:00 Codfection joined #git
06:00 GandalfTheWizard joined #git
06:02 zumba_addict joined #git
06:02 ochorocho__ joined #git
06:03 whomp joined #git
06:04 mingrammer_ joined #git
06:04 waveclaw joined #git
06:06 armyriad joined #git
06:06 zeroed joined #git
06:06 zeroed joined #git
06:07 romerocesar joined #git
06:07 kutsuya joined #git
06:10 cyphase joined #git
06:10 eletuchy joined #git
06:10 nwkj86 joined #git
06:12 cdown_ joined #git
06:13 jatin30 joined #git
06:13 Scisk joined #git
06:15 jatin30 I am getting this error https://bpaste.net/show/b43427c5359c . I tried to visit that url from my browser and It is working but its not able to access from terminal, cant understand the possible reason
06:15 thiago jatin30: there's only one test in the paste
06:16 thiago the remote denied access to user woote with the password you supplied
06:16 jatin30 thiago, yes what do you need?
06:16 thiago nothing
06:16 jatin30 ohh
06:16 Sucks joined #git
06:16 thiago first of all, check if the URL is correct. Are you supposed to push over https, instead of SSH?
06:16 thiago second, check if your username is correct
06:17 jatin30 thiaog, I changed my github username yesterday Is it something to do with it?
06:17 thiago and third, check if your user has push access there
06:17 thiago no clue
06:17 roknir joined #git
06:17 thiago in the first step: check if you have the right hostname too
06:17 thiago are you sure GNOME accepts pushes to GitHub?
06:17 thiago shouldn't you push to git.gnome.org?
06:17 Sucks joined #git
06:18 Sucks joined #git
06:18 zarubin joined #git
06:18 jatin30 how do I push to git.gnome.org?
06:18 nwkj86 joined #git
06:19 thiago same command: git push <remote> <refspec>
06:19 thiago what the remote URL should be, please check with your GNOME admin
06:19 jstein joined #git
06:21 elsevero joined #git
06:21 jknetl joined #git
06:21 jatin30 thiago, ok so I pushed it successfully to my remote repo which was exactly the intention. But I have a doublt, I name my remote as "fpro", when I use the URL of my remote it works fine but when I use "fpro" instead of URL it does not work. Why is that? Because I think it should work
06:22 thiago pastebin the two uses
06:23 thiago I can't tell what's different from your description
06:23 dminca joined #git
06:23 jatin30 https://bpaste.net/show/9a009ae30898
06:23 dminca joined #git
06:24 whomp joined #git
06:24 thiago jatin30: the URLs are different
06:24 jatin30 thiago, yes
06:24 jatin30 I noticed that
06:24 jatin30 but I used remote add frpo for my remote repo
06:25 arthurl joined #git
06:25 thiago did it succeed?
06:25 lindenle joined #git
06:25 jatin30 it?
06:25 thiago did adding the remote succeed?
06:25 jatin30 yes
06:26 thiago ok
06:26 jatin30 How can I check what URL fpro points to?
06:26 thiago git remote -v
06:26 thiago but I can tell from the git push output that the URL you added is not https://github.com/woote/Repo1.git
06:26 jatin30 yes
06:26 oich after subtree split the path that was split is still in the original repo. should I just delete that path or is there something else to do?
06:27 jatin30 thiago, https://bpaste.net/show/43eaa16dbf77
06:27 oich delete meaning git rm
06:27 thiago jatin30: ok, so we know that you can't push to that fpro repo
06:27 jatin30 fpro points to the remote I cloned from and origin points to my remote repo
06:27 thiago jatin30: could be, yes
06:28 jatin30 so it should have been git push origin <remoteBranch>
06:28 jatin30 instead of git push fpor <remoteBranch>
06:28 jatin30 Thiago, thanks buddy
06:28 jatin30 thiago, can I dm you?
06:28 psprint ojacobson: : just tested it, branches aren't loaded. However git pull did download the additional branch. Too bad I could add "--all" to git pull
06:29 eletuchy joined #git
06:29 psprint s/could/couldn't/
06:30 psprint git pull --all  https://github.com/psprint/zkl2.git -> "fatal: fetch --all does not take a repository argument"; How to add "--all" to pull? I've tried a few cases
06:32 psprint or rather not, git pull alone doesn't do download
06:34 eletuchy joined #git
06:34 mischat joined #git
06:35 JeroenT joined #git
06:35 zarubin psprint: Try git fetch --all. This command will download changes from all remotes. And than you can pull needed changes into you branch.
06:36 zumba_addict joined #git
06:38 ahmedelgabri joined #git
06:40 oich oh... after subtree split the new branch has the split off path removed
06:41 ShekharReddy joined #git
06:42 inflames joined #git
06:44 Alienpruts joined #git
06:47 Sceorem joined #git
06:48 liranp joined #git
06:49 Brain joined #git
06:54 encod3 joined #git
06:55 oich but, I can't merge the new branch into master because of unrelated histories. should I delete master and rename the new branch to master?
06:55 stonerfish joined #git
06:55 nnyk_ joined #git
06:57 mingrammer joined #git
06:57 eletuchy_ joined #git
06:58 TomyWork joined #git
06:58 mariuscc joined #git
06:58 mkoskar joined #git
07:01 Silenced joined #git
07:01 eijk joined #git
07:03 ochorocho__ joined #git
07:03 romerocesar joined #git
07:03 Scisk joined #git
07:04 Luda_ joined #git
07:05 whomp joined #git
07:06 Oebele joined #git
07:06 dreiss joined #git
07:06 liuzhen_ joined #git
07:08 _kreo joined #git
07:12 shgysk8zer0 joined #git
07:12 shgysk8zer0 joined #git
07:13 cbreak oich: you can do that, but it's history rewriting
07:14 MrMojito joined #git
07:14 MrMojito joined #git
07:14 pR0Ps joined #git
07:16 [Brain] joined #git
07:18 oich cbreak ok I guess git rm + a comment that it's deleted after split is a way to remove the path and track the change
07:19 whomp joined #git
07:20 Silenced joined #git
07:20 elastix joined #git
07:21 ahmedelgabri joined #git
07:21 Luda_ Hi there. I have changed some file permissions in my repository. However, I don't want git to care about that. What would be the best way to tell git that the permission changes never happened (without reverting them)? I was thinking about --assume-unchanged but if I want to keep tracking changed to the file I have to 'unassume' and that would again bring up that changed permissions as modifications.
07:22 selckin git already doesn't care about permissions except +x
07:22 ome joined #git
07:22 _ikke_ !assume
07:22 gitinfo [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
07:23 gosti joined #git
07:24 JeroenT joined #git
07:24 GavinMagnus joined #git
07:24 xall joined #git
07:25 djb-irc joined #git
07:25 demiro joined #git
07:27 Luda_ _ikke_: Would it be a better solution to somehow untrack the files, change the file permission and then track them again?
07:27 _ikke_ That would not change anything
07:27 _ikke_ Can't you once just commit the permission changes?
07:28 Luda_ I don't want to permission changes propagated to remote
07:28 Luda_ don't want *the..
07:28 _ikke_ You mean the executable bit?
07:28 Luda_ it's also the write bit
07:28 Luda_ for groups
07:29 Fijit joined #git
07:29 _ikke_ git doesn't touch these
07:30 whomp joined #git
07:30 Luda_ you mean git doesn't notice if I change read or write bits for a file?
07:31 canton7 correct: git only cares about the executable bit
07:31 _ikke_ Luda_: No, like selckin says, git only looks at the +x bit
07:31 Luda_ Ah, that is a helpful piece of information. I can just revert the permission changes and set the write bits where I need them.
07:32 romerocesar_ joined #git
07:32 Luda_ I admitt that I was so lax and did the old 777 ^^
07:32 ToBeCloud joined #git
07:33 kisonecat joined #git
07:33 selckin find -type f -exec chmod go+w {} \;
07:33 selckin find -type d -exec chmod go+wx {} \;
07:33 Fijit2 joined #git
07:33 selckin proper way to fuck shit up
07:33 Luda_ thanks guys :)
07:36 stantonk joined #git
07:38 imjacobclark joined #git
07:38 mripard joined #git
07:40 rubyonrailed joined #git
07:40 mripard hi
07:40 gitinfo mripard: 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.
07:40 mripard I have an interesting issue with a git repo
07:41 mripard (and by interesting, I mean defeats my whole understanding of git)
07:41 Gonzo89 joined #git
07:41 mripard on that repo https://github.com/NextThingCo/CHIP-linux/
07:41 mripard you have two branches
07:41 mripard nextthing/4.3/chip and nextthing/4.4/chip
07:42 mripard if you do "git diff nextthing/4.3/chip nextthing/4.4/chip  -- sound/soc/sunxi/sun4i-codec.c"
07:42 mripard the output is http://code.bulix.org/cj1q2a-102900?raw
07:43 mripard the copyright notice, the SNDRV_PCM_RATE stuff, the owner field that is dropped are expected changes
07:43 mripard however, the removal of the three SND_SOC_DAPM_* are not
07:43 mripard and this is where it gets interesting
07:43 saunamees joined #git
07:43 mripard if you use git log -p on those branches, with that path
07:44 mripard so something like git log -p nextthing/4.4/chip -- sound/soc/sunxi/
07:44 mripard you get only a commit that adds those changes
07:44 mripard on both branches
07:44 romerocesar joined #git
07:44 Balliad joined #git
07:45 saunamees Hi I am using git and I have a remote repository, but it is a bare repository(no .git). Now when I mirror it, I cannot do any git status or anything, I am not sure how to use bare repos ... I cannot see branches or anything, it just says not a repo
07:45 tvw joined #git
07:45 mripard (755cfb2de3d7 on 4.3, d1b0ef355738 on 4.4)
07:45 grawity maybe you didn't mirror it completely
07:45 grawity what files does it have?
07:45 mripard but you never get a commit that removes those lines
07:46 saunamees the files are identical on remote and local
07:46 grawity but what files does it have?
07:46 grawity run `tree -a` on it, pastebin
07:46 selckin mripard: cloning the repo (slowly)
07:46 jceb joined #git
07:46 pvinis joined #git
07:47 hide joined #git
07:47 saunamees I don't have this command tree
07:47 mripard selckin: yeah, it's big repo :/
07:47 emPi joined #git
07:48 multi_io joined #git
07:48 pvinis hello. i have a dev branch and the master branch. i have many branches merging into dev, and i would like to now merge some of them into master, but not all. basically i would like to merge dev into master but not everything.
07:48 jaguarmagenta joined #git
07:48 pvinis what would be the best way to go about doing that?
07:48 grawity pvinis: merge them individually to master
07:48 pvinis but its also some commits in dev that i should cherry pick too
07:49 pvinis and also, its more than 300 commits, so one by one might not be the best option..
07:49 saunamees here is the tree: http://dpaste.com/14YY36Z
07:50 grawity looks okay
07:50 pvinis could i do a diff between master and dev, and then see the changes, and when i see a change i dont want, exclude it from the diff? until im left with only things i want?
07:50 grawity saunamees: what does a `git show-ref` print?
07:50 mikecmpbll joined #git
07:50 grawity pvinis: while technically possible, it'll make it a pain to actually merge those excluded branches later
07:50 saunamees shit show-ref = nothing, git status = "fatal: This operation must be run in a work tree"
07:51 pvinis or could i somehow merge interactively or rebase or something? so i get asked about each commit and each merge commit?
07:51 grawity I don't care about `git status`; it's a bare repo, of course `git status` isn't going to work.
07:51 grawity as for `git show-ref`... yeah, I just noticed the `tree` output doesn't actually list any refs, either
07:51 pvinis grawity: hm..
07:51 grawity nor, for that matter, any objects.
07:51 JeroenT joined #git
07:51 grawity it's an empty repo that you have
07:51 whomp joined #git
07:52 saunamees well how does one use empty repos ? I just want to develop, push, commit, etc
07:52 grawity one does the development in a non-bare repo
07:52 grawity don't "mirror" the remote repo. there's no need for that.
07:53 grawity just plain `git clone` the remote URL
07:53 freimatz joined #git
07:53 grawity doing the opposite (`git init; git remote add origin <remote_url>`) also works
07:54 saunamees so it is correct that when I just clone, it is a empty directory ?
07:55 grawity yes
07:55 grawity well, if you've just set it up, probably
07:55 grawity I don't know what it should have been, it's your repo after all
07:55 saunamees oh okay, Thanks for the information. This bare thing confused me alot. It should be empty repo set up by someone else for me to use
07:55 malide joined #git
07:56 k-man joined #git
07:56 grawity ok, so clone (or init+remote add), do your work, commit, push
07:57 kisonecat joined #git
07:58 kedare joined #git
07:59 grawity also, run `tree -a` in that "empty directory" after cloning
07:59 grawity I don't care about output, you're going to see for yourself
08:00 dmto joined #git
08:01 gosti left #git
08:01 mikecmpbll joined #git
08:02 JeroenT joined #git
08:02 djb-irc joined #git
08:02 kurkale6ka joined #git
08:03 Kicer86 joined #git
08:03 ochorocho__ joined #git
08:04 qt-x joined #git
08:05 whomp joined #git
08:07 atenart joined #git
08:10 ahmedelgabri joined #git
08:11 liuzhen_ joined #git
08:15 selckin mripard: i don't understand either, but i guess the question can be simplified to why git log -p is not showing all changes
08:15 t-mart_ joined #git
08:16 watabou joined #git
08:16 mripard selckin: indeed
08:16 martinkl_ joined #git
08:17 demiro joined #git
08:18 r_s_o joined #git
08:19 mripard hmmm, git log -p -c actually shows the lines being removed in the merge commit
08:19 garethdaine joined #git
08:20 dmto joined #git
08:20 ocbtec joined #git
08:20 demiro joined #git
08:20 mripard but I don't really understand what it does
08:21 mripard so, yeah, ok, the merge commit was bad
08:23 eletuchy joined #git
08:26 JeroenT joined #git
08:26 lindenle joined #git
08:28 marcogmonteiro joined #git
08:28 afuentes joined #git
08:29 saunamees Thanks for help grawity. Is there some tool that I can set up locally that is similar to github - I cannot use it (Security reasons). I primarily want the tasks thing
08:29 grawity primarily for the issues/pull requests?
08:30 grawity I think both Gogs and GitLab have those
08:30 saunamees I like the issue tracker in github
08:30 NwS joined #git
08:30 troulouliou_div2 joined #git
08:30 phanimahesh joined #git
08:31 saunamees and wiki
08:31 inflames joined #git
08:31 nilg` joined #git
08:32 absk007 joined #git
08:32 saunamees Oh, gitlab seems like a good choice
08:33 xao joined #git
08:33 rolha joined #git
08:35 Beams joined #git
08:36 JeroenT joined #git
08:40 ahmedelgabri joined #git
08:41 martinkl_ joined #git
08:42 TomyWork wtf git, "git gc" just made my .git bigger... 590M -> 678M
08:43 fuchstronaut joined #git
08:43 grawity git prune
08:43 absk007_ joined #git
08:44 grawity gc never packs 'garbage' objects, it leaves them loose
08:44 selckin git-minimize= git reflog expire --expire=now --all; git gc --prune=now
08:44 TomyWork nah i want to keep my reflogs
08:45 a3Dman joined #git
08:45 TomyWork i just want to send this to a colleague :)
08:45 TomyWork my .git directory with all of its git-svn stuff in it
08:45 absk007_ joined #git
08:45 whomp joined #git
08:46 Scisk joined #git
08:49 PHPanos joined #git
08:51 TomyWork grawity git prune brought it down to 574M
08:53 mehola joined #git
08:54 JeroenT joined #git
08:55 ocbtec joined #git
08:55 romerocesar joined #git
08:56 JeroenT joined #git
08:58 Corosauce joined #git
08:58 JeroenT joined #git
08:58 _geoff_ joined #git
08:59 ocbtec joined #git
08:59 cdown joined #git
08:59 Kaisyu2 joined #git
09:00 mage__ joined #git
09:00 shgysk8zer0 joined #git
09:01 joki- joined #git
09:01 e-dard_afk joined #git
09:01 Robdgreat_ joined #git
09:02 chachasmooth_ joined #git
09:02 qt-x joined #git
09:02 absence_ joined #git
09:03 jbondhus_ joined #git
09:03 warthog19 joined #git
09:03 Lewix_ joined #git
09:03 ybden- joined #git
09:04 jludwig joined #git
09:04 preaction_ joined #git
09:04 jamesd_ joined #git
09:04 BeerSerc_ joined #git
09:04 progrock joined #git
09:04 Garen_ joined #git
09:05 lamba_ joined #git
09:05 bedouin_ joined #git
09:05 croberts_ joined #git
09:05 PCatinean joined #git
09:05 mutex__ joined #git
09:06 freimatz joined #git
09:06 romerocesar joined #git
09:06 loglaunc- joined #git
09:07 duotang joined #git
09:07 sarbs_ joined #git
09:07 [Ben] joined #git
09:07 jonha_ joined #git
09:07 JeroenT joined #git
09:07 blackwell_ joined #git
09:08 martinbjeldbak_ joined #git
09:08 M-shine1 joined #git
09:08 notebox joined #git
09:08 constantinexvi joined #git
09:09 thejoecarroll joined #git
09:09 Korvin joined #git
09:09 Korvin joined #git
09:09 LeMike joined #git
09:09 tazle_ joined #git
09:10 Kamilion joined #git
09:10 daynaskully joined #git
09:10 johtso joined #git
09:12 Lvjasha joined #git
09:12 whomp joined #git
09:12 absk007 joined #git
09:13 mage__ left #git
09:13 patarr joined #git
09:14 BlackPanx joined #git
09:14 solars joined #git
09:14 Lowell joined #git
09:15 Orion3k joined #git
09:15 led_belly joined #git
09:15 felixjet joined #git
09:15 e11n joined #git
09:15 Khisanth joined #git
09:15 jost_ joined #git
09:15 mda1_ joined #git
09:16 groundnuty joined #git
09:16 solars I had a branch master that was alyways in sync with dev so I could just fast forward. Now it got out of sync due to cherry picking and every merge of dev into master needs a merge commit. How can I compare the differences in commit history to spot where this started? and is there a way to fix it so it can fast forward again?
09:19 GavinMagnus joined #git
09:20 mischat joined #git
09:21 mischat_ joined #git
09:24 guardianJ joined #git
09:27 watabou joined #git
09:27 mingrammer joined #git
09:28 rubyonrailed joined #git
09:31 grawity log master..dev, rebase dev
09:31 fracting joined #git
09:31 solars grawity, thanks
09:34 jknetl joined #git
09:36 romerocesar joined #git
09:38 gordonjcp left #git
09:38 stantonk joined #git
09:42 whomp joined #git
09:42 cdown joined #git
09:43 JeroenT joined #git
09:44 Macaveli joined #git
09:46 romerocesar joined #git
09:47 ferr1 joined #git
09:48 mdw joined #git
09:49 jaguarmagenta joined #git
09:49 fuchstronaut I have a branch C with a merge commit where i merge the tips of branches A and B. Now there is a new commit on branch A. What is the most elegant way of getting this commit into C? All
09:50 fuchstronaut All I can think of is cherry-picking it, but that does not feel right
09:50 fracting joined #git
09:50 selckin merge a again?
09:51 fuchstronaut can I merge an already merged branch into my branch?
09:51 elementalest joined #git
09:52 retropikzel joined #git
09:52 nnyk_ joined #git
09:52 selckin think so not entirely sure :)
09:53 grawity if it has new commits, sure
09:53 imjacobclark joined #git
09:53 Bombe fuchstronaut, just merge A again.
09:53 Bombe fuchstronaut, that’s a pretty common pattern for long-running branches.
09:53 fuchstronaut thanks
09:54 fuchstronaut basically merging is like cherry-picking it all and keeping the information about where they come from from, isnt it?
09:55 Bombe Kind of, yes.
09:56 atenart left #git
09:56 grawity kind of not, too
09:56 fuchstronaut these are the two answers I was hoping for ;)
09:56 whomp joined #git
10:00 Darcidride joined #git
10:02 dsantiago joined #git
10:03 sdothum joined #git
10:04 ochorocho__ joined #git
10:06 dan2k3k4 joined #git
10:06 imjacobclark joined #git
10:06 romerocesar joined #git
10:07 jargonmonk joined #git
10:07 earational joined #git
10:11 whomp joined #git
10:14 jknetl joined #git
10:14 rasto joined #git
10:15 izabera how can i list all the files that changed in a certain directory between two commits?
10:15 Reda joined #git
10:17 izabera i need to find a commit that removed a file in a dir but i don't know the filename
10:17 grawity git log --stat dir/
10:17 grawity git diff --stat a..b dir/
10:18 dsantiago joined #git
10:18 dan2k3k4 joined #git
10:20 izabera thanks
10:20 leeN joined #git
10:23 molt joined #git
10:24 elementalest joined #git
10:24 elementalest joined #git
10:26 rahtgaz joined #git
10:28 whomp joined #git
10:28 lindenle joined #git
10:29 keltvek joined #git
10:29 PHPanos joined #git
10:29 TomyWork fuchstronaut this isnt svn. you can merge as often as you want :)
10:30 TomyWork (without it taking ages and blowing up in your face half the time
10:30 watabou joined #git
10:33 whomp joined #git
10:34 eijk joined #git
10:36 eijk_ joined #git
10:37 xaa joined #git
10:39 hk238 joined #git
10:40 ToBeCloud joined #git
10:41 raijin joined #git
10:43 dr_lepper joined #git
10:43 PaulePanter joined #git
10:44 kloeri_ joined #git
10:45 jast joined #git
10:45 sleezd_ joined #git
10:45 same_ol_1eez joined #git
10:45 likewhoa joined #git
10:45 rishi joined #git
10:46 RichiH joined #git
10:46 nyuszika7h_ joined #git
10:46 tribly joined #git
10:46 pdgwien joined #git
10:46 cite joined #git
10:46 themill joined #git
10:46 tuor joined #git
10:46 musca joined #git
10:46 kfunk joined #git
10:47 idmistir joined #git
10:47 languitar joined #git
10:47 EgS joined #git
10:47 thalleralexander joined #git
10:47 WayToDoor joined #git
10:47 cdown joined #git
10:48 stfn joined #git
10:49 Silenced joined #git
10:49 Silenced joined #git
10:52 mrBen2k2k2k joined #git
10:52 acetakwas joined #git
10:53 JeroenT joined #git
10:55 earational joined #git
10:58 dan2k3k4 joined #git
11:08 st0opkid joined #git
11:08 cdown joined #git
11:08 nnyk_ joined #git
11:08 nnyk_ joined #git
11:12 sarbs joined #git
11:13 bittin joined #git
11:14 ojdo joined #git
11:15 ahr3n joined #git
11:15 HoierM joined #git
11:15 liquidjamm joined #git
11:16 elsevero joined #git
11:16 rubyonrailed joined #git
11:21 rbern joined #git
11:25 anbz joined #git
11:27 dsdeiz joined #git
11:27 anbz joined #git
11:27 nettoweb joined #git
11:29 nettoweb joined #git
11:31 SteffanW joined #git
11:32 watabou joined #git
11:33 geoid joined #git
11:34 axiom_1 joined #git
11:35 JeroenT joined #git
11:35 jorj joined #git
11:37 espindola joined #git
11:37 romerocesar joined #git
11:38 Robdgreat_ joined #git
11:38 Noldorin joined #git
11:38 rubyonrailed joined #git
11:39 ntonjeta joined #git
11:40 anbz joined #git
11:40 stantonk joined #git
11:40 a_thakur joined #git
11:40 JeroenT joined #git
11:41 Neobenedict joined #git
11:41 Neobenedict joined #git
11:44 rnsanchez joined #git
11:45 freimatz joined #git
11:46 Gamecubic joined #git
11:48 yqt joined #git
11:49 jaguarmagenta joined #git
11:50 chenxu joined #git
11:51 noteness joined #git
11:51 JeroenT joined #git
11:53 sulky_ joined #git
11:55 JeroenT joined #git
11:56 martinkl_ joined #git
11:56 JeroenT joined #git
11:57 JeroenT joined #git
11:57 PCatinean joined #git
11:57 johnmilton joined #git
11:58 JeroenT joined #git
11:58 jargonmonk joined #git
11:58 JeroenT joined #git
11:59 enleeten1 joined #git
11:59 JeroenT joined #git
12:00 JeroenT joined #git
12:00 piattino joined #git
12:01 Alienpruts joined #git
12:01 JeroenT joined #git
12:01 Sceorem joined #git
12:01 chenxucxwx joined #git
12:02 tomog999_ joined #git
12:03 rishi joined #git
12:03 xnrand joined #git
12:03 chenxucxwx left #git
12:05 ochorocho__ joined #git
12:05 stonerfish joined #git
12:05 absk007 joined #git
12:06 EduardoMartins joined #git
12:06 JeroenT joined #git
12:09 rolha joined #git
12:11 synthroid joined #git
12:12 nnyk_ joined #git
12:12 imjacobclark joined #git
12:13 ash_workz joined #git
12:13 zumba_addict joined #git
12:14 skasturi joined #git
12:15 tjone270 joined #git
12:18 martinkl_ joined #git
12:18 ividyon joined #git
12:18 TooLmaN joined #git
12:19 johnmilton joined #git
12:20 ividyon Hey. Quick question. Let's assume I have a "master" branch, which corresponds to a live website, and a "staging" branch which corresponds to a testing website. The branches are handled separately from each other, leading to potential conflicts.
12:20 ividyon Now, I want to apply a quick hotfix in some core website functionality. A couple line changes.
12:20 rgrinberg joined #git
12:21 edude03 joined #git
12:21 ividyon How to proceed in Git? Assuming I make a "hotfix" branch which I base off the "master" branch, merging the hotfix branch into the "staging" branch would lead to all the changes from the "master" being applied to the staging, no?
12:21 ividyon Is there some way to merge only the difference within a few commits to another branch?
12:21 ividyon Like "I only want the files changed in these 2 commits of the 'hotfix' branch to change in the 'staging' branch."
12:21 ividyon And not the entire history before
12:23 grawity you'll probably want to cherry-pick the commits from one branch to another
12:23 grawity that's the usual way of copying select changes from master to stable
12:27 jh3 joined #git
12:28 darkbit joined #git
12:29 ividyon cherry-pick!
12:29 ividyon Interesting
12:29 ividyon Thanks a lot! Didn't know of that command yet
12:31 anbz joined #git
12:32 tjone270_ joined #git
12:33 imjacobclark joined #git
12:34 ntonjeta joined #git
12:34 zivester joined #git
12:34 watabou joined #git
12:34 tjone270__ joined #git
12:35 a3Dman joined #git
12:36 JeroenT joined #git
12:37 jaggz joined #git
12:37 JeroenT joined #git
12:37 liuzhen joined #git
12:39 [Brain] joined #git
12:39 fmcgeough joined #git
12:40 Junior joined #git
12:41 happy-dude joined #git
12:44 retropikzel joined #git
12:44 jeffreylevesque joined #git
12:44 retropikzel joined #git
12:45 nnyk_ joined #git
12:46 ItSANgo joined #git
12:46 cxz joined #git
12:47 d0nn1e joined #git
12:48 ncthom91 joined #git
12:50 phanimahesh joined #git
12:50 diegoviola joined #git
12:51 ErKa joined #git
12:51 a_thakur_ joined #git
12:51 imjacobclark joined #git
12:51 FunkyAss joined #git
12:54 Douhan joined #git
12:54 saunamees left #git
12:55 ToBeCloud joined #git
12:57 jimi_ joined #git
12:59 flavius joined #git
13:00 msonntag joined #git
13:01 snowkidind joined #git
13:04 edude03 joined #git
13:06 ochorocho__ joined #git
13:08 romerocesar joined #git
13:10 xpk joined #git
13:11 fuchstronaut joined #git
13:12 jceb joined #git
13:16 fscala joined #git
13:18 enleeten2 joined #git
13:18 ByteStorm joined #git
13:18 ByteStorm heyguys how do i upload my local repo to my github account?
13:20 efdetonator joined #git
13:20 i7c You create a repo on github, copy its URL, go to your local repo, you do `git remote add github <url>' and then git push github <branch>, or git push --all.
13:21 mripard left #git
13:21 i7c The "github" part in the command is just a name, you can name it anything you like.
13:21 ByteStorm thnx
13:24 johnmilton joined #git
13:24 rnsanchez_ joined #git
13:26 ekinmur joined #git
13:26 d4rklit3 joined #git
13:26 piattino joined #git
13:27 brandonw joined #git
13:28 xpk_ joined #git
13:28 edude03 joined #git
13:28 GT joined #git
13:29 liuzhen joined #git
13:29 irco joined #git
13:30 dan2k3k4 joined #git
13:31 lindenle joined #git
13:31 dsdeiz joined #git
13:31 zincrokx joined #git
13:31 linx joined #git
13:31 basiclaser joined #git
13:33 nnyk_ joined #git
13:35 watabou joined #git
13:36 Impaloo joined #git
13:38 Yarne joined #git
13:38 romerocesar joined #git
13:40 Impaloo joined #git
13:41 ExoUNX joined #git
13:42 stantonk joined #git
13:42 mikecmpb_ joined #git
13:42 Lunatrius joined #git
13:43 MadHatter42 joined #git
13:45 tarkus joined #git
13:46 fuchstronaut joined #git
13:46 fuchstronaut joined #git
13:47 ncthom91 joined #git
13:48 pR0Ps joined #git
13:48 Tim-SEM joined #git
13:48 raijin joined #git
13:50 jaguarmagenta joined #git
13:52 notebox joined #git
13:52 LionsMane joined #git
13:53 phaleth joined #git
13:53 mangolisk_ joined #git
13:54 stantonk joined #git
13:55 Impaloo joined #git
13:58 mmlb joined #git
13:59 raijin joined #git
14:00 tristanp joined #git
14:01 artemisart joined #git
14:01 AaronMT joined #git
14:02 Tim-SEM left #git
14:04 ByteStorm guys i tried pushing my local repo to a github repo tht i newly created
14:04 ByteStorm heres the line i put
14:05 ByteStorm git push --repo=<https://github.com/MaBunny/My_IRCbot>
14:05 ByteStorm im getting  this error
14:05 HedgeMage ByteStorm: don't include the <>
14:05 ByteStorm bash: syntax error near unexpected token `newline'
14:05 ByteStorm ok
14:06 stantonk joined #git
14:06 cdown joined #git
14:06 ByteStorm ok what does matching and simple in push.default means?
14:06 HedgeMage ByteStorm: <> are typically used in instructions to indicate something that needs to be replaced with something fitting the description inside the <>
14:06 a_thakur joined #git
14:06 ByteStorm oh my bad
14:07 _ikke_ And it's a required value, not optional, which would be indicated with []
14:07 ahmed_elgabri joined #git
14:07 ByteStorm so if i try git config --global push.default  https://github.com/MaBunny/My_IRCbot then will it add tht github repo to the default push location?
14:07 grassass joined #git
14:07 i7c Why not go with my approach. :)
14:07 _ikke_ ByteStorm: no
14:08 i7c It's much more convenient.
14:08 GodGinrai joined #git
14:08 HedgeMage ugh don't do config --global repos
14:08 i7c And by URL I didn't mean the github page but the repo’s URL.
14:08 HedgeMage Each repo should have its own place to go, doing otherwise has the potential to pollute your repo horribly.
14:08 ByteStorm i cant find the repos URL in tht page
14:08 i7c It hides behind that green button.
14:08 i7c "Clone or download"
14:09 ByteStorm oh tht is the global repo  then?
14:09 ByteStorm ok
14:09 i7c Not sure what you mean by global.
14:09 ByteStorm no
14:09 imjacobclark joined #git
14:09 ByteStorm HedgeMage said tht each repo should hav its own place
14:10 HedgeMage config --global is usually your user git config, is it not?
14:10 Guest99267 joined #git
14:10 i7c Yup.
14:10 i7c config defaults to --local which you can do only within a git repo.
14:10 HedgeMage That would apply to all repos where not specifically overridden by a repo's config.
14:11 GodGinrai If you want something to apply to all of your git repos, use  --global
14:11 HedgeMage This is easy to cause yourself headaches with if you are not careful.
14:11 ByteStorm ok i used your method i7cx
14:11 ByteStorm it worked
14:11 GodGinrai If you want it to apply to one particular repo, use --local
14:11 agileadam joined #git
14:11 ByteStorm ok
14:11 ByteStorm thnx ill try the local falg now
14:11 HedgeMage I set the following things globally: my name and email, ignore rules for emacs temporary files
14:11 HedgeMage ...and nothing else.
14:11 i7c ByteStorm, you can also work with ssh keys on github which will save you all the credentials mess, if you don't use them already.
14:12 GodGinrai HedgeMage: for those who don't use the EDITOR env var, it can be useful to set core.editor there
14:12 liuzhen joined #git
14:12 i7c HedgeMage, I have shiploads of aliases. :P
14:12 ByteStorm i7c i dont save ssh keys yet
14:12 ByteStorm it come handy later....so ill ask for tht part later
14:12 GodGinrai ByteStorm: then make them :P
14:13 ByteStorm ok but how
14:13 GodGinrai ByteStorm: ssh keys define *you*.  They're not something you ask for.
14:13 i7c Are you on linux?
14:13 HedgeMage GodGinrai: Ahh, yes, I have it as an environmental variable, but that is a very good point.
14:13 mmlb joined #git
14:13 ByteStorm yes
14:13 NeverDie joined #git
14:13 i7c you can use ssh-keygen tool to make keys, if you don't have any yet.
14:13 GodGinrai ByteStorm: https://help.github.com/articles/generating-an-ssh-key/
14:13 Alienpruts joined #git
14:13 ByteStorm thnx
14:13 GodGinrai That will also show you where to add it for github, IIRC
14:14 ByteStorm thnx...i learnt quite many things today
14:14 ByteStorm :)
14:15 mdw joined #git
14:16 mdw joined #git
14:17 diegoviola joined #git
14:18 unbalancedparen joined #git
14:20 zivester joined #git
14:21 floatingpoint joined #git
14:22 zumba_addict joined #git
14:22 Ahmed90 joined #git
14:22 Maka_ joined #git
14:23 goku147 joined #git
14:23 floatingpoint joined #git
14:23 st0opkid joined #git
14:24 Maka_ hi there, i downloaded a project 'Luna' a forum, then i started working on it, however the download goes not contain any git information... now there is a github repo for it, can i link that project to the repo without losing my progress so far
14:25 nnyk_ joined #git
14:25 goku147 fb1fb7bc8b76 [fb1fb7bc8b76]. When i pushed the code to bitbucked it showed me that message and didn't allow me to access the sub folders
14:25 goku147 please help!
14:25 snits joined #git
14:25 bond joined #git
14:26 sto0pkid joined #git
14:27 paul424 joined #git
14:28 DieguezZ joined #git
14:28 GodGinrai Maka_: clone the git repo, copy over the files you changed
14:29 Maka_ GodGinrai: there are few changes, and I'm not sure if i can find all the changes too
14:29 Maka_ there has to be a way to add remote, and force the commit to a certain location
14:29 t0by joined #git
14:29 crose joined #git
14:30 GodGinrai Maka_: you can't add something that isn't a git repo as a git remote
14:30 GodGinrai Maka_: use `diff`
14:30 rubyonrailed joined #git
14:30 Maka_ GodGinrai: that might work
14:30 Maka_ thanks
14:31 ShekharReddy joined #git
14:31 Gitzilla joined #git
14:33 fracting joined #git
14:34 sarbs joined #git
14:34 nnyk_ joined #git
14:35 diego2 joined #git
14:35 diego2 joined #git
14:35 sarbs joined #git
14:36 mmlb joined #git
14:36 watabou joined #git
14:36 macefr joined #git
14:38 edude03 joined #git
14:41 Beams joined #git
14:42 ryez joined #git
14:42 dan2k3k4 joined #git
14:42 thiago joined #git
14:43 zumba_addict joined #git
14:43 digidog joined #git
14:44 dan2k3k5 joined #git
14:46 umbSublime joined #git
14:46 umbSublime joined #git
14:47 imjacobclark joined #git
14:47 dsdeiz joined #git
14:47 dsdeiz joined #git
14:51 goku147 joined #git
14:52 mmlb joined #git
14:53 stonerfish joined #git
14:53 fuchstronaut joined #git
14:53 watabou joined #git
14:53 fuchstronaut joined #git
14:53 watabou joined #git
14:54 babilen joined #git
14:55 zumba_ad_ joined #git
14:56 dan2k3k4 joined #git
14:59 synthroid joined #git
15:00 edude03 joined #git
15:00 fuchstronaut joined #git
15:01 arooni joined #git
15:01 KeyWeeUsr joined #git
15:01 floatingpoint joined #git
15:01 ekinmur joined #git
15:01 solars joined #git
15:02 jumpman joined #git
15:02 KeyWeeUsr hi there! What if I make a PR for github, PR is merged, branch deleted. How can I recover the branch? Can I recover it somehow with commit hashes? After some period when it is deleted or something by git.
15:02 kaldoran joined #git
15:03 Tomdarkness joined #git
15:03 KeyWeeUsr I don't really want that branch, I'm just asking if I can reconstruct the branch from history... somehow?
15:04 vbsales joined #git
15:04 GodGinrai KeyWeeUsr: github has a "recover branch" button on the PR page.
15:05 dan2k3k4 joined #git
15:05 KeyWeeUsr yeah, but I heard that branches could be "hard" deleted - without the option to go for "recover branch" button
15:05 samson joined #git
15:06 GodGinrai KeyWeeUsr: I'm not aware of this, but maybe it is true
15:06 molt joined #git
15:06 ochorocho__ joined #git
15:06 umbSublime joined #git
15:06 umbSublime joined #git
15:08 zumba_ad_ joined #git
15:08 KeyWeeUsr oh, found it, hehe.. http://stackoverflow.com/a/3640806/5994041
15:08 KeyWeeUsr but anyway, thanks
15:08 GavinMagnus left #git
15:08 djb-irc joined #git
15:08 KeyWeeUsr left #git
15:09 GavinMagnus joined #git
15:09 annoymouse joined #git
15:10 nnyk_ joined #git
15:10 annoymouse Is there a way to move back a commit without undoing or losing the current commit?
15:10 annoymouse Kind of like viewing a "snapshot"?
15:11 BlaXpirit annoymouse, git checkout HEAD~1
15:11 annoymouse I would guess it's something like git checkout HEAD^1
15:11 BlaXpirit git checkout branch-where-you-were   to go back
15:11 stantonk joined #git
15:11 annoymouse BlaXpirit: How does HEAD~1 differ from HEAD^1
15:11 BlaXpirit annoymouse, I think  HEAD~1 = HEAD^   but HEAD^1 is invalid   - that's why i never use ^
15:12 annoymouse Ah okay
15:12 whomp joined #git
15:12 arooni joined #git
15:12 mmlb joined #git
15:12 annoymouse BlaXpirit: My working directory is dirty rn. What will happen to that?
15:12 crayon joined #git
15:12 annoymouse Should I run git stash before I do it?
15:12 BlaXpirit annoymouse, git won't let you do it
15:12 BlaXpirit yes, should stash or do something about it
15:12 annoymouse Okay perfect
15:13 annoymouse BlaXpirit: I just did it without stashing and it put me in a detached HEAD
15:14 annoymouse That's fine for this, right?
15:14 GodGinrai annoymouse: Basically, don't "checkout" if your working dir is dirty
15:14 BlaXpirit annoymouse, yes, this always  or almost always causes detached HEAD
15:14 annoymouse too late
15:14 BlaXpirit but did you really just lose your changes? sorry, I did not expect that
15:14 annoymouse No I don't believe I did
15:15 thiago HEAD^1 is perfectly valid
15:15 thiago HEAD~1 and HEAD^1 are the same
15:15 thiago HEAD~2 and HEAD^2 are not
15:15 BlaXpirit uhhhhh k.  so even more reasons not to use ^
15:16 ash_workz joined #git
15:17 thiago except when you want to get to ^2
15:17 thiago or ^0
15:18 annoymouse BlaXpirit: Everything worked perfectly. Thank you. Exactly as I suspected, something broke in the merge commit I made yesterday
15:18 decimad joined #git
15:18 martinkl_ joined #git
15:18 annoymouse so now how did you say I get back?
15:19 annoymouse git co [my_branch]?
15:19 BlaXpirit yes
15:19 digidog joined #git
15:19 decimad is there a way to check which ssh client is used by git and why? git seems to be using ssh.exe no matter what I set up for GIT_SSH
15:20 fracting joined #git
15:20 _ikke_ usually GIT_TRACE=1
15:20 GodGinrai GIT_SSH is a thing?
15:20 tyreld joined #git
15:21 _ikke_ I think it's 'fairly' new
15:21 AaronMT joined #git
15:21 watabou joined #git
15:21 _ikke_ No, that's GIT_SSH_COMMAND which is new
15:23 mmlb joined #git
15:24 dsdeiz_ joined #git
15:24 Beams joined #git
15:25 _ikke_ Seems to be there right from the start, but documented in 2007
15:27 tomboy65 joined #git
15:29 decimad joined #git
15:29 RedNifre joined #git
15:29 quetz joined #git
15:31 zumba_ad_ joined #git
15:31 RedNifre I have a git repo with code for a customer. The customer would now like to have a look at the code, but he wants to see the code in his own svn. Should I just create a new svn repo and copy the code over or is there a better way, e.g. converting the git repo to an svn repo or some sort of translation step where I see the git repo but when I push to a pseudo branch "customer" it gets pushed to svn?
15:32 Beams joined #git
15:32 dmto joined #git
15:32 edude03 joined #git
15:33 _ikke_ What does "his own svn" mean?
15:33 UTAN_dev joined #git
15:34 ahmed_elgabri joined #git
15:34 jbitdrop joined #git
15:35 floatingpoint joined #git
15:35 RedNifre _ikke_ I don't remember anything about svn since I've been using git for so long. I have credentials for his svn server and I can checkout one of his projects (haven't tried if I can commit changes but I think I could because it seems to be a copy of the project repo, not the real one).
15:36 RedNifre He would like to look at the code that I have in git but he doesn't like git and he wants to see the code on his svn server.
15:36 solars joined #git
15:36 _ikke_ I have experience with svn to git, but not the opposite
15:36 RedNifre So the trivial way would be to create a new svn project and copy the files, but I was wondering if there's a more elegant way.
15:37 _ikke_ All reference talk about the other way around
15:37 RedNifre Yeah, that's all I found as well, that's why I'm here :)
15:37 kugel joined #git
15:37 kugel joined #git
15:38 RedNifre Well, I'll just copy the files for now and look for a more sophisticated solution when he asks for more code snapshots. Maybe he only wants to see it once.
15:38 _ikke_ What might be an alternative is a web interface
15:39 RedShift joined #git
15:39 chrisshattuck joined #git
15:39 mmlb joined #git
15:40 Codfection joined #git
15:40 qsx github provides a svn interface if that is an option
15:41 qsx git itself only has a cvs server
15:41 floatingpoint joined #git
15:41 Codfection joined #git
15:44 nnyk_ joined #git
15:45 elsevero joined #git
15:45 yonatankoren I have a branch that is way ahead of master and is effectively the master branch for our team. If I force push it as master, will I effectively make it master?
15:45 aep-shoutlet joined #git
15:45 waveclaw joined #git
15:46 rominronin joined #git
15:46 GodGinrai yonatankoren: why would you need to force push a branch that is ahead?
15:46 GodGinrai yonatankoren: forcing is only necessary when you are behind or divergent
15:46 quetz^^ joined #git
15:47 yonatankoren GodGinrai: It's so many commits ahead... not only new code, but old packages that were completely removed. etc. I was thinking of just force pushing the current branch, because it's more straight forward to just have the current dev branch as the master branch
15:47 liuzhen joined #git
15:49 martinkl_ joined #git
15:49 romerocesar joined #git
15:50 _ikke_ yonatankoren: Doesn't change what GodGinrai says
15:50 _ikke_ force push would only be necessary if the master branch contains changes that the other branch doesn't have
15:51 jaguarmagenta joined #git
15:51 akushner joined #git
15:51 GodGinrai otherwise it's a simple fastforward merge
15:52 stantonk joined #git
15:52 darkbit joined #git
15:52 acetakwas joined #git
15:54 ForeignBiscuit joined #git
15:56 oich joined #git
15:56 martinkl_ joined #git
15:56 ochorocho__ joined #git
15:56 kpease joined #git
15:56 rkazak joined #git
15:56 Gonzo89 joined #git
15:58 jungsubk joined #git
15:58 zumba_addict joined #git
16:00 yonatankoren _ikke_, GodGinrai thanks guys, it seems I'm just a git noob
16:00 yonatankoren Makes sense to me now
16:01 stantonk joined #git
16:02 nettoweb joined #git
16:03 imjacobclark joined #git
16:04 mmmveggies joined #git
16:04 HoierM joined #git
16:04 piling joined #git
16:04 shinnya joined #git
16:05 paul424 joined #git
16:05 synthroi_ joined #git
16:06 bschindler joined #git
16:07 synthro__ joined #git
16:08 bschindler Hi - I have an issue that I'm trying to apply a patch series using git am. But the patch series come from a different (rebased) repository and - unfortunately - line endings are different. The patch series has unix line endings, the repo I'm committing to has CRLF. How can I make git am work in this context?
16:08 bschindler interestingly, git apply works, but git am does not
16:08 subhojit777 joined #git
16:09 d4rklit3 joined #git
16:10 sangy joined #git
16:11 madewokherd joined #git
16:12 kpease joined #git
16:12 dsdeiz joined #git
16:12 dsdeiz joined #git
16:13 piling_ joined #git
16:14 djb-irc joined #git
16:14 eletuchy joined #git
16:16 Beams joined #git
16:18 Eugene Sounds like a bug in git-am. I would just use apply and move on with life.
16:18 grawity there's always dos2unix
16:18 grawity and vice versa
16:18 grawity (aka frodos/todos)
16:18 grawity Eugene: `git apply` sounds a bit harder to automate
16:18 grawity when you want to preserve the commit messages etc.
16:19 Eugene Automation is for ongoing problems. "I have ten patches" is different
16:19 diogenese joined #git
16:20 romerocesar joined #git
16:23 watabou joined #git
16:24 xall joined #git
16:24 ShekharReddy joined #git
16:26 dreiss joined #git
16:26 schilling joined #git
16:27 maestrojed joined #git
16:31 decimad joined #git
16:31 stantonk joined #git
16:32 schilling So, I have two branches, created at different times from local master (one last week, one early this week). I assumed that each branch would be ‘encapsulated’ (for lack of a better term) so I could work on different areas of my application without generating conflicts. However, when I make a change on branch 1, branch 2 reflects that change, as will master. Did I misunderstand how git branching
16:32 schilling works, or did I perhaps activate some setting I know nothing about?
16:33 lindenle joined #git
16:33 whomp joined #git
16:34 Eugene schilling - are you commit-ing your changes before switching branches?
16:35 schilling No, I happened to catch this before doing any commits.
16:35 zumba_addict joined #git
16:35 Eugene git will attempt to !float between branches
16:35 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
16:35 mmlb joined #git
16:35 Eugene Until you've creted a commit the change isn't "in" the branch: it's just untracked working-dir changes.
16:36 Eugene I suspect you're coming from another VCS?
16:36 nafg_ joined #git
16:36 schilling So do I have to tell each branch what files to ignore?
16:36 Eugene !xy
16:36 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
16:37 schilling No, I've only used git, but only for about 9-10 months. This is my first time having more than one working branch at a time.
16:37 venmx_ joined #git
16:38 roflin joined #git
16:39 nafg_ I have some local changes, e.g. additions in a certain file. I want to make a commit that renames a bunch of files including that one, without including the current changes. However if I stash them or commit them to a branch and then unstash or rebase, there will be a conflict. Any advice to avoid the conflict?
16:39 schilling Simply put, I'm working on a production app in two areas: front end UI and feature expansions. I have a branch for each. The overall objective is to be able to work on each branch and merge in as I finish debugging without the branches tracking eachother.
16:40 romerocesar joined #git
16:40 Eugene schilling - you will need to commit/stash changes before switching between branches. You could use two separate repos if you want to work on both branches at the same time
16:40 ResidentBiscuit joined #git
16:40 lindenle joined #git
16:41 schilling So, when I go do a 'git status' I expect to have the files for the UI branch showing ONLY the files i've edited in that branch. I don't expect it to show the files I've worked on in the programming feature branch.
16:41 Eugene nafg_ - not without being "tricksy"; that's a textbook conflict scenario. I would just deal with the conflict
16:41 schilling Alright, Eugene. That's probably the mistake a I made. Thank you.
16:41 kfunk joined #git
16:41 nafg_ Eugene: :( annoying, especially since I'd rather stash and then you have to drop the stash manually
16:42 djb-irc joined #git
16:42 Eugene nafg_ - if I was feeling especially lazy(and I usually am), I would pipe the `git diff` output of my change into a diff, then apply it after the rename
16:42 rolha joined #git
16:42 decimad_ joined #git
16:43 nafg_ hmm, that could work esp. since prob. only conflict is one file
16:43 mmlb joined #git
16:43 nafg_ Another question -- I want to git diff --color-words except break on character boundaries (not words)
16:43 Eugene For a single file it's usually a bigger time-waster trying to figure out how to do it the easy way than it is to just do it the dumb way
16:43 nafg_ Agreed
16:44 nafg_ I remember doing it before, there's some git config regex or something
16:44 nafg_ but I remember losing a lot of time googling it
16:44 nafg_ and I don't seem to have the config around
16:44 Eugene Does `git diff --color-words=.` do what you want?
16:44 eletuchy joined #git
16:44 javajoe joined #git
16:44 nafg_ Hmm, didn't know about that
16:45 Eugene It's just a regex hack
16:45 nafg_ Eugene: ouch, no :( The output is all wrong
16:45 nafg_ Maybe I need something more nuanced
16:46 nafg_ I guess I want word boundaries to include normal programming tokens
16:46 nafg_ not just spaces
16:46 kadoban joined #git
16:46 GavinMagnus left #git
16:46 Eugene Dunno, then. Play with it a bit, maybe it'll catch fire
16:46 nafg_ :)
16:46 dreiss joined #git
16:46 nafg_ Eugene: thanks for the info, I can read the man page now...
16:47 rominronin joined #git
16:47 decimad_ left #git
16:48 Macaveli joined #git
16:49 nafg_ Ok --color-words='\w+|[^[:space:]]' seems sane enough
16:51 yqt joined #git
16:51 thiago joined #git
16:53 shgysk8zer0 joined #git
16:53 evil-t0by joined #git
16:53 mmlb joined #git
16:53 t0by joined #git
16:54 jimi_ joined #git
16:54 blackwind_123 joined #git
16:54 blahdodo joined #git
16:55 asnoehu joined #git
16:56 Nick_1 joined #git
16:56 raijin joined #git
16:58 EvilPenguin joined #git
17:01 Balliad joined #git
17:04 wrouesnel joined #git
17:06 zumba_addict joined #git
17:06 sword joined #git
17:06 sssilver joined #git
17:07 Macaveli joined #git
17:08 seiffert joined #git
17:08 zerocua joined #git
17:08 jalnt joined #git
17:09 b100s joined #git
17:09 b100s hi2all
17:09 b100s is it possible to merge only needed files?
17:09 linx joined #git
17:09 akushner joined #git
17:10 b100s git checkout --patch can do that?
17:10 mmlb joined #git
17:10 romerocesar joined #git
17:12 fracting joined #git
17:13 Isla_de_Muerte joined #git
17:13 mikecmpbll joined #git
17:13 Darcidride joined #git
17:14 thiago b100s: merge is always of commits, of all commits since the branch point
17:14 thiago there is no other merge option
17:14 stantonk joined #git
17:14 Shakeel_ joined #git
17:17 InfoTest joined #git
17:17 fuchstronaut joined #git
17:17 InfoTest joined #git
17:18 jstimm joined #git
17:21 rcpp85 joined #git
17:21 seiffert joined #git
17:21 MrWoohoo joined #git
17:21 mmlb joined #git
17:21 seiffert left #git
17:21 acetakwas joined #git
17:22 rcpp85 Hello all! Some changes made to a file seems like it has vanished from a branch. Doing "git log --stat" and "git log --follow" show us different results.
17:23 ItSANgo joined #git
17:23 rcpp85 If I try to merge the branch that should have changed this file into the branch I'm currently in, it says "Already up-to-date".
17:24 benwboot_ joined #git
17:24 rcpp85 Any reason why "--stat" and "--follow" would have a different output?
17:25 jave joined #git
17:25 Eugene Those two options don't do anything like the same thing, so, yes, that would make sense.
17:26 Neobenedict right guys
17:26 Neobenedict so there are 4 merges that someone did which have messed everything up
17:26 Neobenedict how do i undo them
17:26 circ-user-1WQiq joined #git
17:26 Neobenedict i have the hash of the last commit before the merges
17:26 ajf- joined #git
17:26 Eugene Neobenedict - read !fixup first and see if your case is in there
17:26 gitinfo Neobenedict: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
17:27 ncthom91 joined #git
17:27 nitin joined #git
17:28 rcpp85 Eugene:  But when I'm on the branch that last changed the file (i.e: 1234), I get this hash as the top commit for both commands -  2ae7aae...
17:28 Neobenedict Eugene: if i just copy my folder with everything in including .git is that good enough as a backup
17:28 Eugene Neobenedict - yup.
17:29 floatingpoint joined #git
17:29 fscala joined #git
17:29 mmlb joined #git
17:29 rcpp85 how ever, doing both same commands pointing on another branch (say: master) I get: 2ae7aae (for follow) and 3be1ff (for stat). The last one is the previous commit before  2ae7aa
17:30 axiom_1 joined #git
17:30 romerocesar joined #git
17:30 floatingpoint joined #git
17:31 mostlybadfly joined #git
17:31 Neobenedict "Oh dear. This is going to get complicated."
17:32 thiago rcpp85: on the difference between --follow and without --follow: one follows, the other doesn't.
17:35 thiago follow past a rename
17:36 rcpp85 thiago: I'm not sure if I follow, but never mind. What i think it is strange is that "git merge origin/1234" says  "Already up-to-date".  But "gitk path/to/file" on this branch does not include the last commit from the branch 1234.
17:37 stuh84 joined #git
17:37 cuebix-wk joined #git
17:37 rcpp85 thiago: what I really want to know it what last changed a specific file. But it feels like there is something else causing this trouble.
17:37 Balliad joined #git
17:38 thiago rcpp85: you're wrong
17:38 thiago git is right and your understanding of what was committed where is incorrect
17:38 thiago are you saying that if you do "git log origin/1234 path/to/file", you don't see the change you expected to see?
17:39 mdw_ joined #git
17:39 zumba_addict joined #git
17:39 rcpp85 thiago: git log 1234 -- path/to/file or  git log origin/1234 -- path/to/file  shows what I expect.
17:39 thiago ok
17:40 thiago git log -- path/to/file  (without the branch name) and search for that change. Is it there?
17:40 thiago it might not be the last
17:40 Neobenedict accoridng to gitlab
17:40 diegoviola joined #git
17:40 Neobenedict 72 commits were pushed to master
17:40 rcpp85 thiago: git log master -- path/to/file  does not
17:41 Neobenedict in some failed merge
17:41 thiago rcpp85: I said without branch name
17:41 rcpp85 thiago: no. it is not. the last commit is the one before the changes I expect.
17:41 Neobenedict i have no clue how to undo 72 commits at once
17:41 thiago rcpp85: remove "master" from your command line
17:42 PHPanos joined #git
17:42 rcpp85 thiago:  same thing.
17:42 thiago rcpp85: ok
17:42 thiago rcpp85: git log ..origin/1234
17:42 thiago rcpp85: anything printed?
17:42 edude03 joined #git
17:42 rcpp85 thiago: no.
17:43 thiago so you're wrong. The commit is in the previous git log
17:43 thiago please look again at git log and you'll see the commit there
17:43 thiago remove the file name too. Do you see the change?
17:43 cdown joined #git
17:44 benwbooth joined #git
17:46 rcpp85 thiago: Ok, the commit is there on the tree. But is not showing on the "git log" of that file (inside that branch). How is that possible? (I dont even know if Im making myself clear. Should I paste my outpus
17:46 rcpp85 *outputs on a pastebin)?
17:46 thiago rcpp85: because that commit didn't touch that file
17:46 rominronin joined #git
17:47 rcpp85 doing "git diff 2ae7aa -- path/to/file"  shows the differences expected.
17:47 thiago git show thatcommitsha1
17:48 thiago you will see it did not touch the file
17:48 rcpp85 well... it did display a diff.
17:48 thiago and it should include the names of the files changed. None of them are the file you were looking for.
17:49 rcpp85 It include the file. It is the only file changed on that commit, actually.
17:49 Neobenedict i have the sha hash of the last good commit before the merges started and things got fucked on master
17:49 nitin joined #git
17:49 Neobenedict how to i undo everything
17:49 thiago rcpp85: with the exact name you were looking for?
17:49 thiago Neobenedict: define "undo"
17:50 thiago Neobenedict: do you want to erase all the other commits from history, as if they hadn't been pushed to master?
17:50 GodGinrai Neobenedict: Are you wanting to just point HEAD at that commit?
17:50 thiago Neobenedict: !rewrite
17:50 gitinfo Neobenedict: 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
17:50 Neobenedict not rewrite no
17:50 thiago Neobenedict: do you want to keep the commits but discard their changes?
17:50 rcpp85 Neobenedict: git reset --hard thathash  -- this would put all your files on the state they were on that commit.
17:50 Neobenedict also is master the same as origin/master
17:51 GodGinrai rcpp85: he said he doesn't want to rewrite history
17:51 GodGinrai Neobenedict: if you don't want to change history, you'll need to use git-revert
17:51 ochorocho__ joined #git
17:51 GodGinrai or manually make a fix commit
17:51 thiago revert won't work
17:51 rcpp85 GodGinrai: my bad. I sent before reading his message.
17:51 thiago Neobenedict: answer my question please: do you want to discard all the effects but keep the commits?
17:51 rcpp85 not sure if you can checkout a file from a given hash.
17:51 jaguarmagenta joined #git
17:51 thiago you can
17:52 GodGinrai rcpp85: you can
17:52 Neobenedict thiago: yes
17:52 rcpp85 that wouldn't rewrite history, I guess.
17:52 GodGinrai rcpp85: `git checkout commit_hash -- file` IIRC
17:52 Neobenedict this is what it looks like in gitlab
17:52 Neobenedict xxxx pushed to branch origin/master at
17:52 Neobenedict 21064a26 · Resolved the $cont code
17:52 Neobenedict 7b02d6c3 · Merge branch 'master' into applications
17:52 Neobenedict ... and 72 more commits. Compare 98cb7008...21064a26
17:52 thiago Neobenedict: do you understand that if you do what I am going to tell you, you won't be able to merge those branches again?
17:52 GodGinrai Neobenedict: use a pastebin
17:52 thiago Neobenedict: once merged, they're merged forever
17:53 segment-fault joined #git
17:53 rcpp85 thiago:  Yes. Same file, same path.
17:53 thiago rcpp85: has it since been renamed?
17:53 zerocua_ joined #git
17:54 Neobenedict i think gitlab has also broken http://i.imgur.com/3Nbky2H.png
17:54 ochorocho__ joined #git
17:54 thiago Neobenedict: git checkout lastgoodcommit .
17:54 rcpp85 thiago: No. I don't think so.
17:54 thiago Neobenedict: including the dot at the end. Then commit.
17:54 thiago rcpp85: it looks like Git thinks it has been
17:55 Neobenedict is that going to prevent me from merging newbranch -> master
17:55 thiago Neobenedict: is newbranch one of the branches that have been accidentally merged?
17:55 Neobenedict probvably
17:55 Neobenedict i have no clue
17:55 rcpp85 thiago: That's strange. Going to have to investigate that.  Any idea how/why this would happen? Or  how can I find what thouched it?
17:55 Neobenedict at this point
17:55 thiago Neobenedict: then yes. You can't merge again.
17:55 Neobenedict what has been merged into what
17:55 thiago Neobenedict: once merged, it's merged forever
17:56 Neobenedict so much for git being "version control" then when you can't undo something
17:56 thiago rcpp85: git whatchanged lastcommit..
17:56 thiago rcpp85: you'll see all file paths, including rename detections
17:56 Neobenedict Merge branch 'master' into origin/master
17:56 thiago Neobenedict: you can undo.
17:56 Neobenedict i don't even know what is going on
17:56 Neobenedict is origin/master and master the same branch?
17:56 thiago Neobenedict: but some forms of undo are rolling history back and you said you don't want it.
17:56 rcpp85 thiago: with the two periods? "lastcomit.."
17:56 thiago Neobenedict: no, they are not the same
17:56 thiago rcpp85: yes
17:57 rcpp85 I will try that. Thanks!
17:57 Neobenedict thiago: can i move all the stuff from the branch into another branch
17:57 Neobenedict and merge it after
17:57 Neobenedict if you can't "undo" a merge
17:57 thiago Neobenedict: merges are done on commits, not on branches
17:58 thiago Neobenedict: once a commit is merged, it's merged forever
17:58 Neobenedict thiago: these are branch merges
17:58 mmlb joined #git
17:59 GodGinrai *forever*
17:59 kugel joined #git
17:59 kugel joined #git
17:59 GodGinrai abandon all hope, ye who merge here
17:59 ash_workz joined #git
17:59 Neobenedict so I can just delete this origin/master branch which is fucked
17:59 Neobenedict or ignore it
18:00 GodGinrai Neobenedict: is the branch at the origin also fucked?
18:00 Neobenedict you mean master by itself?
18:00 thiago Neobenedict: you merge the commit that was at the tip of the branch
18:00 thiago Neobenedict: then the *commit* is merged
18:00 thiago Neobenedict: even if you move that commit to another branch, it will still be merged
18:00 m0viefreak joined #git
18:00 floatingpoint joined #git
18:01 Sasazuka joined #git
18:02 GodGinrai Although, honestly, I've never heard about this "commit is merged" stuff.  I thought git created separate merge commits
18:03 wiky joined #git
18:03 Neobenedict thiago: the problem is, the branches were merged weirdly (master -> newbranch ??? instead of other way around). atm on master, all the new files from that branch are there, but no modifications to existing files
18:03 martinkl_ joined #git
18:04 Neobenedict Showing 54 changed files with 3753 additions and 520 deletions
18:06 Neobenedict thiago: and if git revert weirdcommit fucks it up further, how do i undo that?
18:06 stantonk joined #git
18:06 thiago Neobenedict: two options:
18:07 thiago Neobenedict: 1) rewrite history by doing a reset and then a force push
18:07 thiago Neobenedict: remember to tell everyone to delete their clones and re-clone
18:07 segment-fault left #git
18:07 Neobenedict thiago: i thoguht git revert didn't push?
18:07 thiago Neobenedict: or 2) use the git checkout option, which will discard the changes
18:07 Neobenedict ye
18:07 Neobenedict so i can do that before i push
18:07 Neobenedict just not after
18:07 thiago but will not discard the commits. So they can't be merged again.
18:08 Neobenedict error: Commit 7b02d6c39d8069569be33067e79525ccb7ba494b is a merge but no -m option was given.
18:08 Neobenedict fatal: revert failed
18:08 Neobenedict and now?
18:09 thiago Neobenedict: I gave you two options: git reset or git checkout
18:09 Neobenedict thiago: nothing happened
18:09 thiago Neobenedict: which one do you want: rewrite history? Not rewrite history?
18:09 Neobenedict as the revert failed
18:09 thiago of course it did
18:09 ochorocho__ joined #git
18:09 Neobenedict i don't know
18:09 Neobenedict just undo this merge
18:10 SwiftMatt joined #git
18:10 Neobenedict probably not rewrite history
18:10 thiago I need you to tell me what "undo" means to you
18:10 thiago git checkout lastknowngoodcommit .
18:10 thiago including the dot at the end. Commit, then push.
18:10 Neobenedict so this "merge"
18:10 Neobenedict is master -> apps
18:10 Neobenedict yet it's committed to master
18:10 Neobenedict it has all the new files but no changed ones in it
18:10 Neobenedict so by undo
18:10 Neobenedict i need it to remove all the changes it made, ie all the new files
18:10 GodGinrai Neobenedict: how is merging master into a branch "merging weirdly"?
18:11 Neobenedict because surely when you merge master into another branch, you want master to be unmodified
18:11 stantonk joined #git
18:11 Repox joined #git
18:11 GodGinrai Neobenedict: oh, so someone merged master into apps and then pushed apps up as master?
18:11 Neobenedict maybe
18:12 Neobenedict most likely
18:13 GodGinrai Neobenedict: I hope you are going to track down who did this <.<
18:13 Neobenedict i know who did it.
18:13 Neobenedict i'll try the git checkout . thing
18:13 jlf joined #git
18:15 Neobenedict thiago: that did not help
18:15 jlf hi #git, anyone know the secret to forcing core.filemode to false in freshly cloned repos?  2.7.4 produced the results at http://paste.lisp.org/display/319564
18:15 thiago Neobenedict: what did you do?
18:15 Neobenedict git checkout lastknowngoodcommit .
18:15 ochorocho__ joined #git
18:15 thiago jlf: ask everyone to set the config
18:15 Neobenedict the files that aren't supposed to be there (from the merge) are still there
18:15 Neobenedict and not untracked
18:15 thiago jlf: there's absolutely nothing you can do that influences any config on cloning.
18:15 thiago Neobenedict: git reset --hard HEAD, first
18:15 Neobenedict thiago: what that did do was undo 2 commits that happened after
18:15 thiago Neobenedict: this will discard anything you've done in trying to fix this
18:16 thiago Neobenedict: then do that checkout
18:16 Neobenedict alright.
18:16 Neobenedict which checkout
18:16 thiago git checkout lastgoodcommit .
18:16 Neobenedict i already did that, what i just said
18:16 kfunk joined #git
18:16 jlf thiago: can i make filemode=false a property of the repo that gets propagated to clones?
18:16 Neobenedict i can try agian if that's what you mean
18:17 thiago then you have exactly the contsnts of that commit
18:17 thiago jlf: no
18:17 InfoTest joined #git
18:18 ojacobson thiago: git rm -rf . && git checkout last-good-commit .
18:18 ojacobson git checkout … paths will not remove stuff :)
18:19 Neobenedict >rm -rf .
18:19 Neobenedict uh
18:19 ojacobson Okay, git rm -r .
18:19 thiago ojacobson: oh?
18:19 ojacobson thiago: yup. If last-good-commit is missing some/new/file, your checkout stanza will leave the currently-staged some/new/file in place
18:20 ojacobson which is unlikely what you want when "restoring to a previously good commit" :)
18:20 Neobenedict ojacobson: i'll try that then
18:20 Neobenedict i do have a backup after all
18:21 jlf thiago: ok.  where can i learn more about how git probes the local filesystem to decide what filemode to use in .git/config?
18:21 jost__ joined #git
18:21 Balliad joined #git
18:21 thiago jlf: .git/config isn't affected by the local filesystem
18:22 thiago I think...
18:22 nettoweb joined #git
18:22 Neobenedict ojacobson: that didn't work
18:22 Neobenedict the files are still there
18:22 thiago jlf: I'm wrong. The docs say it probes the filesystem.
18:22 thiago jlf: I don't know what it does.
18:22 stantonk joined #git
18:23 githogori joined #git
18:23 Dazzyp joined #git
18:24 ochorocho__ joined #git
18:24 linx joined #git
18:25 linx joined #git
18:26 jstimm joined #git
18:26 jatin30 joined #git
18:26 Neobenedict git revert -m 1 7b02d6c39d8069569be33067e79525ccb7ba494                                                                                                                          b
18:26 Neobenedict error: could not revert 7b02d6c... Merge branch 'master' into applications
18:26 happy-dude joined #git
18:26 jlf somehow it's deciding to set core.filemode true, and then after i make changes to the tree all of a sudden git status says that hundreds of files have changed from mode 0644 to 0755.
18:26 Neobenedict yet when i type git status
18:26 Neobenedict it shows things as being undone
18:27 Neobenedict ie new files deleted
18:27 Neobenedict #       both modified:      .gitignore
18:27 Neobenedict right what do i do about this
18:28 inflames joined #git
18:28 jatin30 please check in this https://bpaste.net/show/0d8234f32f9e i deleted the branch "wtf" without merging and it did not give me any warning like this error: The branch 'wtf' is not fully merged. If you are sure you want to delete it, run 'git branch -D wtf'.
18:29 preaction Neobenedict: you're in the middle of a merge conflict. git status should say, at the top, what to do. but tl;dr: open the file, look for the merge markers, fix the file, git add the result, and then continue with what you're doing
18:29 jlf its insistence on setting core.filemode true despite my config settings to the contrary and subsequent failures are quite aggravating
18:29 preaction Neobenedict: see also !eek
18:29 gitinfo Neobenedict: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
18:29 Neobenedict preaction: i'm in the middle of a git revert
18:29 ExoUNX joined #git
18:29 thiago Neobenedict: stop trying to do git revert
18:29 thiago Neobenedict: use the solution from ojacobson
18:29 Neobenedict well checkout is doing nothing
18:29 Neobenedict i did that
18:29 Neobenedict didn't owrk
18:30 * Neobenedict git reset --hard head again
18:30 preaction jatin30: you used -D, which ignores that warning
18:30 thiago Neobenedict: git rm -rf . && git checkout lastgoodcommit .
18:30 Neobenedict i did that
18:30 Neobenedict did not work
18:30 Neobenedict i'll try again
18:30 thiago Neobenedict: define "did not work"
18:30 thiago Neobenedict: you should have *exactly* the tree from lastgoodcommit
18:30 Neobenedict the files that were made by the bad commit were still there after typign that command
18:31 Neobenedict i'll try again.
18:31 mwhooker joined #git
18:31 thiago Neobenedict: then you typed the wrong comit. That's not the last known good commit.
18:31 jatin30 preaction, but that is neccesary to delete right? how do we del without using -D?
18:31 Neobenedict how do I see a history of commits to master in cli
18:31 thiago Neobenedict: git log master
18:31 Neobenedict gitlab is clearly also messed up
18:31 preaction jatin30: lower-case -d
18:31 ahmed_elgabri joined #git
18:31 thiago Neobenedict: you may want to add --graph --decorate
18:32 thiago jlf: are you on windows? What filesystem are you using?
18:33 jlf ubuntu 16.04, root fs is /dev/mapper/vagrant--vg-root on / type ext4 (rw,relatime,errors=remount-ro,data=ordered)
18:33 jatin30 preaction, still the same https://bpaste.net/show/c197219322af
18:33 mwhooker joined #git
18:33 thiago jlf: so filemode should be true
18:33 preaction jatin30: you didn't add a commit to "wtf", so it was fully-merged with master
18:33 EduardoMartins joined #git
18:33 jatin30 i did commit
18:33 preaction jatin30: see the commit message? it says what branch you committed to: [master c80bfdb]
18:33 preaction you committed to master
18:34 jatin30 yes
18:34 jatin30 ohk
18:34 jatin30 thanks
18:34 preaction jatin30: git branch <new_branch> just creates, it doesn't also checkout. you could "git checkout -b wtf" to do both
18:34 jlf thiago: thiago: and yet i see hundreds of spurious file permission diffs in git status
18:35 stantonk joined #git
18:35 Neobenedict thiago: okay. there is a commit before that
18:35 Neobenedict apparently
18:35 thiago jlf: are you sure that you've checked out on ext4?
18:35 Neobenedict even though on the most recent commit it's doing the exact same thing with adding some of the files
18:36 Ahmed90 joined #git
18:36 Neobenedict thiago: so, if i revert to that, is there a way to add back the good commits that happened after
18:36 Neobenedict or checkout xxx . to that
18:36 thiago Neobenedict: checkout means "exactly like"
18:37 thiago Neobenedict: there's only one commit that is entirely good
18:37 thiago Neobenedict: find it first
18:37 thiago Neobenedict: if you have commits whose changes you want to keep, use git cherry-pick after the checkout
18:37 Neobenedict ok thats what i wanted
18:37 zarel joined #git
18:38 Balliad joined #git
18:38 Neobenedict ok. that looks correct.
18:39 Neobenedict thiago: so now, git cherry-pick the commits to master that happened after that I want to keep
18:39 Neobenedict then push this
18:39 Neobenedict and it should all be fixed
18:39 thiago Neobenedict: yes
18:39 wrkrcoop joined #git
18:40 thiago Neobenedict: before you push, confirm that the contents are exactly what you want them to be
18:40 Neobenedict and let's say
18:40 Neobenedict i'm wrong
18:40 Neobenedict and this messes things up further
18:40 Neobenedict as it's all one commit
18:40 Neobenedict it can be undone easily
18:40 Neobenedict and we can go back to square one
18:40 wrkrcoop i have a repo called develop, i need to revert back to yesterday before some code got merged, how do i do that? code is on github
18:40 thiago you'd just be making things worse
18:40 thiago don't push until you're certain
18:40 stuh84 joined #git
18:41 User458764 joined #git
18:41 thiago wrkrcoop: do you want to remove those commits from history, as if they hadn't been pushed?
18:41 wrkrcoop thiago: if thats the only way to revert i guess so
18:41 thiago wrkrcoop: or just make the contents be equal to yesterday's
18:41 wrkrcoop thiago: i kinda want to hide them until a future date
18:41 st0opkid joined #git
18:41 thiago wrkrcoop: I'm asking you because you have options. Just be aware of !rewrite.
18:41 gitinfo wrkrcoop: 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
18:42 wrkrcoop what if i manually change the code to match yesterday and push and mrege
18:42 rcpp85 thiago: well, I decided to stop searching for a needle in a raystack. I will create a branch with a hot fix and merge it there. Obrigado!
18:42 thiago wrkrcoop: that's the second option.
18:42 Neobenedict [19:40:35] <thiago> you'd just be making things worse <- how so?
18:42 thiago Neobenedict: by pushing a commit you didn't want.
18:43 Neobenedict but it can be undone, correct, with git revert
18:43 thiago Neobenedict: your problem started with pushing bad stuff. Pushing more bad commits doesn't make it better.
18:43 thiago Neobenedict: it's better not to push the bad commit in the first place.
18:43 GavinMagnus joined #git
18:43 thiago so check
18:44 Neobenedict tell me about it >:
18:44 Neobenedict i'll check
18:44 xaviergmail joined #git
18:45 jlf thiago: http://paste.lisp.org/display/319564#1
18:47 rominronin joined #git
18:48 thiago jlf: looks correct to me, except for that vboxsf mount. Can you unmount it, just for us to be sure?
18:48 zumba_addict joined #git
18:48 b100s joined #git
18:49 oich joined #git
18:50 fuchstronaut joined #git
18:51 Neobenedict thiago: do I need to cherry-pick after commiting & pushing
18:51 Neobenedict and I can cherry-pick at any time?
18:51 thiago Neobenedict: you can do it at any time
18:51 eletuchy joined #git
18:51 thiago Neobenedict: obviously, anything you do after the push will not be visible to ther people
18:51 Neobenedict ?
18:51 Neobenedict until it is committed/pushed itself you mean
18:52 thiago right
18:52 FunkyAss joined #git
18:53 xall joined #git
18:54 jlf thiago: i could, but it would be somewhat painful.  is there any reason to suspect some random subdirectory of / might be involved?
18:54 Neobenedict alright
18:54 Neobenedict thanks thiago and ojacobson
18:54 thiago jlf: I don'tk now
18:55 Neobenedict seems that's putt hings back to how they were
18:55 thiago jlf: but I'm trying to rule that out
18:56 jlf i'll perform a clone through strace and grep the output for that directory
18:56 livingstn joined #git
18:56 [Brain] joined #git
18:56 thiago git init might do the same and be easier to trace
18:57 Neobenedict oh, thiago: to answer your original question
18:57 Neobenedict applications is not showing as merged, but "origin/master" is showing as "merged" in gitlab.
18:59 thiago Neobenedict: I don't think I asked anything about gitlab
18:59 Sasazuka joined #git
19:00 jlf nope, not guilty: http://paste.lisp.org/display/319564#2
19:00 Neobenedict thiago: but you did ask if the branch had been merged
19:00 Neobenedict and there's your answer. so I can still merge it straight in after this with no issues
19:00 thiago Neobenedict: but I don't care what a web interface says
19:00 Neobenedict is there a way to check with cli?
19:01 Neobenedict i assume gitlab would take it from git
19:01 thiago Neobenedict: git log ..otherbranch. If the output is empty, it's been merged.
19:01 chrisshattuck joined #git
19:01 Neobenedict not empty
19:01 thiago Neobenedict: so it's not merged
19:01 setuid left #git
19:01 Neobenedict yeah.
19:01 Neobenedict what in the hell then.
19:01 thiago jlf: filemode was set to true, right?
19:01 Neobenedict idk. but it's been undone
19:02 thiago Neobenedict: merges can't be undone
19:02 jlf correct
19:02 thiago jlf: find a file that git status is reporting a problem with
19:03 Neobenedict thiago: I mean, as a general comment, this mess has been undone.
19:03 thiago jlf: what are the permissions on the filesystem?
19:03 thiago Neobenedict: ok, glad to have helped.
19:03 Neobenedict yeah, cheers
19:03 barteks2x joined #git
19:05 MattMaker joined #git
19:06 mwhooker joined #git
19:06 edude03 joined #git
19:06 stantonk joined #git
19:08 hahuang61 joined #git
19:08 eletuchy joined #git
19:09 floatingpoint joined #git
19:12 romerocesar joined #git
19:12 EvilPenguin joined #git
19:13 jlf thiago: /dev/mapper/vagrant--vg-root on / type ext4 (rw,relatime,errors=remount-ro,data=ordered)
19:14 GavinMagnus joined #git
19:15 bremner how does git select a key to sign with? I _think_ I want to specify a subkey, but I can't see how.
19:15 * jlf sighs
19:16 qsx bremner: user.signingkey=32583db1
19:16 qsx bremner: and usually it isn’t necessary to select a specific subkey
19:16 chrisshattuck joined #git
19:16 bremner qsx: you'd think so wouldn't you, except I just had to do that to get gpg working standalone.
19:17 qsx bremner: what does your key look like?
19:17 qsx like, gpg --with-subkey-fingerprints -k 32583db1
19:17 bremner qsx: primary offline, one signing subkey on a smartcard, one offline
19:17 molt joined #git
19:18 nilg joined #git
19:18 bremner http://paste.debian.net/772554/
19:20 vuoto joined #git
19:20 bremner and, that fixed it.
19:21 grill joined #git
19:22 bremner probably having two signing subkeys confuses gpg
19:22 qsx i see
19:22 qsx it might
19:22 qsx i have one each for S, C, E and A
19:23 bremner at some point I made an x509 cert tied to the web of trust. But nobody understands the concept anyway, so...
19:23 Doginal joined #git
19:23 qsx i’m still trying to get my PGP key in DNS (which is secured with DNSSEC)
19:23 Eryn_1983_FL joined #git
19:23 qsx but, er, 4x 4k RSA vs DNS … :D
19:23 raijin joined #git
19:24 satifant joined #git
19:24 qsx currently all i got is qsuscs._pka.qsuscs.de.  300     IN      TXT     "v=pka1;fpr=E384009D3B54DCD321BF953295EE94A432583DB1;uri=https://qsuscs.de/32583DB1.asc"
19:24 javajoe joined #git
19:24 quetz joined #git
19:26 shgysk8zer0 joined #git
19:27 shgysk8zer0 joined #git
19:28 bittin joined #git
19:29 bremner I saw a talk on DNSSEC, and it seemed very cool, but I never got farther than that.
19:31 nilg joined #git
19:33 dsdeiz joined #git
19:34 satifant joined #git
19:34 zumba_addict joined #git
19:37 numberwhun1 joined #git
19:37 numberwhun1 left #git
19:38 numberwhun1 joined #git
19:38 numberwhun1 left #git
19:38 numberwhun1 joined #git
19:38 chrisshattuck joined #git
19:39 ochorocho__ joined #git
19:39 jstimm joined #git
19:39 numberwhun1 left #git
19:41 mikecmpbll joined #git
19:46 ahmedelgabri joined #git
19:46 zumba_addict joined #git
19:48 rominronin joined #git
19:48 t0by joined #git
19:49 blackwind_123 joined #git
19:51 FunkyAss joined #git
19:51 fuchstronaut joined #git
19:52 nettoweb joined #git
19:52 jaguarmagenta joined #git
19:55 ahmed_elgabri joined #git
19:57 TomyWork joined #git
19:57 ynanm joined #git
19:58 dangerousdave joined #git
19:59 dangerousdave evening all
19:59 whomp joined #git
19:59 dangerousdave I have this command which is working "git log --since "DEC 1 2015" --until "DEC 5 2016" --author="Dave" --pretty=format:"%h %an %ad"" but I want it to also output the commit message, is that possible please?
20:03 rubyonrailed joined #git
20:05 annoymouse joined #git
20:05 mmlb joined #git
20:06 gosti joined #git
20:07 thiago joined #git
20:10 edude03 joined #git
20:11 ngladitz joined #git
20:11 ngladitz joined #git
20:12 bazz_ left #git
20:12 boombatower joined #git
20:15 CJKinni joined #git
20:15 Raging_Hog joined #git
20:16 ams__ joined #git
20:16 alex1a joined #git
20:16 LaptopBrain joined #git
20:16 ajf- joined #git
20:18 ajf- joined #git
20:18 ajf- left #git
20:20 xaviergmail joined #git
20:21 zarel joined #git
20:21 cmmagid joined #git
20:22 samson joined #git
20:25 freimatz joined #git
20:26 TomyLobo joined #git
20:27 heroux joined #git
20:29 diogenese joined #git
20:30 lamba_ left #git
20:30 agileadam joined #git
20:30 nnyk_ joined #git
20:31 linx joined #git
20:32 javajoe joined #git
20:36 marcadde1 left #git
20:36 mdw joined #git
20:36 marcaddeo joined #git
20:36 mwhooker joined #git
20:39 diegoviola joined #git
20:40 linx joined #git
20:45 CrazyBonz joined #git
20:49 markmarkmark dangerousdave: see the PRETTY FORMATS section of man git log
20:49 gitinfo dangerousdave: the git-log manpage is available at http://jk.gs/git-log.html
20:49 zumba_addict joined #git
20:49 markmarkmark specifically it looks like you might want %s %b or %B
20:49 rominronin joined #git
20:51 EvilPenguin joined #git
20:54 diogenese joined #git
20:58 jstein_ joined #git
20:58 ocbtec joined #git
20:59 holodoc joined #git
21:04 Kisho joined #git
21:04 Jason_ joined #git
21:08 ToBeCloud joined #git
21:08 hahuang61 joined #git
21:09 Kisho Hi there, I have a question about a best practice in git. I work with two colleagues at a remote git repository. If I am editing a File and my friend is also editing the same file and he commits first, I am struggling with the problem that I cannot pull or fetch from the repository because of a conflict. In the current situation I don't want to commit my own changes, but I want to get the current state from the remote repository. What are normal g
21:09 lb Kisho you can always fetch
21:10 paws_ joined #git
21:10 lb then you can merge and resolve conflicts of they occur
21:10 Kisho okay, but then i dont have the fetched data in my current working set?
21:10 kadoban Kisho: No, that's not what fetch does.
21:11 kadoban Kisho: If you both work on the same file, you should commit your changes. Then fetch, then either rebase your changes or merge them with the remote ones, and then push.
21:13 Kisho ah okay, but I am forced to commit my changes so far?
21:13 codezomb joined #git
21:13 kadoban You could stash instead, if you want. Commits should be often though
21:14 Kisho all right, thanks for your help :) little bit hard for svn users to get started with git :D
21:14 SwiftMatt joined #git
21:14 vuoto joined #git
21:15 lb Kisho you dont have to commit in order to merge
21:15 kadoban Yeah it's a bit of a shift in semantics
21:15 lb but conflict will arise nevertheless
21:16 wrkrcoop joined #git
21:16 eijk_ joined #git
21:17 kadoban Well, you can't really merge without a commit or a stash (which is just a commit in hiding)
21:20 Sasazuka joined #git
21:22 aidalgol joined #git
21:23 Codfection joined #git
21:25 mozzarel1 joined #git
21:25 akiva joined #git
21:26 nnyk_ joined #git
21:27 Kaisyu22 joined #git
21:27 XVar and that's why working on feature branches is a much better practice than everyone committing to master
21:27 XVar you do your work, merge master (or develop if using gitflow) into your branch if there's been any other merges to master since you branched, and then merge/rebase back to master
21:27 ReenignE- joined #git
21:27 ReenignE- joined #git
21:28 yanope joined #git
21:30 Neic0 joined #git
21:30 yx_ joined #git
21:30 devster31 joined #git
21:31 Lunatrius joined #git
21:32 Orion3k joined #git
21:33 JanC joined #git
21:34 artemisart joined #git
21:35 dan2k3k4 joined #git
21:35 JanC joined #git
21:35 LeBlaaanc joined #git
21:36 Kisho XVar thanks for the notice. I heared something like that before but was not comfortable with the idea of doing everything in an own branch, especially when the changes are not that big
21:36 XVar Kisho: you should get comfortable with it, easy branches are one of the biggest benefits of git
21:36 sonOfRa_ joined #git
21:36 tilpner_ joined #git
21:37 XVar making very quick changes to the main branch is fine, but if people are commiting before you have chance to make them then they aren't small enough :P
21:37 raijin joined #git
21:37 dan2k3k4 joined #git
21:37 mwhooker joined #git
21:38 Matrixiumn joined #git
21:38 esc_ joined #git
21:39 drbean_ joined #git
21:39 ulkesh_ joined #git
21:42 ahr3n joined #git
21:42 benwboot_ joined #git
21:44 mniip_ joined #git
21:44 thejoecarroll_ joined #git
21:44 sparetire_ joined #git
21:44 yqt joined #git
21:45 njbair_ joined #git
21:45 arand_ joined #git
21:46 sgen joined #git
21:46 Ardethian\work joined #git
21:50 Muzer joined #git
21:50 renatosilva joined #git
21:50 rominronin joined #git
21:52 wrkrcoop joined #git
21:53 jaguarmagenta joined #git
21:53 fuchstronaut joined #git
21:53 fuchstronaut joined #git
21:54 shgysk8zer0 joined #git
21:54 h264 joined #git
21:59 zmanfx joined #git
21:59 joki joined #git
22:00 stantonk joined #git
22:01 LeBlaaanc joined #git
22:01 jeffreylevesque joined #git
22:02 raijin joined #git
22:05 Pyrogerg joined #git
22:05 c0ded joined #git
22:09 mikecmpbll joined #git
22:10 WaReZ joined #git
22:10 monokrome Does anyone know how this is even possible?
22:10 monokrome https://gist.github.com/monokrome/2d5f1c5a8dbe3157ac4f40a94ceba6ce
22:11 monokrome The tag that I expected to get is 1.3.21, and 1.3.21-2-gdad783d isn't even a real tag.
22:12 shinnya joined #git
22:12 eletuchy joined #git
22:12 polyzen joined #git
22:15 jstimm joined #git
22:16 LeBlaaanc joined #git
22:20 m0viefreak monokrome: you did get 1.3.21, plus 2 additional commits
22:20 m0viefreak thats exactly what git describe should do
22:21 Jason_ joined #git
22:22 agileadam joined #git
22:25 ErKa joined #git
22:26 trobotham joined #git
22:28 trobotham joined #git
22:30 piling_ joined #git
22:32 choki joined #git
22:34 inflames joined #git
22:39 agileadam joined #git
22:39 Kisho left #git
22:42 zaherdirkey joined #git
22:43 zaherdirkey is it possible to fork a folder in another repo, just one folder not the whole of the project/repo?
22:45 kadoban zaherdirkey: You can with git subtree split
22:46 ochorocho__ joined #git
22:47 artemisart joined #git
22:48 thiago joined #git
22:49 moei joined #git
22:50 Daiyousei joined #git
22:51 Daiyousei left #git
22:51 rominronin joined #git
22:52 rubyonrailed joined #git
22:53 afuentes joined #git
22:54 fuchstronaut joined #git
22:57 joko joined #git
22:57 rolha joined #git
22:58 kulelu88 joined #git
22:59 Vinnie_win joined #git
23:00 madewokherd joined #git
23:01 Impaloo joined #git
23:03 romerocesar joined #git
23:04 elastix joined #git
23:06 GavinMagnus joined #git
23:09 eletuchy joined #git
23:09 SwiftMatt joined #git
23:10 hahuang61 joined #git
23:11 safe joined #git
23:16 dmto joined #git
23:16 mwhooker joined #git
23:18 mablae_ joined #git
23:22 ffabi joined #git
23:22 jaggz joined #git
23:29 CheckDavid joined #git
23:29 pcfreak30 joined #git
23:30 pcfreak30 how can i split a commit and all history after to a new branch?
23:31 kanzure joined #git
23:31 GavinMagnus left #git
23:33 javajoe joined #git
23:33 linx joined #git
23:34 romerocesar joined #git
23:35 olympionex joined #git
23:36 SpeakerToMeat joined #git
23:37 javajoe Is it possible to use git to deploy to production server instead of using FTP?
23:38 HoierM joined #git
23:38 preaction javajoe: !deploy
23:38 gitinfo javajoe: 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
23:40 olympionex I'm using git 2.7.4 and when i clone a repo with submodules, the .git file in the submodule path still uses an absolute path for the gitdir.    I was reading the bug reports and it looked like this was discussed and even patched 5 years ago on a 1.7 version or so.  Is there any way I can force git to use relative dirs so I don't have to update them manually everytime I clone?
23:41 sbeller olympionex: that bug was reintroduced in 2.7, fixed in 2.8
23:41 olympionex ah, thx
23:42 sbeller (this time with regression tests)
23:42 kanzure joined #git
23:42 javajoe gitinfo: I was thinking that there was a way I could use git to push files to remote server where remote server is my production server
23:47 sangy joined #git
23:47 zumba_ad_ joined #git
23:51 Kulrak joined #git
23:51 Kulrak joined #git
23:51 kanzure joined #git
23:51 zivester joined #git
23:52 liuzhen joined #git
23:54 jaguarmagenta joined #git
23:55 alfy joined #git
23:55 jsgrant joined #git
23:56 benwbooth joined #git
23:57 alfy left #git

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