Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-20

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

All times shown according to UTC.

Time Nick Message
00:00 sealsniper joined #git
00:02 mingrammer joined #git
00:03 anuxivm joined #git
00:04 tesuji joined #git
00:05 madewokherd joined #git
00:05 BrianJ joined #git
00:05 energizer joined #git
00:07 energizer left #git
00:09 madknight crised, you could undo your local commit, reset your head to origin/master and reapply you changes or do a force push
00:09 crised madknight: mm
00:09 RedNifre_ joined #git
00:09 crised madknight: I pulled, now I have conflicts
00:11 madknight crised, undo the pull "git reset --hard HEAD"
00:12 madknight crised, since newer versions there is also "git merge --abort"
00:12 crised madknight: ok
00:13 ochorocho__ joined #git
00:13 crised madknight: actually, now on github, the code is correct, but the commit message is wrong
00:13 madknight crised, git commit -am "your new commit message" && git push -f
00:14 SwiftMatt joined #git
00:14 crised madknight: mmm, when I say git add there is nothing to add. there are are file like Chat_BACKUP, CHAT_BASE
00:14 crised madknight: how do I get rid of that garbage
00:14 anuxivm left #git
00:15 nedbat jeffreylevesque: if you don't mind me asking, what is in the history that you need to get rid of?
00:16 aberrant joined #git
00:16 aberrant hi all
00:17 aberrant is there a way to create a brand new branch (with a single commit) from an old unmerged branch with dozens of commits? rebase won’t work.
00:17 qpdb joined #git
00:18 rewt aberrant, you have an old unmerged branch, and you just want a new branch to continue where that left off, without merging anything anywhere?
00:18 raijin joined #git
00:18 clemf joined #git
00:19 aberrant I have an unmerged branch with dozens of commits. What I’d like to do is create a fresh branch with just one commit that I can merge, that has all the changes from the unmerged branch.
00:19 aberrant sorry if that doesn’t make sense.
00:19 rewt right, i think i get it now
00:19 rewt do you care what happens to that old branch?
00:19 aberrant it’s just that in github, it’s better to have one commit in a PR.
00:19 aberrant not really, as long as I don’t lose any of my changes.
00:20 autoboxer joined #git
00:20 rewt you could squash all those commits into one, and then cherry-pick it into a new branch
00:20 mischat joined #git
00:20 aberrant I can’t squash / rebase.
00:20 nedbat aberrant: why can't you?
00:20 aberrant it fails because I have several “git merge master”s in there
00:20 madknight aberrant, "git checkout -b newbranchname" and then squash your commits
00:21 aberrant oh, let me try that.
00:21 danslo_ joined #git
00:21 timmu joined #git
00:21 aberrant git rebase -i HEAD~20 ?
00:22 [ADN] left #git
00:22 _ADN_ joined #git
00:22 Viddax joined #git
00:22 aberrant wow, there are like 100 lines in there
00:22 rewt should have 1 line per commit
00:22 malide joined #git
00:23 aberrant yeah, but again, there were half a dozen git merge master’s in there
00:23 rewt maybe  git rebase -p -i HEAD~20
00:23 rewt and just remove the merge commits from that list
00:24 madknight aberrant, there are cool squash aliases https://stackoverflow.com/questions​/5189560/squash-my-last-x-commits-t​ogether-using-git/21890252#21890252
00:25 madknight aberrant, allows you to use "git squash N" thats how i do squash
00:25 rewt the only tricky part with that is the merge commits
00:25 aberrant ah, cool
00:26 aberrant ok, afk while I screw up my branch even more :)
00:26 aberrant thank you.
00:26 Raed|Laptop joined #git
00:27 mingrammer joined #git
00:28 ToBeCloud joined #git
00:28 Gsham joined #git
00:28 UserOO7 joined #git
00:33 Vgr joined #git
00:33 Vgr joined #git
00:34 stamina joined #git
00:40 ruskie joined #git
00:40 hue joined #git
00:42 m1m3-50 joined #git
00:42 EY joined #git
00:43 lss8_ joined #git
00:44 shinnya joined #git
00:46 compeman joined #git
00:46 compeman joined #git
00:47 mykespb joined #git
00:49 BenderRodriguez joined #git
00:50 sondr3 joined #git
00:52 raijin joined #git
00:57 mycyber joined #git
00:58 Raed|Laptop joined #git
00:59 Prisoner-2460_1 joined #git
00:59 rominronin joined #git
01:01 mizu_no_oto joined #git
01:02 tesuji_ joined #git
01:02 pks joined #git
01:07 Vampire0_ joined #git
01:11 romerocesar joined #git
01:11 HoierM joined #git
01:12 lss8 joined #git
01:12 e14 joined #git
01:14 romerocesar joined #git
01:18 Lipp joined #git
01:19 GandalfTheWizard joined #git
01:22 danslo_ joined #git
01:22 parantapVikram joined #git
01:23 Raed_ joined #git
01:23 mingrammer joined #git
01:24 watersoul joined #git
01:24 mingrammer joined #git
01:24 arescorpio joined #git
01:26 SenpaiSilver joined #git
01:27 tang^_ joined #git
01:27 cqi joined #git
01:28 ruby_ joined #git
01:29 Gsham joined #git
01:31 Puffball joined #git
01:31 d^sh joined #git
01:32 huntleja joined #git
01:34 xcesariox joined #git
01:37 Blackpajamas joined #git
01:37 Puffball joined #git
01:40 duderonomy joined #git
01:40 evanwang joined #git
01:46 ap0c joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and unnecessary bowdlerisms | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-fsck: think of the children
01:48 NeverDie joined #git
01:49 durham_ joined #git
01:51 aberrant joined #git
01:51 Vampire0 joined #git
01:56 fstd joined #git
01:57 snthsnth joined #git
01:59 dreiss joined #git
02:00 rominronin joined #git
02:02 Puffball joined #git
02:02 cconstantine joined #git
02:02 pks joined #git
02:05 dhollinger joined #git
02:05 BSab joined #git
02:06 romerocesar joined #git
02:06 drbean joined #git
02:06 mycyber joined #git
02:08 Puffball joined #git
02:08 ruby_ joined #git
02:09 Goplat joined #git
02:10 pikajude joined #git
02:10 drbean_ joined #git
02:13 MattMaker joined #git
02:13 ochorocho__ joined #git
02:13 cdg joined #git
02:14 MattMaker joined #git
02:15 mischat joined #git
02:16 drbean joined #git
02:16 red82 joined #git
02:17 Zamyatin joined #git
02:17 dsantiago joined #git
02:18 harish joined #git
02:18 aberrant joined #git
02:19 drbean_ joined #git
02:20 Lipp joined #git
02:26 ojdo joined #git
02:27 drbean joined #git
02:27 dodobrain joined #git
02:29 aberrant joined #git
02:30 snthsnth joined #git
02:31 GT4066 joined #git
02:33 drbean_ joined #git
02:33 RedneckDonut joined #git
02:33 MattMaker joined #git
02:38 therealGent joined #git
02:38 rchavik joined #git
02:39 raijin joined #git
02:40 drbean joined #git
02:43 watabou joined #git
02:43 romerocesar joined #git
02:43 m1m3-50 joined #git
02:45 HoierM joined #git
02:46 drbean_ joined #git
02:48 godzirra joined #git
02:53 t2mkn joined #git
02:53 lagothrix joined #git
02:55 clemf joined #git
02:56 justrohu joined #git
02:57 gfixler joined #git
02:59 chachasmooth joined #git
03:00 hexagoxel joined #git
03:01 rominronin joined #git
03:03 aavrug joined #git
03:03 Puffball joined #git
03:04 MattMaker joined #git
03:04 Motoko joined #git
03:05 UserOO7 joined #git
03:06 DolphinDream joined #git
03:08 atomi joined #git
03:11 Gsham joined #git
03:15 Quam joined #git
03:16 mischat joined #git
03:16 clemf joined #git
03:18 romerocesar joined #git
03:19 mycyber joined #git
03:22 Lipp joined #git
03:23 danslo_ joined #git
03:26 jumpman joined #git
03:27 Puffball joined #git
03:32 CTF joined #git
03:33 MattMaker joined #git
03:33 robotroll joined #git
03:34 autoboxer joined #git
03:37 zivester joined #git
03:39 mycelium joined #git
03:42 dreiss joined #git
03:43 ResidentBiscuit joined #git
03:44 whomp joined #git
03:44 whomp i want to find the commit where a line of code was added, but to do that, i have to follow it back before it was moved around, whitespace was changed, etc. how can i trace a line of code throughout its history?
03:47 mehola joined #git
03:48 leeN joined #git
03:49 nilg joined #git
03:50 Keridos joined #git
03:50 rewt whomp, !git blame
03:51 rewt !man git blame
03:51 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
03:51 gitinfo the git-blame manpage is available at http://jk.gs/git-blame.html
03:51 trobotham joined #git
03:51 whomp hmm looks like -wM is the key here, ty
03:51 PioneerAxon joined #git
03:51 yazdmich joined #git
03:51 Hink joined #git
03:52 a_thakur joined #git
03:53 nevyn joined #git
03:54 souther joined #git
03:55 mehola joined #git
03:56 PioneerAxon joined #git
03:58 m1m3-50 joined #git
04:00 phanimahesh joined #git
04:02 rominronin joined #git
04:08 mycyber joined #git
04:11 ssarah_ joined #git
04:11 ssarah_ guys, what is a good terminal emulator that integrates git functionality? That is, tells you what branch you are in, etc.
04:11 ssarah_ (for linux)
04:13 Keridos joined #git
04:14 boombatower joined #git
04:15 thiago most of them do, provided your shell is properly configured
04:15 ochorocho__ joined #git
04:16 Motoko There's a bash integration that works well.
04:16 godzirra joined #git
04:16 ap0c joined #git
04:17 Motoko https://github.com/magicmonty/bash-git-prompt
04:17 Motoko One option
04:18 Motoko Also https://github.com/arialdomartini/oh-my-git
04:18 Motoko I've used that one.
04:19 mycelium joined #git
04:21 a_thakur_ joined #git
04:21 daey_ joined #git
04:22 autoboxer joined #git
04:24 danslo_ joined #git
04:26 jbu joined #git
04:27 a_thakur joined #git
04:28 Puffball joined #git
04:31 romerocesar joined #git
04:39 mischat joined #git
04:42 snowkidind joined #git
04:43 whomp joined #git
04:43 bmahe joined #git
04:45 Puffball joined #git
04:50 mingrammer joined #git
04:51 t0by joined #git
04:53 Cabanossi joined #git
04:54 huntleja joined #git
04:54 pamplemousse hi all
04:55 pamplemousse I have created a .cfg repo for my dotfiles and I have created a repo on github.com/username/dotfiles
04:55 atomi joined #git
04:56 pamplemousse my push are rejected because I have to make a pull first, but the pull does not work
04:58 ghoti joined #git
04:58 laumann joined #git
05:02 subhojit777 joined #git
05:02 dec0n joined #git
05:02 yuhlw_ joined #git
05:03 rominronin joined #git
05:05 sadf32f32 joined #git
05:09 pamplemousse hi all
05:09 j416 !doesntwork
05:09 gitinfo Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
05:10 pamplemousse j416: hello
05:10 psprint_ joined #git
05:11 pamplemousse j416: I have .cfg folder with bunch of config files .vimrc .zshrc etc , I have an account on github.com/user/dotfiles setup
05:11 atomi joined #git
05:11 j416 you already wrote this
05:12 Hink joined #git
05:12 pamplemousse j416: I have already did in .cfg git init , git commit , git remote add origin
05:12 Hink joined #git
05:13 pamplemousse I am stuck at this level
05:13 aeo1ack joined #git
05:14 pamplemousse j416: am I correct to see master beeing my local .cfg and origin github.com/user/dotfiles ?
05:14 eshlox joined #git
05:14 j416 master is local, eys.
05:14 RedNifre joined #git
05:14 j416 yes.
05:15 pamplemousse before push I have to pull from origin right ?
05:15 j416 perhaps.
05:17 pamplemousse j416: like this git pull https://github.com/user/dotfiles .cfg --> .cfg beeing local branch ?
05:17 j416 I don't know what you are trying to do, or what your error is
05:18 overlord_tm joined #git
05:18 pamplemousse j416: my github.com dotfiles are umpty and I want to populate them
05:18 dreiss joined #git
05:19 SirCmpwn joined #git
05:19 cyan__ joined #git
05:19 ShapeShifter499 joined #git
05:21 mycyber joined #git
05:22 trobotham joined #git
05:22 jaafar joined #git
05:23 Akimb joined #git
05:23 Lor_ joined #git
05:24 souther joined #git
05:24 realz joined #git
05:25 atomi joined #git
05:25 Lipp joined #git
05:26 pamplemousse git push rejected because tip of branch is behind it's remote contrepart
05:26 pamplemousse integrate the remote changes
05:27 j416 then pull before you push
05:27 j416 `git pull --rebase` could be what you want.
05:31 a_thakur_ joined #git
05:32 cdown joined #git
05:35 Puffball joined #git
05:37 satya4ever joined #git
05:42 m1m3-50 joined #git
05:44 mingrammer joined #git
05:44 atomi joined #git
05:47 Repox joined #git
05:47 Guest72302 joined #git
05:48 chele joined #git
05:50 cqi joined #git
05:52 jorj joined #git
05:53 sitaram joined #git
05:53 sitaram joined #git
05:54 bocaneri joined #git
05:57 atomi joined #git
05:58 bronson joined #git
05:59 ljc joined #git
05:59 eivarv joined #git
06:00 howdoi joined #git
06:02 rscata joined #git
06:05 Puffball_ joined #git
06:07 catsup joined #git
06:07 PioneerAxon_ joined #git
06:08 Vivekananda joined #git
06:08 jeffreylevesque_ joined #git
06:08 zeroed joined #git
06:08 zeroed joined #git
06:08 timvishe` joined #git
06:10 lb1c joined #git
06:10 atomi joined #git
06:11 qt-x joined #git
06:13 atomi_ joined #git
06:13 Andrew_K joined #git
06:14 roelmonnens joined #git
06:16 pamplemousse j416: git pull --rebase tels me there is no tracking info
06:16 ochorocho__ joined #git
06:17 lindenle joined #git
06:17 pamplemousse anyone please help
06:18 pamplemousse my pull from github to my local repo does not work
06:18 Motoko You may need to make a clean clone and copy your files over to it.
06:19 Motoko Assuming you don't have any other history you want to keep.
06:19 a_thakur joined #git
06:20 jknetl joined #git
06:21 pamplemousse Motoko: I guess your right
06:22 cbreak pamplemousse: git pull --rebase accepts specific remotes branches
06:22 cbreak just tell it what to pull from where
06:22 Motoko Sometimes it's the easiest way if you don't want to spend the time unwinding it.
06:22 dreiss joined #git
06:22 cbreak if the remote has history you don't want, just force push
06:23 cbreak maybe github fucked up somehow and created some bogous commit
06:23 cbreak I heard they do that sometimes
06:23 JeroenT joined #git
06:24 wogi joined #git
06:27 Lipp joined #git
06:28 danslo_ joined #git
06:28 heftig is there a config key for git-svn's log-window-size?
06:29 pamplemousse cbreak: Motoko I have local .dotfiles/with bunch config files I want to merge with my github.com/user/.dotfiles this simple stuff is taking me some times since I can't pull github.com/.dotfiles
06:30 dan2k3k4 joined #git
06:30 cbreak pamplemousse: why can you not?
06:32 pamplemousse cbreak: my local repo and remote has to be same name ? .dotfiles and github.com/user/.dotfiles ?
06:32 cbreak pamplemousse: no
06:32 cbreak names are irrelevant
06:33 whomp joined #git
06:33 cbreak pamplemousse: in the local repo, make sure the remote is added as remote (i.e. shows up in git remote -v)
06:33 cbreak if not, add it
06:33 cbreak then git merge it
06:34 pamplemousse cbreak: the step I followed was ==> git init .dotfiles , git add files1 files2 , git commit -m "commit" , git add remote origin https://github.com/username/.dotfiles , then push does complain about pull and pull complains
06:34 fedepad joined #git
06:34 cbreak pamplemousse: so your remote already has commits
06:34 cbreak merge them
06:34 pamplemousse cbreak: I may missed the merge
06:35 cbreak git pull origin master or what ever
06:35 pamplemousse cbreak: my remote has only the Readme
06:35 cbreak pamplemousse: why do you care about it?
06:35 cbreak why did you commit a readme?
06:35 cbreak do you care about it?
06:35 pamplemousse when we create a repo in github
06:36 cbreak oh my, github really has become shit :/
06:36 pamplemousse cbreak: I want to merge
06:36 cbreak git push -f
06:36 cbreak pamplemousse: alright, then merge
06:36 cbreak pamplemousse: stop complaining and do it :)
06:37 mangolisk joined #git
06:38 _ng joined #git
06:39 laumann joined #git
06:43 pamplemousse cbreak: -f worked
06:43 pamplemousse cbreak: thanks a lot for your time
06:43 cbreak it won't merge
06:43 cbreak it'll just force push
06:43 Sceorem joined #git
06:43 cbreak that will kill the weird commit with the readme
06:46 evanwang joined #git
06:46 rominronin joined #git
06:47 harish joined #git
06:48 Alienpruts joined #git
06:50 watabou joined #git
06:51 pamplemousse cbreak: like you said the readme dissapeared
06:51 pamplemousse cbreak: I uploaded my config files to github everything is fine
06:51 pamplemousse cbreak: how can I merge with stuff I add on the github.com site ?
06:52 Fuzzmz pamplemousse, what do you mean by stuff you add on the github.com site?
06:52 Fuzzmz files uploaded/edited straight from the interface?
06:53 cbreak git merge merges things
06:53 Seveas cbreak: shocking!
06:55 Lipp joined #git
06:57 lordjancso joined #git
06:58 zeroed joined #git
06:58 zeroed joined #git
06:58 submitnine joined #git
06:58 mimosa-marnier oh lord everything seem to work know
06:59 mimosa-marnier thanks all
07:01 apotry joined #git
07:02 danslo joined #git
07:03 dreiss joined #git
07:06 niels___ joined #git
07:08 evanwang joined #git
07:10 erguven joined #git
07:11 overlord_tm joined #git
07:12 PCatinean joined #git
07:12 ThomasLocke joined #git
07:13 JeroenT joined #git
07:16 mingrammer joined #git
07:19 Vampire0_ joined #git
07:21 dan2k3k4 joined #git
07:25 depach joined #git
07:25 fuchstronaut joined #git
07:25 BSAlb joined #git
07:25 Lipp joined #git
07:26 Balliad joined #git
07:26 Lipp joined #git
07:28 trobotham joined #git
07:30 fedepad joined #git
07:30 hide_ joined #git
07:32 DevAntoine joined #git
07:39 godzirra joined #git
07:39 Vivekananda joined #git
07:39 Vampire0 joined #git
07:43 eduardas_m joined #git
07:43 lyjwdu joined #git
07:49 souther joined #git
07:51 elect joined #git
07:52 AndreSomers joined #git
07:56 mischat joined #git
07:56 kurkale6ka joined #git
07:56 synthmeat joined #git
07:58 go1111111 joined #git
07:59 ctcrnitv joined #git
08:00 synthmeat joined #git
08:00 ctcrnitv I'm running into problems trying to learn 'merge'
08:01 ctcrnitv the tutorial I'm following has me fetch a remote repo and then merging the local repo with origin/master
08:02 ocbtec joined #git
08:02 ctcrnitv for him, the files merge fine but for me there is a conflict error
08:02 osse !eek
08:02 gitinfo [!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
08:03 ctcrnitv BUT when I try to resolve the conflict error using THEIR version, I end up with serious issues
08:04 jaequery joined #git
08:04 ctcrnitv (for the example it's just a README file that has the merge conflict)
08:04 Thorn__ joined #git
08:05 ahmedelgabri joined #git
08:05 thiago not enough information for us to help you
08:05 garethdaine joined #git
08:05 thiago the actual resolution of the coflict is not a Git task. It's up to your project.
08:06 souther joined #git
08:06 donnib joined #git
08:06 donnib Hi
08:07 ctcrnitv thiago, to resolve the conflict I just opened the conflicting readme file in sublime, then deleted my version in favor of theirs
08:07 thiago ok, great
08:07 ctcrnitv why does a merge conflict still happen though?
08:07 thiago after this?
08:07 ctcrnitv yes
08:07 thiago because there were other changes
08:07 Hink joined #git
08:07 thiago or you took your version, not theirs
08:08 donnib If i have a branch with 3 commits let's call it X, i then merge this branch into Y but when merging i decide one of the changes made by one commit i don't want that, now if i want that change later into branch Y how would i do that ? Cherry pick i know i can use but any other options ?
08:09 thiago donnib: when you merge, you merge ALL changes
08:09 thiago you don't get to choose what you want and what you don't
08:09 donnib @thiago you get to choose if you want
08:09 thiago you do not
08:10 thiago git merges merge everything and record everything as merged
08:10 donnib is that something you are saying because it's a bad practice or what ?
08:10 ctcrnitv thiago, if there were other changes, shouldn't I expect multiple conflicts then?
08:10 thiago ctcrnitv: it depends on what conflicted. It may be other parts of the file.
08:11 romerocesar joined #git
08:11 osse git diff --staged will show all changes that git was able to merge in its own
08:11 souther joined #git
08:11 solars joined #git
08:11 osse *on its own
08:12 timvishe` joined #git
08:12 thiago donnib: you can revert a commit after you merge. You can revert the reversal later. That's up to you.
08:12 thiago donnib: that has nothing to do with the merge
08:12 BadSnappa joined #git
08:12 solars hi, quick question - when cloning from github git seems to be stuck, git-clone -v does not output anything useful - how can I debug this?
08:12 solars it should use the ssh key, so might be an out issue
08:12 thiago solars: try cloning from another machine, in another network
08:12 thiago most likely, it's your firewall or your network
08:13 donnib thiago: i am not talking about revert, i am talking about --no-commit when merging
08:13 solars I don't currently have another machine on another network - the firewall didn't change
08:13 thiago donnib: you can revert during the merge too. I would say it's a bad practice.
08:13 Thorn joined #git
08:14 encod3 joined #git
08:14 thiago donnib: better to merge everything and then revert just the one. Then it's clear you reverted something. It'll be easier to un-revert later.
08:14 solars thiago: can't I get some more debug info on what git is trying to do?
08:14 donnib thiago: so doing a merge between two branches and taking changes out of the merge is a bad practice
08:14 thiago solars: GIT_TRACE=1
08:15 thiago donnib: yes. Because Git will mark everything as merged.
08:15 thiago donnib: it's bad practice because there's no clear way to mark that some changes weren't included
08:17 donnib thiago: gotcha, thank you for clarifying that, so let's playback the scenario again, i did 3 commits on X, merge all of it to Y, revert one of the commits, later i want the commit in again now how would i do that in the best way ?
08:17 ochorocho__ joined #git
08:17 thiago donnib: cherry-pick the change or revert the reversal
08:17 jaequery joined #git
08:17 donnib thiago: ok i understand
08:17 donnib thiago: thx
08:19 ayjay_t joined #git
08:19 lindenle joined #git
08:19 dimi1947 joined #git
08:19 mrpackethead joined #git
08:22 atomi joined #git
08:22 _ADN_ joined #git
08:23 sevenfourk left #git
08:24 ferr joined #git
08:31 Thorn__ joined #git
08:32 King_Hual joined #git
08:33 King_Hual joined #git
08:33 chll_ joined #git
08:34 Thorn__ joined #git
08:34 a_thakur joined #git
08:34 Narwhaal joined #git
08:38 JeroenT joined #git
08:40 ohcibi joined #git
08:41 a_thakur joined #git
08:42 evanwang_ joined #git
08:47 stamina joined #git
08:49 rasto joined #git
08:54 Wind0r joined #git
08:58 bencevan_ joined #git
09:02 pothepanda joined #git
09:03 atomi joined #git
09:04 cqi joined #git
09:04 GandalfTheWizard joined #git
09:04 pijiu2 joined #git
09:04 mingrammer joined #git
09:06 holgersson joined #git
09:06 pijiu2 joined #git
09:07 pijiu2 joined #git
09:08 TomyWork joined #git
09:08 pijiu2 joined #git
09:09 hanthings_ joined #git
09:10 pijiu2 joined #git
09:10 cqi joined #git
09:11 pijiu2 joined #git
09:12 whomp joined #git
09:13 pijiu2 joined #git
09:13 a_thakur joined #git
09:17 sonikspin joined #git
09:19 Raging_Hog joined #git
09:20 fuchstronaut joined #git
09:21 cdown joined #git
09:21 rbr joined #git
09:23 yuhlw_ left #git
09:24 bauruine joined #git
09:27 PCatinean joined #git
09:33 notebox joined #git
09:34 ramsub07 joined #git
09:35 Akimb joined #git
09:36 irqq joined #git
09:37 fedepad joined #git
09:38 nikivi joined #git
09:39 godzirra joined #git
09:45 pro_metedor joined #git
09:45 linuxmint joined #git
09:48 a_thakur joined #git
09:52 navidr joined #git
09:53 irco joined #git
09:54 netj joined #git
09:55 thadtheman joined #git
09:57 dodobrain joined #git
09:58 mingrammer joined #git
10:00 minot joined #git
10:00 h264 joined #git
10:00 h264 joined #git
10:00 kusfedora joined #git
10:00 zapb_ joined #git
10:01 andres joined #git
10:02 Lorcatar joined #git
10:02 sonOfRa joined #git
10:09 DelphicOkami joined #git
10:09 suchkultur joined #git
10:13 HappyLoaf joined #git
10:13 antlarr joined #git
10:14 Sceorem joined #git
10:15 circ-user-myOtS joined #git
10:17 antlarr hi, I have a repository with one branch 5.6.0 that at some point diverged into another branch 5.7.0, then in the first branch, a v5.6.1 tag was created and some time later, a tag  v5.7.0 was created in the second branch. I can do "git diff v5.6.1..v5.7.0" and I get the diff between both versions, but that's too big and I wanted to see the individual commits. I tried "git format-patch v5.6.1..v5.7.0" but there's not a direct forward path from
10:17 antlarr one to the other, so it shows me something that doesn't apply over v5.6.1
10:17 antlarr is there any way to get individual commits from one tag to the other, maybe showing "reverse patches" until both branches diverged?
10:18 ochorocho__ joined #git
10:19 antlarr to be clearer, in the 5.7.0 branch there's a commit that raises the version from 5.6.0 to 5.7.0 and in the 5.6.1 branch there's a commit that raises the version from 5.6.0 to 5.6.1, so in order to get useful patches, I should get a patch that decreases 5.6.1 to 5.6.0 and then the patch that increments from 5.6.0 to 5.7.0
10:20 Mixologic joined #git
10:20 osse Someone is using Qt
10:20 antlarr :)
10:20 grawity isn't that `git log v5.6.1..v5.7.0`
10:20 grawity with either .. or ...
10:22 tlaxkit joined #git
10:22 antlarr log doesn't show patches, just commit logs, isn't it?
10:23 antlarr is there any difference between .. and ... ?
10:24 Luke1410 joined #git
10:25 grawity it does if you use -p
10:25 grawity or, for that matter, `tig`
10:26 Luke1410 hi - looking into a case where using git svn the EOL property didn't seem to be set for an added file in SVN even though the corresponding svn:auto-props setting is set (and works when using svn clients)
10:26 grawity "a..b" shows commits in B but not in A; "b..a" shows the opposite; "a...b" shows both
10:26 Luke1410 is there a known limitation in git svn?
10:28 canton7 Luke1410, check what version of svn is bundled in git-svn
10:28 buffal0 joined #git
10:28 watabou joined #git
10:28 canton7 svn:auto-props is relatively new iirc
10:28 canton7 (and I've had problems with it myself)
10:28 Luke1410 canton7, was added in SVN 1.8 -- so depends on ur definition of relatively :)
10:29 antlarr grawity: so there's no way to get reverse patches, right?
10:29 antlarr note the example I mentioned above
10:29 Luke1410 SVN 1.8 was released 06/2013
10:30 antlarr there's no patch that increases from 5.6.1 to 5.7.0, but there's one that increases from 5.6.0 to 5.6.1 and one that increases from 5.6.0 to 5.7.0, so the patch I need can be "generated"  by reversing the upgrade from 5.6.0 to 5.6.1 and then applying 5.6.0->5.7.0
10:31 antlarr I guess that feature is not implemented :/
10:31 elect joined #git
10:31 pro_metedor joined #git
10:32 courrier joined #git
10:34 bejeb I just did a merge and got "error: inflate: data stream error (incorrect header check)" and a few other messages. That sounds .... well, terrifying. What do I do next?
10:34 qsx bejeb: git fsck
10:35 bejeb In case it helps: http://hastebin.com/xuvucekace.coffeescript
10:35 bejeb qsx: ok
10:38 bejeb Also, my repo references an alternates which was created using git clone --mirror server-uri local-mirror-path, but I haven't done anything with that for ages. Does that complicate things?
10:39 cdown joined #git
10:40 JeroenT joined #git
10:40 esmeuo joined #git
10:40 bejeb http://hastebin.com/eyojogopaw.sql
10:40 bejeb fatal: loose object 14b7f55... (stored in .git/objects/14/b7f55...) is corrupt
10:41 ToBeCloud joined #git
10:42 a_thakur joined #git
10:42 jstimm joined #git
10:43 cdown_ joined #git
10:43 digidog joined #git
10:43 Puffball joined #git
10:43 Ezzy joined #git
10:44 bejeb all branches are pushed anyway, so I guess I 'll try cloning it again from the remote and see what happens, or is there a chance that the push I did after that message has messed up the remote?
10:44 Iacobus joined #git
10:45 buffal0 joined #git
10:47 DolphinDreamm joined #git
10:48 andres joined #git
10:49 canton7 Luke1410, did you check the SVN version used by git?
10:49 canton7 'git svn --version'
10:49 rffleaie joined #git
10:49 Luke1410 canton7, yes --- reports 1.8.8
10:50 JyZyXEL joined #git
10:50 laumann joined #git
10:50 buffffal00 joined #git
10:52 dermoth joined #git
10:52 canton7 Luke1410, hmm, not sure then. There's a patch from 2008 which adds auto-props from user config:
10:53 rffleaie I have a big svn repo with many projects and I am migrating all data to git. I have an organization problem. With svn I can have many project per repo. Can I do the same thing now or is better have only one pj per repo?
10:53 mingrammer joined #git
10:53 Luke1410 canton7, yep spotted that too on google --- but that's relatd to the subversion-config file auto-props setting (which is something else and was added < SVN 1.8)
10:53 canton7 can't see anything newer that's relevant though
10:53 HeroYoojin joined #git
10:53 canton7 oops, meant to paste
10:53 bremner rffleaie: it is better to have one project per repo in general
10:53 canton7 bleh, my clipboad's apparently stopped working. never mind.
10:54 canton7 yeah, I know. The relevant part is not seeing anything since then
10:54 rffleaie ok, but how can I manage many repos?
10:55 ShekharReddy joined #git
10:55 Luke1410 canton7, thanks for the info then --- I take it it's not supported yet (with the workaround of adding the corresponding setting to the svn-config file on the client, it's not that much an issue in my case)
10:55 canton7 yeah, I think that's the case, sadly
10:55 rffleaie I neet to have two organization level
10:55 canton7 feel free to send a mail to the mailing list :D
10:56 osse antlarr: you can generate the patches you need
10:56 bremner rffleaie: manage them how?
10:56 bremner rffleaie: i.e. what kind of management are you asking about?
10:57 bejeb qsx: so a fresh git clone from the server, and then git fsck, reported no errors. Does that mean I'm in the clear and that the server repo is not corrupt?
10:57 antlarr osse: how?
10:58 rffleaie I have many repos and I want to have a logical organization about my projects
10:58 rffleaie I can have an only logical organization
10:59 osse antlarr: I just realized I don't understand the question anymore
10:59 drbean joined #git
10:59 osse not sure what the goal is
10:59 buffal0 joined #git
11:00 bremner rffleaie: you can use whatever directory structure you want, as long as only the leaves are repos
11:00 Puffball joined #git
11:01 antlarr the goal is to get a series of patches that I can apply to 5.6.1 in order to get 5.7.0, so I can do a bisect search manually to see exactly which commit fixes a problem which doesn't appear with 5.7.0 but appears with 5.6.1
11:01 grawity hmm
11:02 grawity what if you do `git bisect good 5.7.0` + `bad 5.6.1`
11:02 antlarr I can't because for each build I do, I have to generate an rpm package and install it in a virtual machine
11:02 osse so what?
11:03 JeroenT_ joined #git
11:03 grawity script it, do `git bisect run ~/foo`, get a pizza while it runs
11:03 grawity might not automate the testing part, I guess, but.
11:03 drbean_ joined #git
11:04 rffleaie brember if I create I need that this structure is inside my git server like bitbuket
11:05 mizu_no_oto joined #git
11:05 drbean- joined #git
11:05 rffleaie if i create a directories structure like your idea I lose the organization inside bitbucket
11:05 bremner rffleaie: that's more a question for the hosting provider then. If you run your own server, you can do what you want.
11:05 antlarr I maybe should note also that qtwebengine (which is what I'm building) has chromium as a submodule, and I'm not really sure where is the fix, if in qtwebengine or chromium, so I'm not sure if that's so easily scriptable...
11:06 antlarr but in any case, I didn't know about "bisect run" (I'm reading about it right now), so thanks for that information :)
11:06 osse git rev-list 5.6.0..5.6.1 | while read hash; do git diff -R $hash^! > backpatch_$(i++)); done; git rev-list --reverse 5.6.0..5.7.0 | while read hash; do git diff $hash^! > forwardpatch_$((i++)); done
11:06 rffleaie this isn't true because if I need to download some project I have some directory, with svn I can use the same path to download many directory with many project
11:06 osse No matter how difficult the testing is I don't see how it is beneficial to circumvent git bisect
11:07 Alienpruts joined #git
11:07 drbean joined #git
11:07 HeroYoojin left #git
11:07 rffleaie Can I do the same thing with git?
11:07 bremner rffleaie: you can use a tool like myrepos to do it
11:07 bremner !myrepos
11:07 bremner silly bot
11:07 bremner !mr
11:07 gitinfo a tool to manage Multiple Repositories, see http://joeyh.name/code/mr/
11:08 miklcct joined #git
11:09 CheckDavid joined #git
11:10 qsx bejeb: yes
11:10 Balliad joined #git
11:10 bejeb qsx: well that means I'm having a better day than I thought. Thank you for your help! Added bonus: it forced me to understand a bit more about git fsck
11:11 Macaveli joined #git
11:11 danslo joined #git
11:11 antlarr osse: thanks!
11:12 rnsanchez joined #git
11:13 Luke1410 left #git
11:17 PioneerAxon joined #git
11:19 drbean_ joined #git
11:21 drbean- joined #git
11:21 noob joined #git
11:22 Michaela joined #git
11:23 drbean joined #git
11:23 jbitdrop joined #git
11:25 noob hi
11:25 gitinfo noob: 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.
11:27 dviola joined #git
11:28 watabou joined #git
11:31 NeverDie joined #git
11:34 d10n-work joined #git
11:34 incog joined #git
11:35 nuck joined #git
11:37 incog joined #git
11:38 PioneerAxon joined #git
11:40 godzirra joined #git
11:41 shock- joined #git
11:42 raijin joined #git
11:42 niels__ joined #git
11:43 niels___ joined #git
11:44 dendazen joined #git
11:45 AndreSomers joined #git
11:46 niels____ joined #git
11:47 rgrinberg joined #git
11:48 PioneerAxon joined #git
11:48 biax joined #git
11:49 biax git push -u origin master <-- whats origin
11:49 biax here also git remote add origin git@gitlab.com:___.git
11:49 _ikke_ biax: It's a name for a remote
11:50 biax _ikke_: and can i give it any other name?
11:50 rorro joined #git
11:50 fling doing a commit -s and getting this : You need a passphrase to unlock the secret key for user… gpg-agent[25240]: command get_passphrase failed: Inappropriate ioctl for device gpg: problem with the agent: Inappropriate ioctl for device …
11:50 _ikke_ biax: sure
11:50 fling How to fix? ^
11:50 _ikke_ man git remote
11:50 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
11:50 dsdeiz joined #git
11:50 dsdeiz joined #git
11:52 fling What am I doing wrong?
11:52 fling Or is my gpg somehow bad?
11:52 fling I can't find anything about this in the manpages.
11:52 biax _ikke_: so its basically a name, much like an alias or a hostname right? git remote add origin git@gitlab.com:___.git <-- in this case, origin ==   git@gitlab.com:___.git
11:52 biax is this accurate?
11:52 johnmilton joined #git
11:53 _ikke_ biax: yes, that's correct
11:53 ash_workz joined #git
11:54 johnmilton joined #git
11:54 biax pretty simple, finally got gitlab to work
11:55 GandalfTheWizard joined #git
11:55 BadSnappa joined #git
11:57 GandalfTheWizard joined #git
11:59 alex1a joined #git
12:00 jaafar joined #git
12:00 Sceorem joined #git
12:01 fling WTF! Fixed my issue with export GPG_TTY=$(tty)
12:02 fling How do I configure my repo to pass the env variable to gpg?
12:02 encod3 joined #git
12:03 mingrammer joined #git
12:03 Guest_94847 joined #git
12:05 mlittlej joined #git
12:05 Fuzzmz fling, I found no way around that besides having that export set in my zshrc
12:06 fling Thanks for the tip.
12:07 newbie1 joined #git
12:08 JeroenT joined #git
12:09 encod3_ joined #git
12:09 lmatteis guys
12:10 lmatteis when i do a git merge --no-commit --no-ff
12:10 lmatteis but it creates a huge extra commit of all the stuff
12:10 lmatteis can i avoid this?
12:10 incog freenode is spying on you: Head over to #antispammeta @ freenode & type ;investigate & your usual nick to see a snitchbot spam your info
12:11 jbu_ joined #git
12:12 JeroenT joined #git
12:12 pwnawannab[NE] joined #git
12:13 romerocesar_ joined #git
12:13 jbu__ joined #git
12:14 AndreSomers joined #git
12:15 osse lmatteis: You meam after you run git commit afterwards.
12:15 osse ?
12:15 lmatteis yeah
12:17 fmcgeough joined #git
12:17 rahtgaz joined #git
12:17 Lomex joined #git
12:17 osse lmatteis: Then no. Maybe you want --ff-only instead of --no-ff
12:18 ochorocho__ joined #git
12:19 zivester joined #git
12:20 mohabaks joined #git
12:20 Viddax joined #git
12:21 lindenle joined #git
12:22 lncog joined #git
12:22 Vampire0_ joined #git
12:23 GandalfTheWizard joined #git
12:23 lncog joined #git
12:24 lmatteis ok
12:24 lmatteis is it better to squash commits or keep a full history?
12:24 lmatteis sometimes a clean history is nice, where a single commit describes a new feature
12:25 actinide joined #git
12:25 jeffreylevesque joined #git
12:25 tobiasvl yeah, totally depends.
12:26 tobiasvl I like atomic commits, squashing together fixup commits etc into commits that single-handedly don't break the build, but not necessarily is feature-complete
12:27 lmatteis tobiasvl: problem we have with that is that we "lose" the single commits, so we can't keep track of statistics about our developers work
12:29 osse statistics be damned
12:29 jknetl joined #git
12:29 Raging_Hog joined #git
12:30 watabou joined #git
12:30 dreiss joined #git
12:31 ahmedelgabri joined #git
12:32 tobiasvl lmatteis: what do you mean by "lose!"
12:32 tobiasvl -!
12:33 Fuzzmz lmatteis, no no no no no
12:33 lmatteis tobiasvl: well, my history will appear as a single commit of my branch
12:33 Fuzzmz please for the love of god, don't do statistics based on git commits
12:33 Fuzzmz especially not for management
12:33 lmatteis why not
12:33 Fuzzmz because they will be treated as metrics, and gamed as metrics
12:34 Fuzzmz I will / commit
12:34 Fuzzmz every single /commit
12:34 Fuzzmz insignificant change /commit
12:34 buffal0 joined #git
12:34 Fuzzmz because that's what management /commit
12:34 Fuzzmz looks at /commit + push
12:35 flaguy48 left #git
12:35 tobiasvl lmatteis: oh, no, I meant that I *didn't* squash everything into one commit. I just make sure each commit is atomic and doesn't break the build.
12:35 tobiasvl that's it.
12:35 Fuzzmz it's just as bad as doing stats by way of LoC's added/removed
12:35 tobiasvl and yes, don't do statistics based on commits
12:36 tobiasvl lmatteis: so do you have a workflow where each feature branch is rebased into one huge commit before it's merged?
12:36 tobiasvl hard to bisect...
12:36 cdown joined #git
12:37 tobiasvl but easy to revert (of course, just as easy to revert if you have merge commits)
12:37 tlaxkit joined #git
12:38 Fuzzmz our workflow is the following: during the review phase you can have as many commits as you want, but they get rebased/squashed into one commit before its merged
12:38 tobiasvl :/
12:38 Fuzzmz that way someone looking at the review has all the steps that code development went through
12:38 tobiasvl but then that information is lost
12:39 Fuzzmz tobiasvl, I know, and I hate it, but it's how the linux kernel handles things, and if we want to upstream changes we can't do it any other way
12:39 Fuzzmz (any other way that won't make it harder for us to bring in changes from upstream)
12:39 tobiasvl ah yeah linux does things weirdly all around (IMO)
12:39 Fuzzmz agreed
12:41 osse *all* the steps?
12:41 Fuzzmz osse, yep. in my experience it's useful when someone new joins the team and wonders why a feature was implemented the way it was
12:42 Fuzzmz if you only see the final version you have no idea why some decisions were made
12:42 oxsyn joined #git
12:43 a_thakur joined #git
12:43 osse if you see the original version then you still don't see why some decisions were made because it's either hidden in too much noise or simply not there because the commit messages suck
12:43 osse (if you really mean **ALL** the steps)
12:45 Fuzzmz you see the discussions around the review for each particular version though
12:45 osse At least if I worked at your company, anyway :p
12:45 Fuzzmz hehe
12:45 Limes left #git
12:45 Limes joined #git
12:45 osse huh, where do you find the reviews afterwards?
12:46 Fuzzmz bitbucket server
12:46 anonymuse joined #git
12:49 tlaxkit joined #git
12:51 GodGinrai joined #git
12:51 ahmed_elgabri joined #git
12:52 timvishe` left #git
12:52 Jellyg00se joined #git
12:53 timvisher joined #git
12:53 isysd joined #git
12:54 CheckDavid joined #git
12:56 synthroid joined #git
12:58 newbie1 joined #git
12:58 ahmedelgabri joined #git
12:58 andlabs joined #git
13:01 Dave666 joined #git
13:02 Dave666 Hi, I've got a problem with git using github. I added a file over 100MB, so when I tried to push git refused it. So I used "git rm --cached filename" to remove it, and also added a gitignore. However git still keeps attempting to upload the bad file. Is there any way to stop this, or do I delete the directory the file is in, and start again?
13:03 bsanford joined #git
13:03 osse Dave666: you must wipe the file from history
13:03 Dave666 brilliant :)
13:04 osse !bfg
13:04 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
13:04 osse !sensitive
13:04 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
13:04 biertie joined #git
13:06 flaguy48 joined #git
13:09 godzirra joined #git
13:09 cdg joined #git
13:09 shinnya joined #git
13:10 JamesBaxter joined #git
13:12 whomp joined #git
13:12 leeN joined #git
13:13 Dave666 Hmm, can't easily get bfg on this Mac, and the commands to remove the file don't actually work here "prune-empty" is an unknown option. Probably easier to just clone it again and copy my updates across manually. Have to remember that about git :)
13:14 Gsham joined #git
13:15 jbu_ joined #git
13:16 nilg joined #git
13:16 pamplemousse joined #git
13:16 ali1234 joined #git
13:17 jbu joined #git
13:18 Xandaros joined #git
13:19 raven-au joined #git
13:21 watabou joined #git
13:21 Darren__ joined #git
13:22 devhoag joined #git
13:24 r3c0d3x joined #git
13:24 rafalcpp hm what does the notation #{.....} mean?
13:24 blackjid joined #git
13:24 rafalcpp is it forcing name of tag?
13:26 tobiasvl Dave666: you mean you have to remember that about gitHUB ;) but yeah, perhaps filter-branch is easier
13:27 eduardas_m joined #git
13:27 rafalcpp don't see it on https://git-scm.com/docs/gitrevisions
13:28 niels__ joined #git
13:28 Dave666 tobiasvl: Yeah I found that this worked in the end: git filter-branch --index-filter 'git rm -r --cached --ignore-unmatch videos/av1.mov' HEAD
13:28 CEnnis91 joined #git
13:28 Dave666 (going to make an alias for that for the future :)
13:30 AaronMT joined #git
13:30 alcohol joined #git
13:31 anonymuse joined #git
13:32 vls-xy joined #git
13:34 oldmacd joined #git
13:35 Vampire0 joined #git
13:35 mkoskar joined #git
13:36 mycyber joined #git
13:37 tobiasvl Dave666: yeah, good. just remember !rewrite
13:37 gitinfo Dave666: 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
13:37 tobiasvl Dave666: and also, regardless of github's size limit for single files, git isn't well suited for !binary files
13:37 gitinfo Dave666: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
13:38 Dave666 tobiasvl: Yeah, for me it's just to remove files I haven't been able to commit due to size, so removing them from history shouldn't affect anyone else :)
13:38 sangy joined #git
13:39 tobiasvl ah, ok. just to be nitpicky, you haven't been able to PUSH them due to size. you could have pushed them to other repos not hosted on GitHub, for example, and thus now made your repo incompatible with other up/downstreams
13:39 tobiasvl in theory
13:39 pamplemousse joined #git
13:40 narendraj9 joined #git
13:40 tobiasvl but if it's always ever been local, then of course rewrite as much as your heart desires
13:40 ali1234 joined #git
13:40 Dave666 Yeah, I had to remove it from history, otherwise git just keeps trying to send the file, even if it's deleted.
13:40 tobiasvl yep
13:41 aeo1ack joined #git
13:41 achadwick joined #git
13:41 tonyyarusso left #git
13:41 cdown joined #git
13:42 johntramp joined #git
13:43 diogenese joined #git
13:43 huntleja joined #git
13:44 mingrammer joined #git
13:44 red82 joined #git
13:44 patarr joined #git
13:44 niels__ joined #git
13:45 ktos joined #git
13:45 niels__ joined #git
13:46 pamplemousse joined #git
13:47 ktos Hi! I'm doing an interactive rebase and I want to change author and commiter date. I do that by doing: export GIT_AUTHOR_DATE="..." then export GIT_COMMITER_DATE="$GIT_AUTHOR_DATE" and then git rebase --continue. What am I doing wrong?
13:47 Vgr joined #git
13:47 Vgr joined #git
13:47 Vgr joined #git
13:47 Vgr joined #git
13:49 rivarun joined #git
13:50 alcohol ktos: i don't see any mention of errors or what not. so, sounds to me like you are not doing anything wrong.
13:51 ktos alcohol: but if I type git log (during the rebase process) I still see the old date. Do I need to apply the whole rebase to see the changes?
13:58 mycyber joined #git
13:59 dendazen joined #git
13:59 ash_workz joined #git
13:59 FilipNortic joined #git
13:59 r4z joined #git
13:59 Zamyatin joined #git
14:00 arooni joined #git
14:01 mns joined #git
14:01 crayon joined #git
14:02 minot joined #git
14:02 kusfedora joined #git
14:03 ahmed_elgabri joined #git
14:04 phanimahesh joined #git
14:04 notebox joined #git
14:07 alcohol ktos: i have no idea
14:07 alcohol ktos: i never played with that kind of voodoo
14:10 joki joined #git
14:11 rmrrn left #git
14:12 zivester joined #git
14:15 ResidentBiscuit joined #git
14:17 JeroenT joined #git
14:18 JeroenT joined #git
14:18 snowkidind joined #git
14:19 _sjs joined #git
14:19 ochorocho__ joined #git
14:19 sdothum joined #git
14:21 Khisanth joined #git
14:25 phaleth joined #git
14:25 ahmed_elgabri joined #git
14:26 vassagus joined #git
14:29 duarteper joined #git
14:30 eindoofus joined #git
14:30 chrisshattuck joined #git
14:30 ShekharReddy joined #git
14:31 eindoofus hi, i was just wondering how often i should be merging in updates in the master branch into my branch? i'm not as familiar with working with multiple branches
14:31 eindoofus not sure what the best practice is or if it doesn't matter how often i do it
14:31 perlpilot eindoofus: as often as needed :)
14:31 eindoofus good to hear :)
14:33 perlpilot eindoofus: the basic idea is that the further apart master and your branch get, the harder the merge will be due to conflicts.  So, merge master into your branch to keep the conflict resolution to a manageable amount.  How often that is depends on how often master and your branch change and what those changes are exactly.
14:33 thebope joined #git
14:34 Repox joined #git
14:34 b joined #git
14:37 VoidFox joined #git
14:37 Guest58275 left #git
14:38 mingrammer joined #git
14:39 matsaman joined #git
14:39 EmilQ joined #git
14:40 EmilQ git status does not show any changes, yet when I build my project some of the files seem to be corrupted
14:40 EmilQ The repository is on a faulty disk
14:41 EmilQ Is there some way I can have git check files or force a reset?
14:41 catuca joined #git
14:41 EmilQ By default, it does not seem to check file contents at all
14:41 Noldorin joined #git
14:41 EmilQ I suspect it largely relies on timestamps, too?
14:41 sea-gull joined #git
14:41 catuca I would like to import files from a non-git-repo directory outside of the project into a git repo branch. Now, files copied/imported into that branch should not affect other branches.
14:42 dlh_ joined #git
14:42 EmilQ Is git fsck --full what I'm looking for?
14:43 jast EmilQ: yes, but --full has no effect these days (it's become the default mode)
14:43 EmilQ Meh, it didn't discover any discrepancies
14:43 EmilQ Perhaps it's non-repository files that were corrupted
14:43 catuca is there a way?
14:44 EmilQ As in, implicitly generated Visual Studio files and such
14:44 jast possibly
14:44 clemf joined #git
14:44 jast catuca: as soon as you add/commit those files on that branch, they disappear when you switch to a different one
14:45 catuca jast: ah...k
14:45 catuca jast: I see
14:45 jast git isolates tracked files to the branch they're on... untracked files are basically completely ignored, so branch switching has no effect on them
14:45 catuca jast: understood
14:45 jast (but if you have an untracked file that git would need to overwrite when switching branches, it will notice that and abort)
14:46 catuca jast: understood. k
14:46 catuca jast: If I create branch A, "git rm -rf *" and then commit that...it will not affect other branches, right?
14:47 Caelum joined #git
14:47 pijiu joined #git
14:47 mangolisk joined #git
14:47 canton7 catuca, btw, use 'git rm -rf .' - '*' is evaluated by your shell before git sees it, which may lead to unexpected results
14:47 catuca canton7: good point
14:48 catuca canton7: that was a typo..thanks
14:48 JanC_ joined #git
14:48 pijiu joined #git
14:48 flaviodesousa joined #git
14:49 dunpeal joined #git
14:49 pijiu joined #git
14:49 dunpeal I have a very simple alias defined in ~/.gitconfig: c = !"echo $1"
14:49 dunpeal However, when I use it on the CLI like: git c foo
14:49 dunpeal it prints "foo foo". why?
14:51 pijiu2 joined #git
14:52 ahmed_elgabri joined #git
14:52 notebox joined #git
14:53 actinide joined #git
14:54 jaequery joined #git
14:55 chibby0ne joined #git
14:55 rorro joined #git
14:56 chibby0ne Is there any way to check the date the commit was added to the branch not the date the commit was created (the usual date shown)?
14:57 jimi_ joined #git
14:57 osse chibby0ne: Try git show --
14:57 osse Ugh
14:57 osse --pretty=fuller
14:58 osse That will show separate author date and commit date
14:58 mycyber joined #git
14:58 chibby0ne osse, that's it! AuthorDate and CommitDate! Thanks you very much!
14:59 chrisshattuck joined #git
15:00 dreiss joined #git
15:00 luca_ joined #git
15:00 roelmonnens joined #git
15:01 luca_ hi, I switched to git 2.10 and gpg signatures are shown even with git log --oneline, is that intended?
15:01 luca_ sudenly --oneline is turned into --fourline :)
15:02 micah joined #git
15:03 micah when I do a git clone --local (or --shared), I don't have access to the "remote" branches (git branch -r only shows origin/master), and tags. Is there a way I can associated the other branches?
15:03 satbyy joined #git
15:04 micah i can do a git clone --mirror, but maybe that isn't the same?
15:04 actinide joined #git
15:05 fuchstronaut joined #git
15:06 jbu_ joined #git
15:07 mycyber joined #git
15:07 terminal_echo joined #git
15:08 pro_metedor joined #git
15:09 catuca joined #git
15:09 uwjbvg joined #git
15:09 eivarv joined #git
15:10 actinide joined #git
15:10 catuca jast: are you there
15:11 neurodrone_ joined #git
15:13 netj joined #git
15:13 subhojit777 joined #git
15:15 franl joined #git
15:15 raijin joined #git
15:16 nedbat i'm looking at a large github repo, and want to find all pull requests in the last six months that added files named *.underscore.  Is there a git way to find those branches?
15:16 tyreld joined #git
15:18 osse nedbat: try git log --all -- '**/*.underscore'
15:20 nedbat osse: ooh, nice
15:21 rbr joined #git
15:22 nettoweb joined #git
15:23 EvilPeng1 joined #git
15:24 lindenle joined #git
15:27 InfoTest joined #git
15:29 micah is there a way to see if a branch or a tag exists *before* cloning the repository?
15:29 micah ah git ls-remote
15:30 ochorocho__ joined #git
15:30 kpease joined #git
15:31 madewokherd joined #git
15:32 jbu__ joined #git
15:32 timmu_ joined #git
15:32 _ikke_ yup
15:33 jbu joined #git
15:34 actinide joined #git
15:35 actinide joined #git
15:41 nabblet joined #git
15:42 stomplee joined #git
15:42 nabblet hi, can I run git fetch in a way that allows me to run git pull offline later? For example: I want to see what's going on on the remote server. Later I will board a train and use the time to inspect and merge the remote's changes to my local branches.
15:43 nabblet Currently, a git pull or git merge that comes after a fetch will still need internet connection
15:43 _ikke_ nabblet: git pull = git fetch + git merge
15:43 canton7 nabblet, no, 'git merge' does not require an internet connection
15:44 _ikke_ if you've done the fetch, it's just the merge (or rebase) that remains
15:44 Repox joined #git
15:44 tang^ joined #git
15:45 nabblet ah i see. Must have missed that O.o Sorry. Thanks for pointing that out _ikke_ canton7
15:45 canton7 (so yeah, once you've fetched, you can merge (instead of pulling) offline with no issues)
15:45 buffffal00 joined #git
15:45 tang^ joined #git
15:46 lindenle joined #git
15:46 nabblet got it. Thanks :-)
15:47 wogi joined #git
15:48 eindoofus joined #git
15:48 Doginal joined #git
15:49 ansimation joined #git
15:50 eindoofus i'm finding a million variations of q/a that complicate something i'm trying to do when i google around. how do i update my branch with what's changed in the master branch?
15:50 synthroid joined #git
15:51 Kronuz joined #git
15:52 _ikke_ git checkout <branch>; git merge master
15:52 nedbat eindoofus: you can either merge master into your branch, or rebase your branch on top of master
15:52 _ikke_ That's one way (the safest)
15:52 eindoofus thanks
15:53 buzzLightBeer joined #git
15:53 eindoofus for doing pulls for my new branch if someone makes a commit, do i do "git pull origin newbranch"?
15:54 _ikke_ git is holding a survey. It would be appreciated if you could take some time and answer some questions, thank you: https://jk.gs/gsurv
15:54 unbalanced joined #git
15:54 quenode joined #git
15:55 jungsubk joined #git
15:56 eindoofus nm, was able to find that one through google :)
15:56 Cjcha joined #git
15:57 fling I have three different versions of sources withut any commits. How do I put them into a single repo properly? I'd like to merge them.
15:57 fling Should I first put each one to separate branches somehow?
15:57 Shentino joined #git
15:57 fling Then I choose which one will be the master and… ?
15:57 _ikke_ yup
15:59 fling How do I split the difference of the brances to the separate commits?
16:00 jknetl joined #git
16:00 fuchstronaut joined #git
16:01 thebope joined #git
16:02 thebope joined #git
16:02 micah is there a way I can clone a local repository and get all the 'remote' refs? if I do an initial clone to a directory /tmp/foo, and then do 'git clone /tmp/foo /tmp/bar' I only get the branch that /tmp/foo is currently on, and cannot change to the other branches
16:03 _ikke_ micah: git branch -r
16:03 canton7 micah, a clone fetches remote refs anyway. _ikke_'s command lists them
16:03 canton7 !remote-tracking-branch
16:04 canton7 !remote_tracking_branch
16:04 gitinfo Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'
16:04 micah _ikke_: git branch -r doesn't work
16:04 canton7 micah, please define "doesn't work"
16:05 thiago joined #git
16:05 micah canton7: this is what I mean: https://share.riseup.net/#zwcytVoZ2INmob0gsaep6A
16:06 canton7 micah, right, so 'git clone' only local branches in the repo being cloned. Remote-tracking branches in the source repository won't be cloned.
16:06 micah note line 50, where the clone doesn't have remote branches
16:06 rhizome joined #git
16:06 micah canton7: yeah, i'm wondering if I can clone the remote-tracking stuff, so I dont have to get from the internet a second time
16:07 _ikke_ So you're making a clone of a clone
16:07 _ikke_ That second clone only clones the branches (refs/heads) of the first clone
16:08 _ikke_ while that first clone only has remote tracking branches (refs/remotes)
16:09 micah my goal is to get two copies of this repository, one with one branch, and one with the other. I can do that easily by cloning them from the internet twice, but I tried to use --mirror, --shared, --local and just cloning the filesystem path, but I can't get it from any of those methods
16:09 harish joined #git
16:10 vassagus joined #git
16:10 _ikke_ What can't you get?
16:11 micah _ikke_: i cannot get the second branch in the second repository, by re-using the first clone
16:11 Darcidride joined #git
16:12 cdg joined #git
16:13 _ikke_ on the 2nd clone: git fetch origin refs/remotes/origin/<branchn​ame>:refs/heads/<branchname>
16:15 luca_ left #git
16:16 mingrammer joined #git
16:16 al-damiri joined #git
16:17 romerocesar joined #git
16:18 dan2k3k4 joined #git
16:19 mchelen2 left #git
16:19 fahadash joined #git
16:20 dalias left #git
16:20 jbu_ joined #git
16:21 Electrometro joined #git
16:25 dunpeal joined #git
16:26 Macaveli joined #git
16:27 WayToDoor joined #git
16:28 niels__ joined #git
16:29 _xor joined #git
16:30 godzirra joined #git
16:35 jaafar joined #git
16:36 danslo joined #git
16:38 GodGinrai joined #git
16:40 eihabarabia joined #git
16:41 nd joined #git
16:42 rorro joined #git
16:43 eihabarabia joined #git
16:45 Shentino joined #git
16:46 laumann joined #git
16:47 durham joined #git
16:49 tom[] joined #git
16:53 ansimation joined #git
16:55 RedNifre joined #git
16:58 nitric joined #git
16:58 buffal0 joined #git
16:58 cdown joined #git
16:59 mischat joined #git
16:59 actinide joined #git
16:59 Zamyatin joined #git
17:00 actinide joined #git
17:01 fuchstronaut joined #git
17:02 flavius joined #git
17:03 hashpuppy joined #git
17:03 mrx88 joined #git
17:04 jaequery joined #git
17:06 autoboxer joined #git
17:06 mrx88 hi, I was wondering if it's possible with some parameters to not store history in git? I was thinking storing binary file in git (keepass pw storage), but I don't want that users can get the older historic file after new commit/binary file push
17:06 bobdel joined #git
17:07 _ikke_ no
17:07 _ikke_ !media
17:07 gitinfo [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
17:07 Zilenc3 joined #git
17:09 Zilenc3 left #git
17:10 Zilenc3 joined #git
17:10 Zilenc3 Hello. I'm trying to figure out how to ignore all folders and contents that start with "foo". The folder appears in multiple locations within my project. I've learned how to ignore folders and files by extension, but I'm unsure how to ignore all folders and contents that start with "foo". Can someone help me?
17:11 mingrammer joined #git
17:11 _ikke_ Zilenc3: just foo* in .gitignore
17:12 EvilPeng1 joined #git
17:13 KevinMGranger Doesn't keepass do versioning on its own?
17:13 KevinMGranger mrx88: if you really want git + password storage, consider http://passwordstore.org/
17:13 a_thakur joined #git
17:14 kpease joined #git
17:15 durham_ joined #git
17:17 durham__ joined #git
17:17 mrx88 KevinMGranger, master pw is not versioned. If I change master pw, then old binary file is still available from git history with old master pw
17:18 mrx88 but yeah, seems that git is not the best place for sharing it
17:18 _ikke_ git is all about keeping history
17:18 mrx88 yeah :)
17:18 kpease joined #git
17:18 myhau joined #git
17:20 dreiss joined #git
17:22 franl left #git
17:22 m0viefreak joined #git
17:27 wogi joined #git
17:28 whomp joined #git
17:30 thebope joined #git
17:30 nanga joined #git
17:31 lolmac joined #git
17:32 Vampire0 mrx88, you could put it in its own orphan branch and then always amend and force-push the latest commit on that branch. This way you will always only provide the latest version and it is separated from your code if you don't have an own repository for it anyway which then probably wouldn't make too much sense to use git anyway
17:32 mrx88 Vampire0, yeah, just digging into it
17:32 _ikke_ people will still have it in the reflog for quite some time
17:32 actinide joined #git
17:34 actinide joined #git
17:35 mrx88 for how long time?
17:35 actinide joined #git
17:36 ash_workz joined #git
17:36 _ikke_ 90 days
17:38 mrx88 is it possible to change this?
17:38 _ikke_ Users can do it theirselves, you cannot enforce this
17:40 Groscheri joined #git
17:41 crose joined #git
17:41 cyan__ joined #git
17:42 sargas joined #git
17:42 Sasazuka joined #git
17:42 cdg joined #git
17:43 _ADN_ joined #git
17:44 jungsubk joined #git
17:46 LionsMane joined #git
17:47 irqq joined #git
17:49 chandu20 joined #git
17:50 ali1234 left #git
17:51 thebope_ joined #git
17:55 moneylotion joined #git
17:55 leeN joined #git
17:56 multi_io joined #git
17:56 moneylotion joined #git
17:56 nitric joined #git
17:57 chandu20 joined #git
17:57 SteffanW joined #git
17:58 durham joined #git
17:59 kulelu88 joined #git
17:59 morenoh149 joined #git
18:00 meloc joined #git
18:00 morenoh149 why is it if I checkout a linked file (ln) with git the local version is changed but the original does not?
18:00 meloc joined #git
18:00 circ-user-myOtS joined #git
18:01 jimi_ joined #git
18:01 chandu20 joined #git
18:03 aard_ joined #git
18:03 moneylotion left #git
18:06 fling how to split git diff to multiple commits?
18:06 bremner use git log -p?
18:06 Muzer joined #git
18:07 fling bremner: and then split the patch? :P
18:08 durham joined #git
18:08 _ikke_ what do you wnat to achieve?
18:08 [ADN] joined #git
18:08 fling Different people edited the sources without using git at all.
18:09 fling I need to merge all the changes together
18:09 fling I could put everything to the separate branches and to see the diff to the master
18:10 fling (I will use one of them as master)
18:10 _ikke_ right, clear so far
18:12 chandu20 joined #git
18:12 fling But I want to somehow split the changes to the separate commits and I don't really get how to do so. I don't have a fine plan.
18:12 _ikke_ fling: git add -p
18:12 fling 1. git branch … && rsync ; 2. ? 3. profit
18:12 _ikke_ but that doesn't work well with new files
18:13 _ikke_ you can use git add -N <new_file>
18:13 _ikke_ and then git add -p <new_file> and then use e to manually select what part to stage
18:13 fling ahh
18:14 Repox joined #git
18:14 fling So I will be able to selectively add things after I switch to another branch and rsync the files over?
18:14 fling Sounds good
18:14 roentgen joined #git
18:15 kpease joined #git
18:15 _ikke_ yes
18:16 sagittarian joined #git
18:17 King_Hual joined #git
18:17 fling Will people be able to easily rebase on top of the master if I will be merging the commits from their branches to the master selectively?
18:18 chandu20 joined #git
18:18 fling eg will rebase just skip the commit if it is already in the master?
18:19 _ikke_ fling: if by selectively merging you'll mean git cherry-pick, then yes
18:19 cdown joined #git
18:20 whomp hi, i want to merge master, but i want to also see all of the commits that are just from my branch, both the ones before and after the merge. how can i do this? currently i'm stuck with going through hundreds of master commits in between
18:20 saml joined #git
18:21 fling _ikke_: what coud I mean so the answer would be 'no'? Just in case…
18:21 saml i made a commit to a wrong branch. what do I do?
18:21 fling could
18:21 saml reset the branch and cherry pick the commit to the right one?
18:23 dreiss joined #git
18:23 Vampire0 saml, good plan I'd say :-)
18:23 snthsnth joined #git
18:26 saml git reset --soft HEAD^; git checkout -b feature; git commit
18:28 stamina joined #git
18:30 jost joined #git
18:31 netj joined #git
18:32 Zamyatin joined #git
18:36 ringzer0 joined #git
18:36 theskillwithin joined #git
18:37 ringzer0 how can I: git pull production master --prefer-all-of-my-local-files
18:37 duderonomy joined #git
18:37 _ikke_ Why do you want to merge if you don't care about the upstream changes?
18:37 ringzer0 basically, I know my working branch is ahead of everything else, but wpengine doesn't think so for whatever reason.
18:38 netcarver joined #git
18:38 ringzer0 _ikke_: in this environment, I am the only developer.
18:38 chandu20 joined #git
18:38 nwkj86 joined #git
18:39 ringzer0 so, how do I pull, ignoring upstream changes?
18:39 ringzer0 (so that I can push)
18:40 _ikke_ ringzer0: git pull -Xours
18:41 ringzer0 _ikke_: thanks, I will read about -X ... thank you.
18:43 buffal0 joined #git
18:43 ringzer0 seems like "fast forward" is what I need to understand very well.
18:43 jaafar joined #git
18:44 _ikke_ fast-forward just means moving refs
18:44 GodGinrai ringzer0: if you want to just push and ignore upstream, you could just push with the --force flag
18:45 lolmac joined #git
18:45 nikivi joined #git
18:47 Gsham joined #git
18:48 Sasazuka joined #git
18:49 whomp_ joined #git
18:51 rsukla joined #git
18:52 chrisshattuck joined #git
18:53 stamina joined #git
18:53 Qox joined #git
18:53 raijin joined #git
18:55 re1 joined #git
18:55 sagerdearia joined #git
18:56 navidr joined #git
18:57 thebope joined #git
18:58 vuoto joined #git
18:58 mingrammer joined #git
19:01 thebope_ joined #git
19:03 thebope__ joined #git
19:04 fuchstronaut joined #git
19:04 clemf joined #git
19:05 thebope joined #git
19:07 inflames joined #git
19:07 thebope joined #git
19:09 thebope joined #git
19:10 jungsubk joined #git
19:13 wogi joined #git
19:14 vuoto joined #git
19:16 kpease joined #git
19:16 marcoscleison joined #git
19:18 Balliad joined #git
19:19 johnmilton joined #git
19:21 thebope joined #git
19:25 Mobutils joined #git
19:25 Owner joined #git
19:26 Owner what is a bare repository?
19:26 canton7 !bare
19:26 gitinfo A bare repository is used to push/fetch(useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
19:27 fuchstronaut joined #git
19:27 thebope_ joined #git
19:28 fuchstronaut joined #git
19:28 fuchstronaut joined #git
19:28 BSab joined #git
19:30 thebope joined #git
19:30 BSaboia joined #git
19:31 godzirra joined #git
19:31 thebope_ joined #git
19:33 Owner looking to migrate from SVN to git
19:35 thiago that's good
19:36 nettoweb joined #git
19:36 eivarv joined #git
19:37 johnmilton joined #git
19:37 matsaman joined #git
19:38 overlord_tm joined #git
19:38 nettoweb joined #git
19:38 _ikke_ Try to look at git with fresh eyes
19:38 _ikke_ many things don't work like they do in SVN
19:39 jknetl joined #git
19:39 geekbauru joined #git
19:39 thebope joined #git
19:40 thebope joined #git
19:40 Owner ok
19:42 marcoscleison left #git
19:42 albel727 joined #git
19:43 nettoweb joined #git
19:44 cdown_ joined #git
19:45 loneim joined #git
19:47 eihabarabia joined #git
19:47 elastix joined #git
19:50 jost_ joined #git
19:51 loneim what are the differences between setting up git's autentication over https or ssh? I read that with ssh you don't have to type the password everytime. is it just that or should I know something else?
19:51 jaafar joined #git
19:52 Fuzzmz ssh also tends to be faster
19:53 mingrammer joined #git
19:55 _ikke_ ssh is easier to set-up
19:56 Hanumaan joined #git
19:57 loneim I guess I will go for ssh, thank you both :)
19:57 ^7heo ssh
19:57 ^7heo don't even ask
19:57 ^7heo just ssh
19:57 ^7heo best transport ever for auth
19:57 Hanumaan I have tried to follow the bfg(https://rtyley.github.io/bfg-repo-cleaner/) steps to clean the repository but getting this error: https://rtyley.github.io/bfg-repo-cleaner/ when I try to push .. what should be done?
19:57 ^7heo period
19:58 _ikke_ ^7heo: Do you verify ssh host keys?
19:58 Fuzzmz Hanumaan, update the link to the error message
19:59 ^7heo _ikke_: whenever possible.
20:00 Hanumaan Fuzzmz, oh sorry http://paste.ubuntu.com/23208584/
20:01 _ikke_ Hanumaan: !bare
20:01 gitinfo Hanumaan: A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
20:01 jeffl35 joined #git
20:02 Hanumaan _ikke_, but push is getting refused ..
20:02 jeffl35 joined #git
20:03 snthsnth joined #git
20:03 Fuzzmz Hanumaan, what's the receive.denyCurrentBranch setting in the remote repo?
20:05 _ikke_ Hanumaan: Is the remote repository a bare repository?
20:05 lizzie left #git
20:06 Fuzzmz yeah, can you try doing a git push remote-url?
20:06 oomemusss joined #git
20:06 Prisoner-2460_1 joined #git
20:07 nilg joined #git
20:09 HoierM joined #git
20:09 Repox joined #git
20:09 _ADN_ joined #git
20:10 indefiniteloop joined #git
20:11 ochorocho__ joined #git
20:14 LionsMane joined #git
20:15 dreiss joined #git
20:16 jimi_ joined #git
20:19 cdg joined #git
20:20 MattMaker joined #git
20:21 snthsnth joined #git
20:22 LeRieur joined #git
20:27 jaafar joined #git
20:27 andlabs is there a way I can detect --amend in my pre-commit hook?
20:29 phos1 joined #git
20:30 phos1 Any suggestions on a good tool I can install on my server to build a copy of my site if I make a new branch? I want to use it for development and doing some testing.
20:30 phos1 All PHP based websites, I have a VPS to dedicate to this task
20:34 Sasazuka__ joined #git
20:35 inflames joined #git
20:36 indefiniteloop joined #git
20:38 Balliad joined #git
20:38 bluj joined #git
20:40 btree joined #git
20:41 cagedwisdom joined #git
20:42 DinoBoy joined #git
20:42 btree left #git
20:45 kpease joined #git
20:48 poohbear82 joined #git
20:48 poohbear82 Hello everyone, is there a way to checkout a branch based on the commit number?
20:48 kulelu88 phos1: use some type of CI/CD
20:48 Repox joined #git
20:50 raspado joined #git
20:50 poohbear82 how can i merge with a detached HEAD?
20:51 ahmed_elgabri joined #git
20:51 groundnuty hey, I would know that I can use a pre-commit hook to perform some actions on files before things get commited
20:51 groundnuty however I only would like to act when *.mp3 files are commited
20:51 LeMike joined #git
20:51 groundnuty .gitattributes comes to mind
20:52 groundnuty but I'm not sure how to add a script that will get executed there
20:52 dilfridge joined #git
20:52 groundnuty also at the proper moment
20:54 raijin joined #git
20:54 eivarv joined #git
20:55 MattMaker joined #git
20:55 Seveas poohbear82: git checkout -b name-of-new-branch sha1-of-commit
20:55 Electrometro joined #git
20:57 Electrometro joined #git
20:58 dummy42 joined #git
20:59 Pyrogerg joined #git
21:02 godzirra left #git
21:02 Electrom_ joined #git
21:03 Hanumaan Fuzzmz, _ikke_ I have set that "receive.denyCurrentBranch setting" when git suggested before .. and the remote repository is a bare repository
21:12 tek81 joined #git
21:12 buffal0 joined #git
21:12 tek81 Is there any difference between merging against a branch, and merging against the latest commit in that branch?
21:13 qsx no
21:13 qsx a branch is just a reference to a commit
21:14 qsx so a branch and the latest commit in it is literally the same thing
21:14 tek81 That is what I thought, but the Git tool I'm has a different UI for each, thought I'd check.  Thanks!
21:17 MattMaker joined #git
21:18 dreiss joined #git
21:18 infra-red joined #git
21:18 Darren__ joined #git
21:20 theOneWho joined #git
21:22 emg joined #git
21:25 thiago tek81: the only difference is the default commit message that git merge comes up with
21:30 ramsub07 joined #git
21:34 Vampire0_ joined #git
21:34 Gsham joined #git
21:35 ahr3n joined #git
21:37 sangy joined #git
21:42 mingrammer joined #git
21:43 phos1 left #git
21:43 aidalgol joined #git
21:44 stomplee joined #git
21:45 ahmedelgabri joined #git
21:48 croberts joined #git
21:49 qws-user-1229 joined #git
21:50 Electrometro joined #git
21:50 jimi_ joined #git
21:51 anuxivm joined #git
21:51 eihabarabia joined #git
21:52 eihabarabia joined #git
21:53 mellernoia joined #git
21:57 kadoban joined #git
22:00 andlabs joined #git
22:02 moei joined #git
22:05 Electrometro joined #git
22:07 satbyy joined #git
22:07 satbyy joined #git
22:08 therealGent joined #git
22:09 romerocesar joined #git
22:11 jeffreylevesque joined #git
22:12 amdi_ joined #git
22:12 Mobutils joined #git
22:12 nikivi joined #git
22:12 ahmedelgabri joined #git
22:12 cyan__ joined #git
22:14 jaafar joined #git
22:17 whitby joined #git
22:17 Gsham joined #git
22:19 unreal joined #git
22:21 eivarv joined #git
22:21 kpease joined #git
22:22 Ravana joined #git
22:26 dreiss joined #git
22:27 madewokherd joined #git
22:27 GT4066 joined #git
22:28 chimeracoder joined #git
22:28 cjohnson I did a bad thing. I have been rebasing my feature branch against master and force-pushing occasionally to keep it up to date without polluting its commit history. this works well, the branch is still capable of merging to master without conflict despite 30 or so commits
22:28 cjohnson Now I merged my branch into qa so we can start testing on it, but then I did a rebase and force-push
22:28 cjohnson so now I expect if I try to merge into master again, it's going to blow up, right?
22:29 cjohnson since all those merged commits don't exist anymore
22:29 cjohnson sorry. rebase and force-push from the feature branch, after merging it into qa. and s/master/qa
22:30 cjohnson I want to merge feature back into qa now that I've made a couple new commits in feature, but I expect that'll blow up because I rebased feature
22:31 ash_workz joined #git
22:32 unreal joined #git
22:34 BSAlb joined #git
22:36 Vampire0 cjohnson, just reset your feature branch to before the bad rebase and cherry-pick the commits you did after that, then all should be fine again
22:37 Vampire0 cjohnson, you can easily find the right commit to reset to with man git reflog
22:37 gitinfo cjohnson: the git-reflog manpage is available at http://jk.gs/git-reflog.html
22:38 cjohnson I didn't have any bad rebase
22:38 reim joined #git
22:38 cjohnson I branched feature off master, I worked on feature and over time I continually rebased master onto feature to keep feature up to date. each time I would rebase I would have to force-push since I was rewriting history
22:38 cjohnson this didn't matter when it was only in feature branch since nobody else working on it
22:39 cjohnson but now that I merged it into qa, qa has a list full of commits that my most recent rebase just removed from feature
22:39 a3Dman joined #git
22:39 cjohnson but you think I can just start cherry-picking my commits into qa rather than merging that branch to avoid having to muck up qa?
22:39 Vampire0 yeah, your "most recent rebase" is what I called "bad rebase"
22:40 Vampire0 No, I meant you revert the rebase
22:40 cjohnson gotchya
22:40 cjohnson revert rebase? I didn't think you could do that
22:40 Vampire0 but yes, you can of course also cherry-pick the new commits to QA instead
22:40 cjohnson a rebase doesn't create a commit to revert
22:40 cjohnson it rewrites history right?
22:40 Vampire0 cjohnson, not in the sense of `git revert`  but in the sense of really making it not having happened
22:41 Vampire0 cjohnson, well, it does not rewrite history, it creates new commits with a different history, but the old commits with the old history are still there
22:41 Vampire0 You can simply reset to them
22:41 cjohnson oh right I see
22:41 Vampire0 They are still referenced in the man git reflog of the branch
22:41 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
22:41 cjohnson that would require force pushing qa though right
22:42 Vampire0 Why qa?
22:42 cjohnson (the branch that I merged feature into)
22:42 danslo_ joined #git
22:42 Vampire0 What I suggested was to revert the rebase in feature, not the merge in qa
22:43 cjohnson oh, only my most recent rebase. so then is there some way I can keep my branch up to date from master now?
22:43 cjohnson or do I just have to stop rebasing until I'm done merging
22:43 cjohnson that's why I was rebasing, so I can create a pull request for my big feature that doesn't contain a bunch of commits from other branches and stuff
22:43 Vampire0 To keep your branch up-to date with master, merge master into feature
22:43 cjohnson when I was using merges PRs would include tons of changes I didn't make
22:44 Vampire0 It basically has the same effect than a rebase, just that you get a different history with branches and merge-commits while rebase helps keeping a linear history
22:44 e14 joined #git
22:45 cjohnson right it's the linear history I'm after. Makes code reviews hard to do when I can't tell what code is actually part of hte branch or not
22:45 cjohnson anyway sounds like cherry picking until I'm done on this branch is probably my answer
22:45 Vampire0 ok
22:45 cjohnson no force pushing and I can retain linear history and keep rebasing
22:45 cjohnson thanks
22:46 gitinfo cjohnson: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
22:49 romerocesar_ joined #git
22:50 jottr joined #git
22:50 jaafar joined #git
22:52 e14 joined #git
22:53 GodGinrai joined #git
22:56 blahdodo joined #git
22:59 nikivi joined #git
23:00 diegoaguilar joined #git
23:00 diegoaguilar How can I do something like git add --patch but over a new file ( which is unstaged)
23:01 rsukla joined #git
23:02 kadoban diegoaguilar: Do 'git add -N thefile' first possibly?
23:03 ochorocho__ joined #git
23:06 ketas joined #git
23:06 diegoaguilar thanks kadoban
23:06 diegoaguilar how can I set a custom editor on the go?
23:06 diegoaguilar for a single git command
23:07 kadoban EDITOR=whatever git blahblah probably works
23:07 mablae__ joined #git
23:08 Lor_ joined #git
23:10 fahadash joined #git
23:12 BSab joined #git
23:15 diogenese joined #git
23:16 BSaboia joined #git
23:17 r4z left #git
23:17 danimal2 joined #git
23:18 clemf joined #git
23:19 dan2k3k4 joined #git
23:21 whomp joined #git
23:22 jason237 joined #git
23:23 ffabi joined #git
23:25 snthsnth joined #git
23:25 pothepanda joined #git
23:30 mingrammer joined #git
23:35 vigilvindex joined #git
23:35 sparr joined #git
23:35 azerus joined #git
23:38 e14 joined #git
23:38 Topic for #git is now Welcome to #git, the place for git help and aquarium keeping | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | Keep good care of your git-shell and your inner snail will thank you
23:38 Gsham joined #git
23:39 EvilPeng1 joined #git
23:39 raijin joined #git
23:40 whomp joined #git
23:41 Gr33nW0lf joined #git
23:41 SebastianFlyte joined #git
23:41 jeffreylevesque joined #git
23:42 dsdeiz joined #git
23:43 danslo joined #git
23:43 r3muxd joined #git
23:44 BackEndCoder joined #git
23:44 e14 joined #git
23:45 jaafar joined #git
23:45 theOneWho joined #git
23:46 kejoma joined #git
23:46 buffal0 joined #git
23:50 romerocesar joined #git
23:51 DolphinDream joined #git
23:52 anuxivm joined #git
23:53 the_cybersphinx joined #git
23:57 raijin joined #git
23:58 e14 joined #git
23:58 anuxivm joined #git

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