Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-21

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

All times shown according to UTC.

Time Nick Message
00:02 cr1tic joined #git
00:02 ChrisF79 joined #git
00:06 dave0x6d joined #git
00:08 Basho joined #git
00:10 jstimm joined #git
00:11 brent__ joined #git
00:14 ChrisF79 joined #git
00:15 jeffreylevesque joined #git
00:15 jason237 joined #git
00:16 mrcrjs joined #git
00:17 ncthom91 joined #git
00:21 cr1tic joined #git
00:24 steve joined #git
00:26 rominronin joined #git
00:31 re1_ joined #git
00:34 oaao joined #git
00:36 jstimm joined #git
00:36 ertes joined #git
00:38 oaao joined #git
00:39 pbrewczynski_c joined #git
00:44 monjwf joined #git
00:45 durham_ joined #git
00:46 rmesta joined #git
00:48 Cabanossi joined #git
00:52 todd_dsm joined #git
00:53 ShadowDancer437 joined #git
00:53 rnsanchez joined #git
00:54 peacememories joined #git
00:54 fstd_ joined #git
00:56 aidalgol joined #git
00:58 alexggordon joined #git
00:59 ojdo joined #git
01:00 ShadowDancer437 Hi! On Windows 10 almost every time I try to do a "git rebase" I get the following error: "rm: cannot remove 'C:/SomeProject/.git/rebase-apply/rewritten': Device or resource busy". I don't know what I did but it used to work normally before, so I'm not sure if it was something I changed or if it was some Git or Windows update... Anyway has a clue on what could be? Thanks!
01:01 ShadowDancer437 I'm using this version: git version 2.12.2.windows.2
01:02 ShadowDancer437 *Anyone
01:02 bronson joined #git
01:05 astrofog joined #git
01:06 svm_invictvs joined #git
01:13 scoobertron joined #git
01:16 nowhereman joined #git
01:17 Gsham joined #git
01:18 ki0 joined #git
01:18 Cabanossi joined #git
01:19 cagomez joined #git
01:19 ki0_ joined #git
01:19 ki0_ joined #git
01:21 jimi_ joined #git
01:27 brent__ joined #git
01:31 nexemacs joined #git
01:31 msonntag joined #git
01:32 unplayednamer joined #git
01:38 mar77i_ joined #git
01:39 chipotle joined #git
01:41 davimore joined #git
01:46 Gsham joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:52 Nilesh_ joined #git
01:53 theiostream joined #git
01:55 telephone joined #git
01:55 telephone joined #git
01:58 rominronin joined #git
01:59 bket joined #git
02:01 ki0 joined #git
02:02 ki0 joined #git
02:02 nexemacs joined #git
02:03 sunri5e joined #git
02:03 ki0 joined #git
02:08 Gsham joined #git
02:11 fbwnd joined #git
02:12 nexemacs joined #git
02:13 a3Dman joined #git
02:14 nexemacs joined #git
02:17 dsdeiz joined #git
02:17 dsdeiz joined #git
02:17 Cabanossi joined #git
02:19 TbobbyZ joined #git
02:19 inflames joined #git
02:22 bronson joined #git
02:29 alexggordon joined #git
02:29 Gsham joined #git
02:29 cdown joined #git
02:33 fish3485 joined #git
02:34 nexemacs joined #git
02:34 duderonomy joined #git
02:36 drodger joined #git
02:37 tnecniv joined #git
02:38 watabou joined #git
02:42 Rodya_ joined #git
02:43 snowkidind joined #git
02:44 lb1c joined #git
02:45 earnestea joined #git
02:47 Vortex35 joined #git
02:50 justanotheruser joined #git
02:51 aavrug joined #git
02:53 lagothrix joined #git
02:58 hexagoxel joined #git
02:59 chachasmooth joined #git
03:00 mar77i joined #git
03:02 Moose_ joined #git
03:02 h0m3 joined #git
03:02 rewt`` joined #git
03:03 nick123_ joined #git
03:03 h0m3 joined #git
03:03 h0m3 left #git
03:03 PaulCape_ joined #git
03:04 jameser_ joined #git
03:04 Gsham_ joined #git
03:04 XenophonF joined #git
03:04 cads2 joined #git
03:05 PtxDK joined #git
03:07 Hink joined #git
03:08 cwre joined #git
03:22 justin3 joined #git
03:23 taoqy joined #git
03:24 scarabx joined #git
03:25 justan0theruser joined #git
03:27 scarabx left #git
03:29 rominronin joined #git
03:30 mar77i joined #git
03:31 bronson joined #git
03:40 kfoonamalik joined #git
03:46 Cabanossi joined #git
03:47 Lyqyd joined #git
03:47 kfoonamalik joined #git
03:52 Motoko joined #git
03:53 jost__ joined #git
03:53 fakenerd joined #git
03:54 bronson joined #git
03:54 Bock joined #git
03:56 Bock joined #git
03:58 buzzLightBeer joined #git
03:59 chigang joined #git
04:01 TikityTik joined #git
04:03 bwn joined #git
04:04 Rodya_ joined #git
04:06 ki0 joined #git
04:09 theiostream joined #git
04:09 Nilesh_ joined #git
04:10 rscata joined #git
04:10 crankslider joined #git
04:14 Anthaas joined #git
04:15 darkbit joined #git
04:16 Cabanossi joined #git
04:20 govg joined #git
04:21 oleo joined #git
04:21 TbobbyZ joined #git
04:22 cdown joined #git
04:24 schleppel joined #git
04:25 systemovich joined #git
04:26 alexggordon joined #git
04:30 Xenophon1 joined #git
04:32 Noodlewitt joined #git
04:34 rchavik joined #git
04:36 senaps joined #git
04:37 govg joined #git
04:38 ayogi joined #git
04:39 freimatz joined #git
04:39 Goplat joined #git
04:42 m9xDRv8TeTry joined #git
04:42 marianina8 joined #git
04:42 bannakaffalatta joined #git
04:43 m9xDRv8TeTry on merge conflict, when unmerged paths are showing as "both modified"... do i necessarily need to hand edit these files?
04:44 m9xDRv8TeTry can i just force merge them, overwriting the conflicting changes?
04:44 freimatz3 joined #git
04:44 m9xDRv8TeTry for example if im `git cherry-pick`ing from a different branch
04:44 m9xDRv8TeTry and i know that the commit im cherry-picking is authoritatively correct
04:45 netj joined #git
04:46 cdown_ joined #git
04:47 abra0 joined #git
04:47 _ikke_ git checkout --theirs <file>
04:47 _ikke_ That would pick the version of the cherry-picked commit
04:48 mar77i joined #git
04:49 m9xDRv8TeTry hm
04:51 cdown_ joined #git
04:53 tarkus joined #git
04:55 svm_invictvs joined #git
04:56 Macaveli joined #git
04:56 bannakaffalatta joined #git
04:57 rchavik joined #git
05:01 Cabanossi joined #git
05:01 rominronin joined #git
05:06 bronson joined #git
05:13 MattMaker joined #git
05:17 Freak joined #git
05:17 Freak left #git
05:21 ShapeShifter499 joined #git
05:22 ZyX-I joined #git
05:26 freimatz joined #git
05:27 ArchNoob joined #git
05:30 gitn00b joined #git
05:30 Saint_Isadore joined #git
05:31 Cabanossi joined #git
05:32 gitn00b Hello
05:32 gitinfo gitn00b: 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.
05:32 gitn00b Need help with git branch setup for my project.
05:33 qt-x joined #git
05:35 gitn00b It will be based on top of a bought php platform. I'm thinking of keeping one branch for the official releases, and one with my changes and merging them with every new release.
05:35 gitn00b Would you suggest anything else?
05:37 Guest48456 joined #git
05:39 MineCoins joined #git
05:41 kadoban Sounds like a good start. You should have a branch for your own stuff, the official branch that you merge into your own stuff, and feature branches off of your main own-stuff branch. Or depending how the platform works, you could perhaps have it as a submodule. It depends.
05:42 alexggordon joined #git
05:43 gitn00b Thanks for your input! I don't think a submodule would work in my case. Should I use merge or rebase my branch on top of the official branch on each new release?
05:44 kadoban Up to you usually. If you're sharing the history with others, usually merge. Otherwise, it depends what you want history to look like.
05:47 navidr joined #git
05:48 SwiftMatt joined #git
05:48 tttt joined #git
05:51 ThomasLocke joined #git
05:51 ThomasLocke joined #git
05:51 fakenerd_ joined #git
05:52 fakenerd joined #git
05:55 fakenerd joined #git
05:56 gitn00b Is there any naming convention for the "official" branch?
05:56 preaction master is the most common
05:59 inflames joined #git
06:01 Raging_Hog joined #git
06:01 Silmarilion joined #git
06:01 acetakwas joined #git
06:02 JanC_ joined #git
06:02 bannakaf_ joined #git
06:05 sbulage joined #git
06:11 JeroenT joined #git
06:11 JeroenT_ joined #git
06:11 tohuw joined #git
06:14 MineCoins joined #git
06:18 serdar joined #git
06:19 govg joined #git
06:22 jagob joined #git
06:25 afuentes joined #git
06:26 TbobbyZ joined #git
06:27 freimatz joined #git
06:30 wachpwnski-mobi1 joined #git
06:31 nevodka joined #git
06:31 nevodka joined #git
06:31 rominronin joined #git
06:31 tarkus joined #git
06:37 Croab joined #git
06:37 Croab left #git
06:38 chele joined #git
06:38 jost__ joined #git
06:39 Guest85822 joined #git
06:40 zeroed joined #git
06:40 zeroed joined #git
06:43 Croab_ joined #git
06:47 zerow joined #git
06:50 XenophonF joined #git
06:51 overlord_tm joined #git
06:52 Noodlewitt joined #git
06:57 quizzi joined #git
06:58 ronskisika joined #git
06:59 osse Can I make git diff -S... only print the relevant hunks instead of all the changes in the files?
06:59 palimondo joined #git
07:01 palimondo joined #git
07:01 jagob joined #git
07:02 Noodlewitt joined #git
07:02 Tobbi joined #git
07:06 oaao joined #git
07:08 Noodlewitt joined #git
07:10 Croab_ left #git
07:12 Croab_ joined #git
07:13 Croab_ Hey all.  Im new with git.  i hope someone can help me:  i installed git on a linux server and i am able to login to this server using ssh with key autorisation in a git-shell and enabled some commands, but the internal filesystem commands do not work.  How can i enable this commands such as cd, cp, mkdir, etc..
07:14 Croab_ Hey all.  Im new with git.  i hope someone can help me:  i installed git on a linux server and i am able to login to this server using ssh with key autorisation in a git-shell and enabled some commands, but the internal filesystem commands do not work.  How can i enable this commands such as cd, cp, mkdir, etc..
07:14 watabou joined #git
07:14 davimore joined #git
07:17 osse Croab_: they're not supposed to work.
07:17 osse if you want to use the server in the regular way, log on with a different user or don't use git-shell as the login shell
07:18 Croab_ osse: thnx. but then the user can execute a lot more commands than i wish :)
07:18 osse Croab_: yes, but in this case you are "the user"
07:19 Croab_ osse: at this moment: yes. But i am creating a environment for an external user.  no other possibilities?
07:20 ambro718 joined #git
07:20 osse not sure how git could differentiate this moment from any other moment
07:20 mikecmpbll joined #git
07:20 osse it might work to copy /usr/bin/bash to ~/git-shell-commands/ then execute that
07:21 palimondo I have messed up my branch, because I’m a novice and get my git know-how by pagefaulting on stackoverflow. I’m pushing my branch to github, and had trouble getting it through
07:21 Croab_ osse: will try that. thanks for the help! Now i know the current situation has to be that way.
07:22 osse Croab_: it sounds like you want to provide a general but restricted environment for other users. git-shell is not the tool for that
07:22 manuelschneid3r joined #git
07:23 palimondo I should have probably just force pushed, but did a rebase and merge and stuff and now I have a mess, that I don’t know how to clean up. Here’s the messed up commits on github: https://github.com/apple/swift/pull/8793/commits
07:23 osse Croab_: or perhaps it works if you make symlinks the tools you want in ~/git-shell-commands
07:23 Croab_ osse: that is my thought also.  maybe i need to look for something such as a chrooted / jailed ssh environment.
07:24 palimondo My reflog https://gist.github.com/palimondo/a4a934e067a99cb1a336b4368dee11c0 and my log https://gist.github.com/palimondo/01b142a4f11999409835389d4a133a1b
07:24 Croab_ osse: but how do i make symlinks to internal file system commands..
07:24 osse a well-written /etc/sudoers should work well
07:24 djb-irc joined #git
07:24 osse Croab_: what do you mean by internal
07:24 osse mkdir is a program. cp is a program.
07:24 osse cd is not, so you're screwed there
07:24 Croab_ osse: cd is an interal filesystem command, provided by bash
07:24 Croab_ thats my point :)
07:25 osse the only solution is to not use git-shell for this purpose
07:25 Croab_ anyway.  im going to test bash in git-shell  or some chrooted/jailed enviroment maybe with sudoers indeed
07:26 osse if users are able to launch bash from git-shell then that's no different from not using git-shell in the first place
07:26 Croab_ thanks again!  you helped me a lot.  i was searching for something that is not possible
07:26 palimondo I want to clean up the `compare-performance` branch on my machine and force push to github. But I don’t know how to clean it up, so that it contins just my regulat commits, not the one accigentally included from attrick and my mistaken merge commits. Help?
07:27 MineCoin_ joined #git
07:28 osse palimondo: is 'Refactoring: Exctracted Markdown formatting, exctacted list computations' a commit you want to keep?
07:28 osse that's the last commit operation in the reflog
07:30 palimondo osse: Yes. That is my last local commit I made, but couldn’t push to github due to all the mess.
07:30 CrummyGummy joined #git
07:31 osse palimondo: then I suggest you make a tmp branch at that point:  git branch -b tmp a6fb2869ac. can you confirm that the branch tmp looks like what compare-performance did ?
07:31 palimondo osse: I tried to change that commit message with ammed, though
07:31 osse as in, the tmp branch now looks like a correction of compare-performance, albeit from some time ago?
07:32 palimondo osse: error: unknown switch `b'
07:32 osse shit
07:33 osse git branch tmp a6fb2869ac
07:33 elect joined #git
07:33 a_thakur joined #git
07:34 grayjoc joined #git
07:36 palimondo osse: I’m not sure how to tell. It still includes 095083e0 “CopyForwarding: new optimization to remove copies into dead temporaries.” from attrick when I look at the tmp branch in Git Tow…
07:36 dfas joined #git
07:36 palimondo Tower
07:37 osse why shouldn't it
07:39 rokups joined #git
07:39 osse that looks like a commit that was done directly on your branch, not merged in
07:39 palimondo I don’t know. Other branches I pushed to github included only my own commits, so that confuses me. I mean since I branch, only my commits follow.
07:39 Tobbi joined #git
07:39 palimondo osse: That’s a mistake I somehow made by rebasing.
07:40 osse a branch doesn't "stop" somewhere. technically a branch contains all commits from its tip all the way to the start of the repo
07:42 ankit01ojha joined #git
07:42 osse palimondo: different approach then: what commits should it contain, and where should it start?
07:42 palimondo osse: When you look at the git log, all the commits above d0983b4e8c “Fix SR-4590” are on the left track, but they should be in the same like d0983b4e8c. That is the point I did something wrong I think.
07:43 borkr joined #git
07:43 tobiasvl d0983b4e8c should be in the same as d0983b4e8c?
07:43 kurkale6ka joined #git
07:44 dreiss joined #git
07:45 ispn joined #git
07:45 dvaske joined #git
07:45 palimondo_ joined #git
07:46 palimondo_ tobiasvl: aa73f421ad and above should be in same track as d0983b4e8c
07:47 tobiasvl OK, why should they be in the same track?
07:47 osse it looks like you have rebased then merged the old version of your own branch with the rebased version
07:47 osse so I suggest you create new branch, and pick the commits you want to keep
07:47 palimondo osse: Most definitely/
07:48 osse so I ask again: what commits should it contain, and where should it start?
07:48 palimondo osse: Desired branch content: https://gist.github.com/palimondo/f824f9e2eff8683bad16737c799fd96a
07:49 palimondo Will I then be able to force push that to github?
07:49 osse palimondo: git checkout -b newbranch origin/master; git cherry-pick {all those hashes listed here}
07:49 osse assuming you want to base your branch on origin/master (example)
07:49 ronskisika joined #git
07:50 palimondo osse: is there a way to keep the same branch name, so that my push to github would work? (I’m probably misunderstanding how that part works, too...)
07:50 osse palimondo: yes
07:50 osse but let's deal with that afterwards
07:51 palimondo so I’ll do that to a new branch first, let me try…
07:51 osse make sure to start the new branch at a sensible place
07:54 rivarun joined #git
07:56 dre_ joined #git
07:57 palimondo osse: sensible place?
07:57 palimondo osse: I got an error while cherry picking: https://gist.github.com/palimondo/ce22dc8cab9b8775186ca22c6b4365f7
07:57 osse aka. where you want
07:58 palimondo osse: I think I can branch from master as is.
07:58 osse i don't know if origin/master is the correct place
07:58 osse assuming it is, then you just have to fix the conflicts
07:58 palimondo osse: I’m touching a part of code no one else is working at the moment, if that is the guiding concern.
07:59 osse also the arguments to cherry-pick need to be in chronological order
07:59 bwn joined #git
07:59 Lunatrius` joined #git
08:00 palimondo Oh, I see… I tried to make reverse the chronology from log, though
08:00 cagedwisdom joined #git
08:00 palimondo but I messed up
08:02 bwn joined #git
08:02 palimondo osse: I don’t know how to proceed from this partially failed cherry pick
08:03 osse is it the same one?
08:03 osse the one with the arguments in the wrong order?
08:03 palimondo osse: first one was applyied OK, second hash was supposed to be last
08:03 palimondo yes
08:03 rominronin joined #git
08:03 osse git cherry-pick --abort and start over
08:04 mikecmpbll joined #git
08:05 rominronin joined #git
08:05 palimondo osse: Thanks. Now the compare-performance-fixed looks like I wanted.
08:05 bannakaffalatta joined #git
08:06 osse palimondo: now rename it:  git branch --move --force compare-performance
08:06 palimondo osse: Now I need the switcheroo to compare-performance and force push to github… I guess?
08:06 theoceaniscool joined #git
08:06 osse yes
08:08 palimondo So now I should: git push -f mine compare-performance ?
08:08 osse assuming "mine" is your fork, yes
08:09 palimondo mine is the remote name of my fork on github
08:09 osse allahu akbar
08:09 Snugglebash joined #git
08:10 digidog joined #git
08:11 palimondo osse: You are the BEST! Thank you so much.
08:11 osse correct, i am
08:12 clmsy joined #git
08:13 alexggordon joined #git
08:13 nickel_dime_look joined #git
08:13 palimondo osse: How do I repay you?
08:14 Murii joined #git
08:14 MattMaker joined #git
08:16 wachpwnski-mobi joined #git
08:22 marcogmonteiro joined #git
08:23 MineCoins joined #git
08:25 Cabanossi joined #git
08:25 King_Hual joined #git
08:25 King_Hual joined #git
08:26 MineCoins joined #git
08:27 rorro joined #git
08:27 JeroenT joined #git
08:27 TbobbyZ joined #git
08:28 skunkz joined #git
08:32 aidalgol joined #git
08:34 seni joined #git
08:34 ArchNoob joined #git
08:37 elichai2 joined #git
08:37 elichai2 hi
08:37 govg joined #git
08:37 elichai2 I just ran 'git stash save' and I didn't knew it will remove everything that hasn't been committed yet
08:38 elichai2 anyway to undo?
08:38 elichai2 it deleted a file I already added to git but didn't commit yet
08:38 acetakwas joined #git
08:39 gnixev joined #git
08:40 Tuor joined #git
08:40 Tuor joined #git
08:40 rubenb joined #git
08:40 CheckDavid joined #git
08:40 acetakwas joined #git
08:41 elichai2 anyone?
08:41 Sasazuka joined #git
08:42 mquin joined #git
08:42 elichai2 omg I haven't thought it's possible to undo but `git stash pop` did the trick :)
08:44 seni joined #git
08:47 Xenophon1 joined #git
08:48 chll_ joined #git
08:48 mikecmpbll joined #git
08:50 tvw joined #git
08:51 xaa joined #git
08:52 sarri joined #git
08:52 sarri joined #git
08:53 synthmeat joined #git
08:55 [worksti] joined #git
08:56 moritz if you added it, you can also just 'git checkout thepath'
08:57 moritz that brings the file to the state that's currently in the index
08:59 elichai2 +1
08:59 dvaske joined #git
09:00 XII-tdv joined #git
09:01 osse palimondo: good question! I don't know
09:01 osse how about... dreaming about me every night
09:02 masuberu joined #git
09:02 JanC_ joined #git
09:03 dersand joined #git
09:06 [worksti] hey, im wondering about the following scenario. our jenkins server is set up so that it triggers a (huge, slow) build for every commit, even if multiple commits are pushed at once. sometimes, when i push after a day of work, it blocks the jenkins for like an hour, running the same job for each commit. thats not what i want, so i was thinking about the following workflow: commit and push to a branch, then
09:06 [worksti] when im finished, do a git reset --soft to the HEAD of master, and then commit there - if i understand correctly, that should allow me to sort of abandon the branch, and instead commit all my changes as a single commit to the master branch (the loss of commit messages is not an issue in this scenario)
09:07 [worksti] am i thinking correctly, and if so, how could i reference the masters HEAD ? as i understand, HEAD would in that scenario point to the branch im currently in
09:07 selckin you want to use rebase -i to merge your commits
09:07 selckin but doing this just for jenkins is stupid, you want logical small commits that change a single thing
09:07 Tuor joined #git
09:07 Tuor joined #git
09:08 darkbit joined #git
09:09 [worksti] i can do rebase with pushed commits ?
09:10 selckin no, why would they be pushed?
09:12 anohigisavay joined #git
09:12 anohigisavay hi
09:12 anohigisavay how do i include the initial commit in `git rebase -i`?
09:12 osse anohigisavay: add --root
09:13 anohigisavay osse, wow, thanks :D
09:17 theoceaniscool joined #git
09:18 [worksti] well while i work i push my commits so i can run integration tests
09:18 [worksti] and coordinate with colleagues
09:18 seni joined #git
09:18 selckin then why does it block jenkins at the end of the day
09:18 crater2150 joined #git
09:18 [worksti] because jenkins builds only the master branch
09:22 seni joined #git
09:22 anohigisavay i don't quite understand the BUGS section under `git rebase`. but it looks dangerous. what should i do if, say, i have a commit, and a merge commit, and another commit, and i want it to become a squashed regular commit followed by the merge commit?
09:23 tymczenko joined #git
09:24 serdar joined #git
09:24 ski7777 joined #git
09:26 rubenb Hi. I'm looking at getting a list of commits on a single file in a bare repository, how could I be getting that info?
09:29 acetakwas joined #git
09:33 zeroed joined #git
09:33 zeroed joined #git
09:38 tobiasvl rubenb: git log -- filename
09:38 tobiasvl works fine in bare repos
09:38 rubenb Argh. I forgot the --...
09:39 rubenb Thanks!
09:40 a_thakur joined #git
09:43 watmm joined #git
09:43 alexggordon joined #git
09:43 oskarkv joined #git
09:44 watmm Hey, i'm looking for a site featuring shell extensions that integrate with git, there's one in particular but i can't remember it :/
09:44 mikecmpbll joined #git
09:44 XII-tdv joined #git
09:45 zeroed joined #git
09:45 zeroed joined #git
09:45 anohigisavay http://pasteboard.co/6Uu0YEBqt.png
09:46 anohigisavay how would i do `git rebase -i` to include only c, merge and d commit?
09:46 molgrum joined #git
09:46 molgrum joined #git
09:46 tobiasvl anohigisavay: so you want to drop b?
09:46 ToBeCloud joined #git
09:47 anohigisavay tobiasvl, ultimately i want to squash d into c, and leave the merge commit after
09:47 Darcidride joined #git
09:47 anohigisavay if i say something like `git squash -i -p c^` then b will be included
09:48 govg joined #git
09:48 anohigisavay i know that reordering commits with -p is dangerous. that's another issue to be resolved
09:48 Glooomy joined #git
09:50 anohigisavay one thing i can do is drop the merge commit and merge again after rebase. but what if i have more commits and more merges
09:50 HoierM joined #git
09:53 tobiasvl anohigisavay: you can do "git rebase -i c^" and squash interactively, but I think that'll squash the merge commit too implicitly
09:55 anohigisavay tobiasvl, that'll include b, c and d. b is also one commit within c^..d
09:55 brent__ joined #git
09:55 m1dnight_ joined #git
09:55 tobiasvl yes, but you can drop it
09:56 Darcidride joined #git
09:57 anohigisavay tobiasvl, i can. it's just a bit confusing
09:57 anohigisavay i'm writing some docs to tell others it's good to keep as few commits as possible in a pull request
09:57 tobiasvl pick d, pick c, drop b, squash a
09:58 Atm0spher1c joined #git
09:58 zeroed joined #git
09:58 zeroed joined #git
10:00 a_thakur joined #git
10:00 Cabanossi joined #git
10:00 ferr joined #git
10:01 jstimm joined #git
10:01 freimatz joined #git
10:02 anohigisavay http://pasteboard.co/6ULBr3Mla.png
10:02 MattMaker joined #git
10:02 rchavik joined #git
10:02 anohigisavay tobiasvl, this is what i want to achieve
10:02 zeroed joined #git
10:02 zeroed joined #git
10:05 maroloccio joined #git
10:05 tribly joined #git
10:06 marcogmonteiro joined #git
10:07 nrajasekhar joined #git
10:07 nrajasekhar left #git
10:14 anohigisavay can someone help :( , how to http://pasteboard.co/6Uu0YEBqt.png -> http://pasteboard.co/6ULBr3Mla.png
10:14 fide joined #git
10:14 molgrum joined #git
10:14 anohigisavay using `git rebase`
10:15 ferr joined #git
10:18 * palimondo will be dreaming about osse every night… :-D
10:18 palimondo left #git
10:19 osse anohigisavay: git checkout dev; git reset --hard HEAD~2; git cherry-pick --no-commit dev@{1}; git commit --amend -m 'Added c and d'; git merge master
10:19 dvaske joined #git
10:20 Chuguniy joined #git
10:21 IRQ` joined #git
10:21 anohigisavay osse, sorry, that's what i did so i could make the screenshot. but i want to use `git rebase`.
10:22 osse oh...
10:22 osse presumably git rebase -i dev~3; mark the second commit as squash, save and quit, then git merge master
10:23 zeroed joined #git
10:23 zeroed joined #git
10:24 anohigisavay that'll flatten the merge commit (dev will not contain the merge commit)
10:24 osse hence the git merge master adter
10:24 osse after
10:26 anohigisavay osse, k i'll try to explain the background. i'm trying to convince my teammates to include as few commits as possible in a pull request. hopefully one commit for a complete functionality
10:26 osse i don't think it's possible using literally only rebase
10:27 anohigisavay they will still make hundreds of commits but i was thinking they could squash them into very few commits before pusing
10:27 anohigisavay *pushing
10:27 Shock_ joined #git
10:28 anohigisavay occasionally they'll merge from other branches, so commits...merge..commits..merge, etc
10:28 mostlybadfly joined #git
10:28 anohigisavay i'm thinking, they can make it like this: one commit...merge...one commit...merge, etc
10:29 anohigisavay ofcourse they can reorder stuff to make more sense, i.e. put some commits from after a merge commit to before it
10:29 TbobbyZ joined #git
10:30 anohigisavay but some commits will definitely come after a merge because they are based on the code which merge brings in
10:30 anohigisavay if they understand how rebase -i works they can figure it out themselves
10:31 darkbit joined #git
10:31 anohigisavay if it's easy enough they'll be likely to do so, but if it's too complicated i'd rather they keep in status quo
10:32 anohigisavay s/likely/willing
10:33 Jellyg00se joined #git
10:33 anohigisavay rebasing is dangerous. if going with it then it has to be done right
10:35 osse this is easier if they squash and make things pretty while they're working instead of one big rebase right before pushing
10:35 osse that way the history is probably pretty clean when they do the merges in the first place
10:36 anohigisavay osse, yes that's true
10:36 anohigisavay osse, thanks i'll just tell them to do as you said
10:37 osse using commit --fixup and commit --squash with rebase -i --autosquash is amazing
10:37 osse makes thinsg much easier
10:38 ilogger2 joined #git
10:38 Glooomy joined #git
10:39 anohigisavay osse, wow first time i knew this
10:39 anohigisavay --squash and --fixup
10:39 anohigisavay osse, thanks i think that'll work
10:41 fahadash joined #git
10:42 XII-tdv_ joined #git
10:45 MineCoins joined #git
10:45 quizzi joined #git
10:46 Cabanossi joined #git
10:47 a_thakur joined #git
10:48 XII-tdv_ joined #git
10:48 osse anohigisavay: also --autosquash can be made default
10:48 osse I often use --fixup liberally, then after a while do  git rebase -i HEAD~10
10:49 osse or even GIT_EDITOR=cat git rebase -i HEAD~10 when I know i won't do any edits \o/
10:49 osse i have an alias called 'rewrite' for that
10:49 osse https://github.com/Osse/dotfiles/blob/master/.gitconfig#L36
10:50 AbleBacon_ joined #git
10:51 osse Actually that's "deprecated" (funny word to use about my own personal scripts and stuff) in favor of this: http://sprunge.us/JRcf
10:53 leeN joined #git
10:54 Tobbi joined #git
10:55 [worksti] ive got another weird question that im certain proves that im doing things wrong (tm): having multiple remotes, can i somehow push a file only to one remote ?
10:56 _ikke_ nope
10:56 _ikke_ you push commits, not files
10:56 [worksti] thats probably for the best
10:56 _ikke_ If you have this file comitted in a separate branch, you can of course just push that branch to a specific remote
10:56 Ratler joined #git
10:57 [worksti] i think gitlab expects the gitlab-ci file to be in the master branch, unfortunately
10:59 zerow joined #git
10:59 _ikke_ yes, it does
11:00 _ikke_ at least, in the branch you want to build
11:01 a_thakur joined #git
11:07 Glooomy joined #git
11:10 cbreak [worksti]: you can make anorphan branch just containing one file
11:10 cbreak or tags refering to a singular blob
11:10 cbreak but either of those options are rather special purpose
11:11 chachasmooth joined #git
11:11 peacememories joined #git
11:12 imack joined #git
11:13 alexggordon joined #git
11:15 chachasmooth_ joined #git
11:17 rena_ joined #git
11:21 YuGiOhJCJ joined #git
11:22 earnestea joined #git
11:25 XII-tdv joined #git
11:26 _ikke_ yeah, but that would not work in this case
11:27 Tobbi joined #git
11:28 ogny joined #git
11:28 ogny joined #git
11:28 pbandark joined #git
11:29 dglambert joined #git
11:29 dglambert yo
11:29 mikecmpb_ joined #git
11:29 luke_penn joined #git
11:29 osse feel the flow
11:29 osse que pasa paradox
11:31 mikecmp__ joined #git
11:32 sturner joined #git
11:32 MattMaker joined #git
11:36 XII-tdv joined #git
11:36 Acerific joined #git
11:36 rena_ joined #git
11:38 rena_ Hi, I'm trying to add a new line into a markdown file and for some reason it shows @@ -182,6 +182,7 @@ instead of only adding one simple line. Any idea?
11:38 osse doesn't the hunk itself explain it?
11:39 osse or what do you mean? why it says 6 and 7 instead of 0 and 1 ?
11:41 rena_ Usually when I add X new lines to a file and deleted Y lines it shows I added X new lines and deleted Y lines right
11:41 bilal_ joined #git
11:42 osse yes, git diff --stat will say that no also
11:42 osse now
11:42 osse but that's not what those numbers mean.
11:42 rena_ Here, for some reason, when I add X new lines and 0 deleted lines it shows I removed and added the entire file myself.
11:42 tobiasvl line endings?
11:43 osse that's line endings
11:43 osse i find it hard to believe it says @@ -182,6 +182,7 @@ in that case
11:43 osse those numbers are consistent with a one-line addition
11:44 jagob joined #git
11:46 rena_ hmm...it can happen when users use different operating systems right
11:49 rena_ Ok it's working well now. Thanks for the keyword ;)
11:50 ahrs joined #git
11:50 Gloomy joined #git
11:51 osse rena_: hmm, different operating systems maybe. more likely stupid editors
11:51 mindfart joined #git
11:54 onehrxn joined #git
11:57 owlbynight joined #git
11:57 ogny joined #git
12:02 phinxy joined #git
12:02 phinxy How can you link a specific line on github.com
12:02 osse you click on it, then copy the address from the address bar
12:06 seni joined #git
12:09 maroloccio joined #git
12:11 brent__ joined #git
12:12 pasky joined #git
12:14 anohigisavay osse, thanks that's really helpful. was talking with teammates so i missed your replies :P
12:15 seni joined #git
12:16 bwn joined #git
12:16 theoceaniscool joined #git
12:24 re1 joined #git
12:27 seni joined #git
12:27 jast hi guys, the old domain is fixed. I think I've set up redirects for everything. should you notice any breakage of existing links, please let me know.
12:28 pasky joined #git
12:30 kpease joined #git
12:30 Cabanossi joined #git
12:32 TbobbyZ joined #git
12:32 grayjoc joined #git
12:33 livingstn joined #git
12:34 ExoUNX joined #git
12:35 Tobbi joined #git
12:37 creppe joined #git
12:39 marcogmonteiro joined #git
12:39 revoltingPeasant joined #git
12:40 Tobbi joined #git
12:43 parasite_ joined #git
12:43 theoceaniscool joined #git
12:44 alexggordon joined #git
12:44 tribly joined #git
12:48 chrnybo joined #git
12:48 parasite_ joined #git
12:49 tcorneli joined #git
12:50 rmesta joined #git
12:52 iamtakingiteasy joined #git
12:54 freimatz joined #git
12:56 Bennux joined #git
12:56 zxd joined #git
12:56 zxd hi
12:57 _ikke_ jast: \o/
12:58 jeffreylevesque joined #git
12:58 zxd is the difference between git submodules vs adding to .gitignore a gitrepository as a subdir is that the first let people cloning the repository have the addresses of the subdir repositories and their subdirectories under the main repository?
12:59 _ikke_ If you ignore the subdir, then there is notion at all that there is a submodule involved
12:59 Fallen0223 joined #git
13:00 tribly joined #git
13:00 zxd there is 'no' you mean
13:00 zxd no notion
13:00 Tuor joined #git
13:00 Tuor joined #git
13:00 zxd factually I don't understand why ignore a subdir that is a submodule
13:00 i7c nooootion
13:00 i7c ;)
13:00 Cabanossi joined #git
13:02 j08nY joined #git
13:03 zxd I mean why use submodules instead of .gitignore I read about submodules it says it will add the repositories under the file .gitmodules  and that file is part of main repository so I get it when cloning the mai
13:03 zxd so I can also git submodule ini   and update to get the subrepositories checked out into my main
13:03 zxd init*
13:04 zxd so it's more of convinience to keep track of the sub repositories in a file .gitmodules where as with .gitignore one would have to know what to add to .gitignore and also manually clone the repositories
13:04 zxd into the appropiate subdirs
13:05 _ikke_ and find what commit was being used
13:06 _ikke_ submodules track the commit, so that you always get the same version
13:06 Ryanar joined #git
13:07 TheSimonator joined #git
13:10 zxd cool
13:11 osse beans
13:12 zxd .com
13:13 MineCoins joined #git
13:14 zxd oh my I gave wrog laptop power adapter to helpdesk, after returning temporarly laptop, going to have to laptop fo the weekend in about 52min
13:14 Gloomy joined #git
13:14 zxd have no*
13:14 _ikke_ auch
13:15 finalbeta joined #git
13:15 aw1 joined #git
13:19 SlashLife joined #git
13:19 mentazoom joined #git
13:19 theoceaniscool joined #git
13:23 lb1c joined #git
13:24 Gsham joined #git
13:25 aard joined #git
13:26 xall_ joined #git
13:27 simenbrekken joined #git
13:28 livingstn joined #git
13:28 navidr joined #git
13:29 Chuguniy joined #git
13:29 simenbrekken Hi, I'm trying to merge a branch from a common ancestor but at some point there's been a force push thus a few commits/changes are lost. Is there a way to instruct git to merge a branch and keeping changes from both branches regardless?
13:30 osse when you merge you get changes from both branches
13:30 osse not sure what you mean
13:31 bertschneider joined #git
13:31 simenbrekken I'm not sure what went wrong but a number of changes from the branch I'm attempting to merge in are lost after the merge.
13:31 theoceaniscool joined #git
13:32 chachasmooth joined #git
13:32 simenbrekken Or if I could apply the target branch as a pure patch that would work as well
13:33 osse that sound strange
13:34 simenbrekken Agreed, I've never seem it happen before
13:34 simenbrekken seen*
13:35 osse simenbrekken: no offense, but for the most part git gets it right and the user interprets it wrong
13:35 osse simenbrekken: if you do  git diff {ancestor} {branch} do you see the change there?
13:37 simenbrekken osse: yes
13:37 osse simenbrekken: if you do git diff {branch} {mergecommit} do you see the reverse change there?
13:38 Dougie187 joined #git
13:38 simenbrekken sorry, but what should the mergecommit be?
13:39 AaronMT joined #git
13:39 osse its sha1
13:39 osse or "HEAD" I guess, if you just created it.
13:40 simenbrekken osse: yeah, the change is there, listed as a deletion
13:41 boombatower joined #git
13:42 osse is this an automatic merge or were there conflicts?
13:43 simenbrekken osse: conflicts
13:43 simenbrekken osse: but not in the files that have "missing" changes
13:43 MineCoins joined #git
13:43 osse someone effed up while merging, then, most likely
13:43 osse e.g. using 'git checkout --ours'
13:43 simenbrekken any way to remedy this?
13:44 ayogi joined #git
13:44 simenbrekken osse: Ideally at this point I'd like to apply the raw changes from both branches to their common ancestor (master)
13:45 osse redo the merge, or resurrect the changes
13:45 jagob joined #git
13:45 simenbrekken osse: when you say resurrect the changes, this means reverting the deletions manually?
13:46 Cabanossi joined #git
13:46 osse simenbrekken: yes. well, not literally manually. but using something like 'git checkout -p branch -- file'
13:46 simenbrekken osse: alright thanks :)
13:46 tcorneli joined #git
13:47 osse should take a gallant gentleman like yourself not many units of time
13:47 ArchNoob joined #git
13:47 simenbrekken osse: appreciate the help, I guess I'll have to get to it!
13:47 osse simenbrekken: the thing is that 'git checkout --ours' checks out "our" version of a file completely, so even the parts of the file that git managed to merge get overwritten.
13:47 zivester joined #git
13:47 notebox joined #git
13:47 osse i suspect that has happened here
13:48 simenbrekken osse: alright, so in the future one wants to do git checkout other-branch -- the/file instead?
13:48 theiostream joined #git
13:48 osse sounds weird since this file didn't have conflicts, but could be user error anyway
13:49 osse simenbrekken: depends what you do in the future? not sure what you mean
13:49 ZyX-I joined #git
13:49 simenbrekken osse: I'd like to replace the contents of my local file at a given path with that of the other branch
13:49 osse that's the command to do that, yes
13:49 osse i added the -p in case there were other unwanted changes as well
13:50 Tobbi joined #git
13:50 Es0teric joined #git
13:50 osse but I strongly suspect that if the merge conflicts had been more carefully solved (ie. take care that only the files that had conflicts were edited manually) then you'd see the expected result in the merge
13:51 aw1 joined #git
13:51 osse but I can only guess
13:52 simenbrekken osse: alright, thanks again!
13:54 acetakwas joined #git
13:56 moei joined #git
13:56 moei joined #git
13:56 PCatinean joined #git
13:56 PCatinean hey guys
13:57 PCatinean I did a cherry-pick and I have many conflicts. But in most files the top part I want to discard and anything below I'd like to keep
13:57 PCatinean is there something similar with add -p in cherry-pick ?
13:57 joy1 joined #git
13:58 theoceaniscool joined #git
13:59 elichai2 joined #git
14:01 crose joined #git
14:03 scoobert1on joined #git
14:05 Tobbi joined #git
14:06 Rodya_ joined #git
14:06 relipse joined #git
14:06 jimi_ joined #git
14:07 relipse How do I search for a file in the git repo
14:07 ArchNoob joined #git
14:07 jepler joined #git
14:07 osse read git ls-files output
14:07 osse or do git ls-files -- '**/*file*'
14:07 guardian hello, when doing an interactive rebase, is there a way to edit after fixup? the 3 lines would be: pick, fixup, <edit fixup, what should I write?> ???
14:08 jepler Hi, any hint how to detect "I'm making a merge commit" in the pre-commit hook?
14:09 osse guardian: mark edit isntead of fixup, then do git reset --soft HEAD~1
14:09 osse guardian: make your changes and do git commit --amend
14:09 guardian damn, of course
14:09 osse or in case you want to edit something else that the fixup commit doesn't touch, mark the first commit edit
14:10 guardian why --soft? could reset be made --hard by default?
14:10 osse i'll let you do --mixed
14:10 osse but if you do --hard in this case then you have to retype the second commit's change yourself
14:11 osse and i guess you don't want thta
14:11 shinnya joined #git
14:11 guardian yeah I know, I was just curious why you were cautious giving me --soft
14:12 guardian thanks man, appreciated
14:12 jepler .. I check for new whitespace errors in my pre-commit hook, but I want to *not* do this in the case of merges, because *sigh* I have to merge commits from people with bad hygene and arguing about it isn't going to help.
14:12 jepler I know I can --no-verify, but I'd like to detect a merge from my pre-commit hook and skip that checking step
14:14 TheMontyChrist joined #git
14:14 TheMontyChrist joined #git
14:14 TheMontyChrist joined #git
14:14 jepler I see the question has also been shouted into the void which is stackoverflow.  I'll try the author's suggestion of git-rev-parse http://stackoverflow.com/questions/27800512/bypass-pre-commit-hook-for-merge-commits
14:14 TheMontyChrist I just created a new local branch.  how to push to my thumb drive?
14:15 TheMontyChrist git push --set-upstream new_branch master?
14:15 Vorisi joined #git
14:15 lewix joined #git
14:15 jepler TheMontyChrist: got push --set-upstream thumbdrive new-branch
14:15 jepler modulo typos of course
14:16 r00t66 joined #git
14:16 osse jepler: I think you can check whether .git/MERGE_HEAD exists
14:16 TheMontyChrist thanks.  I used "git push --set-upstream origin new_branch"
14:16 TheMontyChrist I need to write this down.
14:16 TheMontyChrist I keep asking here.
14:16 TheMontyChrist in fact, I'm going to do it now :P
14:17 jepler osse: yeah that's close to the advice I found, which is to invoke git rev-parse -q --verify MERGE_HEAD
14:17 jepler if git rev-parse -q --verify MERGE_HEAD >/dev/null; then exit; fi
14:17 jepler exec git diff-index --check --cached $against --
14:17 jepler so now this is the end of my pre-commit hook, let's find out whether it works...
14:20 Acerific joined #git
14:20 Acerific joined #git
14:21 jepler thanks osse
14:21 Murii joined #git
14:22 thebope joined #git
14:24 PCatinean I did a cherry-pick and I have many conflicts. But in most files the top part I want to discard and anything below I'd like to keep
14:24 PCatinean is there something similar with add -p in cherry-pick ?
14:24 overlord_tm joined #git
14:25 osse PCatinean: git cherry-pick --no-commit; fix conflicts; git checkout -p HEAD to get rid of the unwanted changes
14:25 TheSimonator joined #git
14:25 osse that's the best I can come up with
14:25 cjohnson wow I never knew about the fix conflicts command
14:25 osse I had a similar issue earlier today
14:25 cjohnson I'll have to use that
14:25 cjohnson do you have a write code command
14:25 osse yes
14:25 osse it's called protoc
14:25 cjohnson lol
14:26 vrach joined #git
14:27 fakenerd joined #git
14:27 PCatinean osse, can't I do something similar for the conflicts?
14:29 flavius joined #git
14:31 qguv joined #git
14:32 chachasmooth joined #git
14:33 zerow_ joined #git
14:33 justin3 joined #git
14:34 TbobbyZ joined #git
14:36 theoceaniscool_ joined #git
14:41 Lunatrius` joined #git
14:41 parasite_ joined #git
14:44 osse PCatinean: Not to my knowledge
14:44 osse You can export a patch and edit it by hand I guess
14:45 osse If it's not that many files it's probably the easiest
14:45 PCatinean yeah I went this route, this time :)
14:45 osse Quote easy in fact if you are savage AF in your editor of choice
14:46 hotpancakes joined #git
14:47 Gustavo6046 joined #git
14:47 PCatinean hehe :))
14:49 publio joined #git
14:50 kevwil joined #git
14:54 DarkPsydeLord joined #git
14:56 MineCoins joined #git
14:57 khfeng joined #git
14:59 tnecniv joined #git
15:00 ssarah joined #git
15:01 TbobbyZ joined #git
15:02 Nicmavr joined #git
15:04 Es0teric joined #git
15:05 WangXiaoyu joined #git
15:06 xcesariox joined #git
15:06 Guest62004 joined #git
15:07 livingstn joined #git
15:08 WangXiaoyu left #git
15:09 rominronin joined #git
15:10 Gsham joined #git
15:11 tase joined #git
15:12 xcesariox joined #git
15:13 tase Hello, is it possible to get a changeset of a branch to do a code review without doing a merge or squash? I'm using TortoiseGit and I can compare master and branch refs, but it shows all changes done in master too.
15:14 Cesario__ joined #git
15:14 alexggordon joined #git
15:14 qqx tase: `git diff master...<branch>` with standard git, no idea about Tortoise.
15:15 khfeng joined #git
15:15 aw1 joined #git
15:16 digidog joined #git
15:17 gareppa joined #git
15:18 WangXiaoyu joined #git
15:18 tase @qqx dw about tortoisegit, if it works in command line it's good for me
15:19 re1_ joined #git
15:20 dreiss joined #git
15:20 Tobbi joined #git
15:23 Nilesh_ joined #git
15:24 hotpancakes joined #git
15:28 chachasmooth joined #git
15:32 brent__ joined #git
15:33 zylum joined #git
15:33 hotpancakes joined #git
15:34 hotpanca_ joined #git
15:34 h12o joined #git
15:36 overlord_tm joined #git
15:36 MattMaker joined #git
15:37 tsdev joined #git
15:40 s1scha joined #git
15:41 creppe joined #git
15:43 leeN joined #git
15:44 h12o joined #git
15:48 Random832 joined #git
15:48 revoltingPeasant joined #git
15:48 PCatinean halp!
15:48 PCatinean i forgot to cherry pick a commit
15:49 PCatinean I picked 5-6 commits after
15:49 PCatinean and the last one included the changes in the one I forgot
15:49 rjack2 joined #git
15:49 PCatinean how can I cherry-pick that missing one and put it in place?
15:49 sarri joined #git
15:49 sarri joined #git
15:49 re1 joined #git
15:49 xaa joined #git
15:50 robattila256 joined #git
15:50 gugah joined #git
15:50 osse PCatinean: rebase -i
15:50 osse and an 'exec git ...' line
15:50 _ikke_ cherry-pick to get the commit, rebase to put it in place
15:51 osse _ikke_: bruh
15:51 gugah joined #git
15:54 Goplat joined #git
16:00 PCatinean osse, cherry-pick first
16:00 PCatinean then rebase?
16:00 PCatinean osse, haha :))))
16:00 * PCatinean lols
16:02 osse hmm?
16:03 aielima joined #git
16:03 PCatinean the bruh part cracked me up :))
16:03 PCatinean damn I got a lot of conflicts
16:03 osse Oh
16:03 PCatinean and I guess a certain commit changed parts that were not there because I did not cherry pick at the time
16:03 PCatinean damn this is confusing
16:03 osse The conflict part is what my GENIUS rebase exec approach avoids
16:04 PCatinean ok so I abort the cherry-pick
16:04 PCatinean rebase -i and how many commit back?
16:04 kusznir joined #git
16:05 sunri5e joined #git
16:05 PCatinean In my mind everything is VERY twisted
16:05 osse As many as is needed
16:05 PCatinean ok so rebase back to the commit that made the flake8 and introduce the cherry-pick before that
16:05 osse Aka the number of commits supposed to come after this
16:05 PCatinean then the editor opens up
16:05 PCatinean okay so far it's clear
16:06 theiostream joined #git
16:06 chachasmooth joined #git
16:06 PCatinean I got he list in front, now I just add the commit hash there?
16:06 webstrand left #git
16:06 hotpancakes joined #git
16:07 hotpanca_ joined #git
16:07 osse No, I said add an exec line. See the instructions at the bottom
16:08 tnecniv joined #git
16:08 cousteau joined #git
16:08 osse Bur maybe carefully writing a pick line as is if it belongs there's actually works. You can try
16:09 cousteau about to install Git on Windows.  Any recommends?
16:09 cousteau I was thinking on a GUI client just in case (...not like I've never touched the command line before, but just in case I have to tell my coworkers to get it too)
16:10 morenoh149 joined #git
16:10 morenoh149 is there a way to grep through commit messages and the bodies of the commits?
16:11 zeroed joined #git
16:11 zeroed joined #git
16:11 osse morenoh149: git log.  --grep for the message and -S or -G for the commit diff
16:11 zeroed joined #git
16:11 morenoh149 osse: no way to do both?
16:12 hotpancakes joined #git
16:12 osse Not sure
16:12 morenoh149 well -S is nice
16:15 cousteau what Windows git GUI would you recommend, if any?
16:16 aw1 joined #git
16:16 Eugene I like !SmartGit
16:16 gitinfo [!smartgit] SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg
16:17 aw1 joined #git
16:18 cousteau thanks for the suggestion!  However I'm a cheap b*****d so I'd rather get a free one
16:18 aw1 joined #git
16:18 osse gitk abd git-gui are already included
16:18 cousteau maybe I'll end up following git-scm's advice and get msysgit, because command line; but this was more so that my coworkers could use the same thing as I do
16:19 osse Whatever guide says msysgit is outdated. It's called Git For Windows.
16:19 aw1 joined #git
16:19 cousteau ah
16:20 PCatinean osse, so I exec cherry-pick ?
16:20 aw1 joined #git
16:21 osse PCatinean: yes
16:21 PCatinean hmm interresting!
16:21 osse well.. exec git cherry-pick
16:22 PCatinean aaa with git
16:22 PCatinean ok
16:23 PCatinean still get the conflicts hmm
16:23 nexemacs joined #git
16:24 imack joined #git
16:24 thiago joined #git
16:25 imack joined #git
16:26 hotpancakes joined #git
16:27 PCatinean wow this is hell
16:27 rivarun joined #git
16:27 cads2 joined #git
16:28 marianina8 joined #git
16:29 al-damiri joined #git
16:29 cousteau ...hm, then again this is going to be mostly for a Visual Studio project (sigh), so maybe I'll just use the built-in git
16:30 osse cousteau: noooo
16:30 ivo_ joined #git
16:30 cousteau ok I'll install a real git client
16:31 Tobbi joined #git
16:31 Cabanossi joined #git
16:31 osse i haven't used VS's git thingy
16:31 svm_invictvs joined #git
16:31 cousteau what would you recommend a noob who has never used Linux and is afraid of the command line?  (just to put myself in the worst case scenario)
16:31 hahuang65 joined #git
16:32 preaction use whatever you feel comfortable with
16:32 osse I am in fact serious here:  tell them to grow a pair
16:32 ambro718 joined #git
16:32 preaction yes, because making it about whether or not you have testicles is how to convince them
16:32 Eugene I've heard OK things about Github's GUI
16:32 CheckDavid joined #git
16:32 Eugene preaction - who said anything about genitalia? Grow a pair of cherry trees ;-)
16:33 preaction yeah, that's not what that idiom is referring to and i'm pretty sure everyone knows that
16:33 osse and since you know it's an idiom you very well know it doesn't really have anything to do with testicles
16:33 Eugene I choose to give the benefit of the down
16:33 Eugene Pillows, that is. Its way comfier
16:34 osse I would never suggest someone actually skin a cat, either
16:34 Eugene I would wear a set of real kitty fuzzy slippers
16:35 osse oh well
16:35 osse break a leg!
16:35 miha_S7_ joined #git
16:35 preaction "grow some balls" or "grow a pair of balls" (or "grow a pair" if the speaker thinks "balls" is inappropriate in the context) is an idiom meaning "man up", which is itself an idiom meaning "stop being afraid". did i miss anything?
16:35 osse no, you got it exactly right
16:35 Eugene The funny, apparently.
16:36 preaction so then explain how: [11:33:27] <osse> it doesn't really have anything to do with testicles
16:36 osse preaction: because it means stop being afraid
16:37 cousteau I'll be honest; one of my coworkers is likely to be convinced; it's just that I'd rather them start the easy way so that they eventually get used to it
16:37 Eugene I'm sorry, why is this even an issue? Are we seriously so immature that this needs to have a policy document on it? Take it to fucking tumblr
16:37 preaction osse: but you could say "stop being afraid" and it wouldn't have the additional connotation of "you're not enough of a man"
16:37 cousteau if I scare them they'll never convert to the command line
16:37 MattMaker joined #git
16:37 osse preaction: yes I could
16:37 preaction yep
16:38 cousteau I think I'll install Tortoise, Extensions, and for Windows, and try all of them
16:38 osse But I would argue that the expression is so much used and well-known by now that the "man" part has faded
16:38 preaction nope
16:38 osse yes I would
16:38 digidog joined #git
16:39 cousteau it's like "awesome"; it originally meant "fearful; inspiring awe", and now it just means "super cool"
16:39 preaction cousteau: i found tortoise to be a bit awkward myself, but i'm not in the business of git client orthodoxy
16:39 cousteau preaction, ok :)
16:40 ayogi joined #git
16:41 ZyX-I joined #git
16:41 cousteau I just typed "best git client for new" on Google and it suggested the autocompletion "newborn" :/
16:42 bremner heh.
16:42 bremner babies first shell
16:44 nexemacs joined #git
16:44 alexggordon joined #git
16:45 TheSimonator joined #git
16:46 hotpancakes joined #git
16:47 ien joined #git
16:47 xall joined #git
16:48 ivo_ joined #git
16:48 cousteau bremner, ah, that reminds me of my VTech PreComputer 2000
16:49 osse I can't speak for VS but in other ides' git facilities I've tried I've seen that Git is sort of misrepresented. Terms of things are the changed  Git log is mixed with undo history,  empty commit messages allowed, etc.
16:49 osse Last time I tried tortoise Git "push" was an alternative when you right clicked a file.
16:50 cousteau https://assets.catawiki.nl/assets/2015/5/9/e/5/6/e56d49de-f68e-11e4-9997-854b84dc1b2b.jpg  it was a toy computer I had as a kid, with some educational games such as spell the word, hangman, geography quiz, BASIC programming, etc
16:52 cousteau osse, well from what I could read, VS git renames every damn thing
16:56 tribly joined #git
16:58 aw1 joined #git
16:58 Darren_ joined #git
16:58 peterbecich joined #git
17:01 cousteau ok I think I'll go with Git Extensions.  It says something about ssh.  I've never done git over ssh but that might be useful (I have a git project on a Linux PC with sshd enabled)
17:01 Cabanossi joined #git
17:01 dviola joined #git
17:01 rasto joined #git
17:01 livingstn joined #git
17:02 PCatinean If I want to edit a commit that is 5-6 commits back?
17:02 dviola joined #git
17:02 PCatinean I do rebase -i again?
17:03 diogenese joined #git
17:04 hotpanca_ joined #git
17:05 Lope joined #git
17:05 Lope I'm trying ga -p foo.js
17:05 PCatinean yay it worked
17:06 Lope but it doesn't want to split my hunk or whatever you call it. I just want the first line but it won't split that off the rest by pressing 's'
17:06 Lope So I pressed 'e'
17:07 Lope Then I went and deleted the '+' signs below the first line. And then it said it can't recognize my hunk or whatever.
17:07 notebox joined #git
17:08 Lope even replacing the unwanted lines '+' signs with ' ' did not help.
17:08 nexemacs joined #git
17:08 Lope patch failed. foo.js; patch does not apply.
17:09 Lope Okay I tried deleting the unwanted + lines and it continued without error.
17:10 lekare joined #git
17:11 Lope ok it worked.
17:13 imack joined #git
17:14 tnecniv joined #git
17:16 aw1 joined #git
17:17 tony_ joined #git
17:17 madewokherd joined #git
17:17 lewix joined #git
17:17 tonyg_ joined #git
17:18 aw1 joined #git
17:20 aw1 joined #git
17:21 aw1 joined #git
17:21 systemovich joined #git
17:21 marcogmonteiro joined #git
17:22 mikecmpbll joined #git
17:22 gopar joined #git
17:23 druonysus_ joined #git
17:25 doener joined #git
17:28 ig0r_ joined #git
17:29 Es0teric joined #git
17:29 tonyg_ i would like to isolate some code, that has already been committed, to a feature branch. a major issue is that our repo was ported from hg to git and many commits were previously maintained as hg patches, which have been modified many times. anybody familiar doing similar things?
17:30 nexemacs joined #git
17:31 netj joined #git
17:31 Cabanossi joined #git
17:31 kadoban joined #git
17:32 nickel_dime_look joined #git
17:32 ShapeShifter499 joined #git
17:34 pks joined #git
17:35 netj joined #git
17:37 nixjdm joined #git
17:37 WangXiaoyu joined #git
17:37 madewokherd joined #git
17:38 tvw joined #git
17:39 hotpancakes joined #git
17:39 tymczenko joined #git
17:43 TikityTik joined #git
17:44 nexemacs joined #git
17:45 aw1 joined #git
17:48 aw1 joined #git
17:49 aw1 joined #git
17:50 aw1 joined #git
17:51 rastos2 joined #git
17:53 aw1 joined #git
17:55 aw1 joined #git
17:55 davimore joined #git
17:55 aard joined #git
17:55 relipse joined #git
17:56 dreiss joined #git
17:56 ambro718 joined #git
17:56 WangXiaoyu joined #git
17:56 govg joined #git
17:57 kfoonamalik joined #git
18:00 nexemacs joined #git
18:00 atrus ojacobson: on april 4th, we were talking about how to prevent content from getting into the repo (even without refs) in a pre-receive hook. it seems like the quarantine work made it into git 2.11, which solves this problem for me. hooray!
18:01 lewix git bash doesn't understand a command like this git diff head; foo foo
18:01 lewix the
18:01 maarhart joined #git
18:01 lewix the ';' is bothering her, any idea how to circumvent that
18:02 Sasazuka joined #git
18:06 raynold joined #git
18:11 Random832 lewix, what are you trying to do?
18:11 bronson joined #git
18:12 madewokherd joined #git
18:14 ZyX-I joined #git
18:15 alexggordon joined #git
18:16 cdown joined #git
18:17 nd joined #git
18:18 cagomez_ joined #git
18:18 LeBlaaanc joined #git
18:19 cagomez joined #git
18:20 cagomez joined #git
18:21 ZeroZeroZeroZero joined #git
18:25 MattMaker joined #git
18:25 theiostream joined #git
18:26 MattMaker joined #git
18:28 doMynation joined #git
18:30 theiostream joined #git
18:30 doMynation Good morning, are there any best practices to work with multiple branches at once? For instance, for a big incoming feature, I've developed a mini database framework/utility (group of classes) that I re-use in about 3-4 feature branches. What's the best course of action to test each feature branch individually? My first thought is to simply create a temporary branch and merge the mini framework in the feature branch I want to
18:30 doMynation test and repeat the process for every branch. Is there a better alternative?
18:30 marianina8 joined #git
18:31 doMynation The problem is, my mini framework also evolves as I develop the 3-4 other feature branches.
18:32 preaction doMynation: you could rebase your feature branches with your mini database framework/utility branch
18:33 ChiLL_SurF joined #git
18:33 doMynation I'm mainly looking for workflow advices. I don't think rebasing will help me in that case.
18:33 nexemacs joined #git
18:34 LeBlaaanc joined #git
18:35 preaction i mean, that is the workflow i would use: if one branch depends on a second branch, the second branch gets rebased on the first
18:35 doMynation Pardon my ignorance, but why not simply merge?
18:36 bwn joined #git
18:37 preaction because you said the database thing is evolving as part of all those feature branches, which means you're going to have repeated merges between all the branches if you do it that way. which is fine, it's a thing, but i suspect it'll pull in too much code into each feature branch
18:41 maarhart joined #git
18:41 hotpancakes joined #git
18:42 doMynation Ahhh, I see. Thank you preaction
18:43 hotpanca_ joined #git
18:43 satifant joined #git
18:44 WangXiaoyu left #git
18:45 davimore joined #git
18:50 ChrisEadle joined #git
18:50 Rodya_ joined #git
18:50 hxcv joined #git
18:51 tribly joined #git
18:51 bronson joined #git
18:54 nitesh joined #git
18:54 ChrisEadle joined #git
18:56 bwn joined #git
18:57 sparr joined #git
18:58 jstimm joined #git
18:58 unreal joined #git
18:59 khfeng joined #git
18:59 ozcanesen joined #git
19:01 TheSimonator joined #git
19:03 nexemacs joined #git
19:04 finalbeta joined #git
19:05 Snugglebash joined #git
19:08 cstratak joined #git
19:08 ananteris joined #git
19:12 ivo_ joined #git
19:14 nexemacs joined #git
19:18 crankslider joined #git
19:21 hhee joined #git
19:22 nexemacs joined #git
19:23 hotpancakes joined #git
19:25 MaximusColourum joined #git
19:27 TheSimonator joined #git
19:28 ali1234 joined #git
19:29 Introoter joined #git
19:30 livingstn joined #git
19:31 NonParity joined #git
19:31 hotpancakes joined #git
19:31 nexemacs joined #git
19:32 hotpanca_ joined #git
19:33 Acerific joined #git
19:33 Acerific joined #git
19:35 hotpancakes joined #git
19:37 ScRaMbLe joined #git
19:44 eikhorst joined #git
19:45 alexggordon joined #git
19:46 Cabanossi joined #git
19:47 nexemacs joined #git
19:50 cagedwisdom joined #git
19:53 Rodya_ joined #git
19:54 jaziz joined #git
19:58 treeman joined #git
19:59 dviola joined #git
20:00 Ryanar joined #git
20:02 jnewt joined #git
20:02 pifon joined #git
20:03 justin3 joined #git
20:04 Acerific joined #git
20:05 Primer git pull: Already up-to-date; git branch: *master; git diff origin/master --name-only <-- many files...how?
20:05 Primer So files are present that have been removed long ago, other files are missing that are supposed to be present
20:06 Primer s/^So/Some/
20:06 matthiaskrgr maybe you didnt push?
20:06 matthiaskrgr mmh does this make sense?
20:06 Primer see "Already up-to-date"
20:07 matthiaskrgr does git pull say about unpushed commits?
20:07 Primer Well, git status has a completely different story
20:08 Primer nm
20:08 teroshan joined #git
20:08 Primer I have a feeling a co-worker ran something on the wrong machine again
20:11 grayjoc joined #git
20:12 Rodya_ joined #git
20:12 prg318 joined #git
20:15 cdown joined #git
20:19 jeffreylevesque joined #git
20:19 pbandark joined #git
20:21 Es0teric joined #git
20:22 Gloomy joined #git
20:23 jaziz1 joined #git
20:25 ScRaMbLe left #git
20:25 Es0teric joined #git
20:25 Ryanar joined #git
20:28 cagomez joined #git
20:29 DolphinDream joined #git
20:29 dsdeiz joined #git
20:29 ananteris so is there a way to have a submodule's update to a certain commit be stored as a commit in the parent repos commit? eg if I have repoP and submodule repoC under it, is there a way to have a checkout of a commit in repoP automagically change what commit repoC is at?
20:31 hotpancakes joined #git
20:31 hotpanca_ joined #git
20:32 smaudet joined #git
20:32 smaudet Hi, is there any way to do a remote branch merge? i.e. git merge but w.o. checking out the branch you want to merge onto, first
20:33 smaudet like git merge a --onto b
20:33 smaudet use case I have is to fetch and then git merge origin/b --onto b
20:34 freimatz joined #git
20:34 smaudet only other thing I can do is create a second clone of the first clone, fetch, pull in the second clone, and push...which doesn't seem much easier
20:35 smaudet nvm that won't work either
20:40 Atm0spher1c joined #git
20:40 dviola joined #git
20:41 smaudet maybe I could add a second remote and push back into my local 'working' git repository?
20:44 theiostream joined #git
20:44 davimore joined #git
20:46 alexandre9099 joined #git
20:47 smaudet that worked
20:48 smaudet bit of a kludge though
20:52 ArchNoob joined #git
20:55 dsdeiz joined #git
20:55 dsdeiz joined #git
20:55 livingstn joined #git
20:56 ananteris win 2
21:00 lukky513_ left #git
21:03 miha_S7_ joined #git
21:08 MineCoins joined #git
21:10 relipse I did git stash pop and there is a conflict, how do I put it back in the stash without the conflict
21:11 Dougie187 left #git
21:13 lukky513_ joined #git
21:14 gopar joined #git
21:15 TheSimonator joined #git
21:16 preaction it's already in the stash still. you can just reset/checkout to remove it from the working tree
21:16 samlamamma joined #git
21:17 samlamamma left #git
21:17 Dazzyp left #git
21:19 kent\n joined #git
21:20 brent__ joined #git
21:21 SwiftMatt joined #git
21:23 hotpancakes joined #git
21:23 dsdeiz joined #git
21:26 peterbecich joined #git
21:29 dirtyroshi joined #git
21:33 masuberu joined #git
21:34 alexandre9099 joined #git
21:36 askb joined #git
21:41 alexandre9099 joined #git
21:43 fish3485 joined #git
21:44 d5sx43 joined #git
21:49 hotpancakes joined #git
21:50 peterbecich joined #git
21:50 jstimm joined #git
21:51 Icar joined #git
21:52 parasite_ left #git
21:53 chrysa joined #git
21:56 gopar joined #git
21:56 h12o joined #git
21:58 ali1234 joined #git
22:01 M6HZ joined #git
22:08 hotpancakes joined #git
22:11 D4R5C0D3 joined #git
22:11 bronson joined #git
22:11 publio joined #git
22:12 fish3485 joined #git
22:12 alexandre9099 joined #git
22:13 dsdeiz joined #git
22:15 alexggordon joined #git
22:19 Gustavo6046 joined #git
22:19 safe joined #git
22:20 svm_invictvs joined #git
22:21 Gloomy joined #git
22:30 miha_S7_ joined #git
22:34 SpeakerToMeat joined #git
22:37 foreal joined #git
22:39 hotpancakes joined #git
22:40 hotpancakes joined #git
22:42 prg3 joined #git
22:44 brent__ joined #git
22:45 brent__ joined #git
22:46 brent__ joined #git
22:46 gopar joined #git
22:48 elijah joined #git
22:49 zivester joined #git
22:50 dviola joined #git
22:50 gopar joined #git
22:52 hotpancakes joined #git
22:52 rmesta joined #git
22:53 bronson joined #git
22:53 rmesta joined #git
22:54 rmesta joined #git
22:55 rmesta joined #git
22:55 felixjet joined #git
22:56 rmesta joined #git
22:56 rmesta joined #git
22:57 rmesta joined #git
22:58 Goplat joined #git
23:01 thiago joined #git
23:01 Sasazuka joined #git
23:03 felixjet joined #git
23:05 dre_ joined #git
23:06 Cabanossi joined #git
23:07 btree joined #git
23:08 dedicated joined #git
23:09 brent__ joined #git
23:12 hotpancakes joined #git
23:13 btree left #git
23:18 ToBeCloud joined #git
23:20 bwn joined #git
23:22 thiago joined #git
23:23 theiostream joined #git
23:24 dviola joined #git
23:27 mentazoom joined #git
23:28 dave0x6d joined #git
23:29 caveman joined #git
23:30 hotpancakes joined #git
23:32 thiago joined #git
23:33 madewokherd joined #git
23:35 alexggordon joined #git
23:38 bwn joined #git
23:40 druonysus_ joined #git
23:41 nezZario I'm a little confused regarding the output of git status
23:42 rewt which part?
23:44 nezZario ohhh i get it ..
23:44 nezZario i was trying to figure out how something like 'MM' was possible
23:44 osse you're welcome
23:45 osse heh, you shouldn't use -s if you're new :P
23:46 nezZario it just escaped me ... I don't really have any use case for adding things to the index unless they're ready to be committed
23:47 osse hmm
23:47 osse adding parts of a file to the index is completely normal
23:47 osse or adding a file, then editing it afterwards also
23:47 brent__ joined #git
23:53 doMynation joined #git

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