Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-15

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

All times shown according to UTC.

Time Nick Message
00:00 danslo joined #git
00:02 chartractegg left #git
00:03 durham_ joined #git
00:05 vassagus joined #git
00:06 prawnzy joined #git
00:07 crayon joined #git
00:07 chartrac_ joined #git
00:08 realz joined #git
00:09 Vaelatern joined #git
00:11 netj joined #git
00:11 Mixologic joined #git
00:11 energizer joined #git
00:11 energizer In git annex, I just cloned a repo. The files aren't symlinks, but when I look inside them, they're just SHA numbers, not the real content of the files. How can I get the real content?
00:12 jerrcs joined #git
00:13 BSab joined #git
00:14 milki theres probably a git anenx command you need to run
00:14 eycsigfy joined #git
00:15 energizer milki: i dont see anything like that in man git-annex
00:15 tjone270 joined #git
00:15 yoh joined #git
00:15 milki !annex
00:15 gitinfo 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
00:16 mingrammer joined #git
00:16 milki https://git-annex.branchable.com/walkthrough/#index5h2
00:16 milki try that
00:17 dsdeiz joined #git
00:17 energizer didnt work
00:18 energizer didnt do anything as far as i can tell
00:18 milki maybe they really are just files with shas in them
00:18 energizer they shouldnt be
00:18 energizer like
00:19 mehola joined #git
00:19 energizer i have the actual files on my local computer. sync --content them to git repo on second, ssh to third, git annex sync --content, and somehow it thinks the content is the hashes
00:20 energizer it thinks it did a good job getting the files because there's stuff in them, but its the wrong stuff
00:21 Anthaas joined #git
00:23 milki sorry, im not familiar with annex workflow so i cant say whats missing
00:24 espindola joined #git
00:26 ochorocho__ joined #git
00:26 zivester joined #git
00:27 therealGent joined #git
00:28 tesuji joined #git
00:31 SwiftMatt joined #git
00:34 rchavik joined #git
00:36 anton-io joined #git
00:37 anton-io Hi! may I ask a newb question?
00:37 milki !ask
00:37 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
00:37 anton-io I started a repository from an open source project by copying it (didn't clone it)
00:38 anton-io And I have been making changes to the code for a while
00:38 anton-io Now I want to merge changes from the official repository and what I did is add it as a new remote
00:39 anton-io And merged from the version I took the copy of the code from
00:40 anton-io So far so good, but when I want to merge from another commit it detects changes as conflicts
00:40 brandonw joined #git
00:40 raijin joined #git
00:40 anton-io So I am sure I am doing it wrong... what's the procedure for that case? tl;dr started own repo from copy of code (not clone), now want to reintegrate changes from the original repo
00:43 BSAlb joined #git
00:43 milki have you been committing your changes locally?
00:43 rominronin joined #git
00:44 anton-io Yes, and to another remote
00:44 milki you should start with the original repo and move your commits to a branch of that repo
00:45 anton-io So I clone the original
00:45 anton-io and then add my own remote?
00:45 milki yeah, you need some sort of common history to do the merging
00:45 milki yeah that would work
00:45 milki then you can try rebasing your branches
00:46 dsdeiz joined #git
00:46 anton-io Ok, I'll try that
00:46 anton-io Thanks!
00:46 fguillot joined #git
00:47 al-damiri joined #git
00:49 GT4066 joined #git
00:50 z8z joined #git
00:52 romerocesar joined #git
00:52 prawnzy joined #git
00:54 bob14 joined #git
00:57 johnmilton joined #git
00:59 bob14 joined #git
01:00 arescorpio joined #git
01:02 danslo joined #git
01:04 tesuji_ joined #git
01:05 vassagus joined #git
01:05 fahadash joined #git
01:05 strugee joined #git
01:07 theskillwithin joined #git
01:10 mingrammer joined #git
01:11 Ryanar joined #git
01:12 clemf joined #git
01:12 ResidentBiscuit joined #git
01:12 pks joined #git
01:13 newbiee left #git
01:13 vassagus joined #git
01:13 dsdeiz_ joined #git
01:21 e14 joined #git
01:25 finalbeta joined #git
01:25 cagedwisdom joined #git
01:27 ochorocho__ joined #git
01:27 |ifei5g00d joined #git
01:28 HoierM joined #git
01:31 actinide joined #git
01:34 cisco87 joined #git
01:35 cisco87 joined #git
01:36 finalbeta1 joined #git
01:36 d^sh joined #git
01:36 cisco87 joined #git
01:37 blackwind_123 joined #git
01:38 cisco87 joined #git
01:38 Vampire0 joined #git
01:42 HoierM joined #git
01:46 BackEndCoder joined #git
01:46 finalbeta joined #git
01:46 rominronin joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and all your base | 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-prune: not as tasty as git-cherry, but much better for you
01:52 t-mart joined #git
01:58 e14 joined #git
01:58 romerocesar joined #git
02:00 Orion3k joined #git
02:06 fstd_ joined #git
02:07 lachm joined #git
02:07 rj1 joined #git
02:13 rd4455 joined #git
02:15 dunpeal joined #git
02:16 rafalcpp joined #git
02:17 e14 joined #git
02:17 duderonomy joined #git
02:20 mehola joined #git
02:20 krs93 joined #git
02:23 fguillot joined #git
02:24 rafalcpp joined #git
02:24 Goplat joined #git
02:25 ojdo joined #git
02:26 lagothrix joined #git
02:28 rgrinberg joined #git
02:31 rewt joined #git
02:32 tctara joined #git
02:33 greendo joined #git
02:33 mehola joined #git
02:36 mizu_no_oto joined #git
02:40 e14 joined #git
02:45 rominronin joined #git
02:48 mizu_no_oto joined #git
02:48 ayjay_t joined #git
02:49 finalbeta1 joined #git
02:50 harwood joined #git
02:55 Dougie187 joined #git
02:56 thiago joined #git
02:56 mizu_no_oto joined #git
02:58 ochorocho__ joined #git
02:59 mingrammer joined #git
03:02 hexagoxel joined #git
03:03 dodobrain joined #git
03:04 dunpeal joined #git
03:04 aavrug joined #git
03:06 aavrug joined #git
03:06 chachasmooth joined #git
03:07 YourTheBombNow23 joined #git
03:09 snthsnth joined #git
03:12 GandalfTheWizard joined #git
03:14 e14 joined #git
03:14 Vortex35 joined #git
03:16 nevodka joined #git
03:20 prawnzy joined #git
03:21 mizu_no_oto joined #git
03:22 mycelium joined #git
03:26 pijiu joined #git
03:26 dreiss joined #git
03:27 finalbeta joined #git
03:30 raijin joined #git
03:30 raspado joined #git
03:32 pioiytr joined #git
03:35 safe joined #git
03:36 jon-mac joined #git
03:37 snthsnth joined #git
03:38 fakenerd joined #git
03:39 mmlb joined #git
03:45 romerocesar joined #git
03:47 rominronin joined #git
03:49 Dougie187 left #git
03:50 finalbeta joined #git
03:52 dreiss joined #git
03:54 krs93 joined #git
03:56 raijin joined #git
03:57 dodobrain joined #git
03:59 a_thakur joined #git
03:59 robotroll joined #git
04:02 kyan joined #git
04:03 madewokherd joined #git
04:06 finalbeta1 joined #git
04:07 dodobrain joined #git
04:10 vrishab joined #git
04:11 PioneerAxon joined #git
04:12 JanC joined #git
04:14 tgunr joined #git
04:16 fakenerd joined #git
04:20 constant joined #git
04:21 Woody_ joined #git
04:21 pioiytr_ joined #git
04:27 daey_ joined #git
04:29 aidalgol is --first-parent redundant in `git log --first-parent --no-merges` ?
04:32 nonconvergent joined #git
04:33 thiago no
04:33 nilg joined #git
04:36 lindenle joined #git
04:36 ojacobson That will include only commits reachable by first parent traversal, which are not merges
04:36 ojacobson leaving out --first-parent would also include non-merge commits reachable from other parents of merges
04:37 drizztbsd joined #git
04:40 romerocesar joined #git
04:42 Woody_ joined #git
04:45 narkewoody joined #git
04:45 Ryanar joined #git
04:45 SwiftMatt joined #git
04:47 mingrammer joined #git
04:47 aidalgol OK, --first-parent --no-merges is definitely what I want, except that I want git log to also stop when it hits commit where the topic branch came off master.
04:48 lindenle joined #git
04:48 rominronin joined #git
04:48 nonconvergent joined #git
04:48 aidalgol So in the example http://stackoverflow.com/a/10248421 I would want to only see X Y Z, but not B and A.
04:48 narkewoody joined #git
04:49 snthsnth joined #git
04:49 thiago aidalgol: topicbranch..
04:50 thiago including the two dots after it
04:51 aidalgol thiago: Now git log outputs nothing.
04:51 thiago sorry, master..
04:51 subhojit777 joined #git
04:52 thiago I misunderstood what you meant
04:54 clr aidalgol: git log E^1..E^2
04:54 overlord_tm joined #git
04:54 eshlox joined #git
04:55 ShapeShifter499 joined #git
04:56 clr aidalgol: that shows everything merged into master by merge commit E (using the stackoverflow example) that was not already in master
04:58 greendo joined #git
04:58 romerocesar_ joined #git
04:59 ochorocho__ joined #git
04:59 Cabanossi joined #git
04:59 gfixler joined #git
05:00 elsevero joined #git
05:00 dec0n joined #git
05:00 aidalgol Sorry, I should clarify that I am interested in the *branch*'s history only, not master.
05:00 kyan joined #git
05:00 aidalgol it's end of the day here, though, and my brain is tired, so I'll tackle this later. :P
05:01 clr aidalgol: that command should give you that
05:02 aidalgol clr: But in my case, the branch has not yet been merged back to master.
05:02 aidalgol sorry, I should have stated *that* earlier. >_<
05:03 clr aidalgol: oh, then the master..topicbranch should have worked
05:04 aidalgol Ah yes, master..topicbranch works.  Just master.. or just topicbranch.. does not.
05:04 aidalgol thanks!
05:05 thiago master.. is the same as master..topicbranch if HEAD is topicbranch
05:06 QwertyDragon joined #git
05:06 dtux joined #git
05:06 aidalgol oh, so it is.  I must not have tried that, because I thought it gave nothing.
05:09 finalbeta1 joined #git
05:12 lindenle joined #git
05:17 ome joined #git
05:20 mehola joined #git
05:20 romerocesar joined #git
05:21 Mobutils joined #git
05:22 Akimb joined #git
05:23 finalbeta1 joined #git
05:24 romerocesar_ joined #git
05:26 circ-user-KVqjt joined #git
05:28 bocaneri joined #git
05:28 parsnip left #git
05:31 ayjay_t joined #git
05:31 bobtherealbob joined #git
05:32 afuentes joined #git
05:33 lindenle joined #git
05:36 ShapeShifter499 joined #git
05:39 prawnzy joined #git
05:41 mingrammer joined #git
05:42 drizztbsd joined #git
05:43 romerocesar joined #git
05:43 dreiss joined #git
05:47 _ng joined #git
05:48 romerocesar_ joined #git
05:49 rominronin joined #git
05:49 ferr joined #git
05:52 Macaveli joined #git
05:53 snthsnth joined #git
05:55 psprint_ joined #git
05:55 raijin joined #git
05:56 dsantiago joined #git
05:57 zeroed joined #git
05:57 zeroed joined #git
05:59 dweelie joined #git
06:00 drizztbsd joined #git
06:03 ShapeShifter499 joined #git
06:03 Neico joined #git
06:04 ImNotQ009 joined #git
06:04 ImNotQ009 Hello. How do I revert a pushed commit without losing its changes?
06:04 BlessJah joined #git
06:05 ImNotQ009 Revert /locally/
06:05 ImNotQ009 The commit shall stay on the remote repo
06:06 lb1c joined #git
06:08 mohabaks joined #git
06:08 i7c ImNotQ009, so you just want to undo it temporarily?
06:08 ImNotQ009 Yes
06:09 ImNotQ009 Basically I want to split that commit. I want to modify the old one to have only have the changes and then push a new one
06:09 chele joined #git
06:09 romerocesar joined #git
06:09 i7c Ah. Is it the most recent commit?
06:10 j416 ImNotQ009: you cannot modify a commit and push a new one, while keeping it on the remote
06:10 eoli4n joined #git
06:10 i7c And that.
06:10 eoli4n hi
06:10 i7c !rewrite
06:10 gitinfo 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
06:10 lordjancso joined #git
06:10 SenpaiSilver joined #git
06:10 eoli4n i suppressed a file from master branch, so i git log, and then git checkout latest commit, but files still not here
06:10 eoli4n i didnt push since the file is gone
06:11 eoli4n how to recover this file please ?
06:11 ImNotQ009_ joined #git
06:11 i7c What does "supress a file from a branch" mean exactly?
06:12 eoli4n hm
06:12 eoli4n rm file ?
06:12 eoli4n and then not push
06:12 j416 eoli4n: what does git status say?
06:12 j416 it should give you some hints.
06:12 ImNotQ009_ i7c: not anymore. But I can cherry-pick it from remote into a new branch
06:12 eoli4n #git deleted:    push-pull.yml
06:12 i7c If you haven't committed the deletion yet, git status tells you how to get it back.
06:13 i7c git checkout HEAD -- that/file
06:13 eoli4n yeah, thx i7c
06:13 newbiee joined #git
06:14 overlord_tm joined #git
06:15 cYmen joined #git
06:16 ImNotQ009_ So yeah. I'll cherry-pick that commit into a new local branch. And from there I want to "revert" said commit in such a way that would let me keep the changes
06:16 ImNotQ009_ And them commit them again
06:17 i7c git reset --soft HEAD~
06:17 niax joined #git
06:17 i7c then you can stage/unstage as you please
06:17 ImNotQ009_ Ah, great. Thanks
06:17 i7c Note that after that, first everything will be staged
06:17 dan2k3k4 joined #git
06:17 i7c But you can just unstage everything and then start adding again
06:17 rom1504 joined #git
06:17 ImNotQ009_ Yup
06:20 rominronin joined #git
06:21 finalbeta1 joined #git
06:22 ochorocho__ joined #git
06:24 JeroenT joined #git
06:28 durham joined #git
06:28 romerocesar joined #git
06:29 durham joined #git
06:30 jceb joined #git
06:31 ProbabilityMoon joined #git
06:31 troyt joined #git
06:32 ShapeShifter499 joined #git
06:33 ShapeShifter499 joined #git
06:33 cyan__ joined #git
06:34 dtux left #git
06:35 tabrez joined #git
06:36 dreiss joined #git
06:37 JeroenT joined #git
06:38 prawnzy joined #git
06:39 elsevero joined #git
06:41 Sceorem joined #git
06:42 ap0c joined #git
06:48 lb1c !just_ask
06:48 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
06:49 jknetl joined #git
06:50 romerocesar joined #git
06:51 shams joined #git
06:53 i7c (probably)
06:53 JeroenT joined #git
06:53 i7c (eventually)
06:53 Seveas (call me maybe)
06:53 eduardas_m joined #git
06:54 lahwran joined #git
06:55 laumann joined #git
06:55 SwiftMatt joined #git
06:57 mangolisk joined #git
06:59 elect joined #git
06:59 JeroenT joined #git
06:59 nonconvergent joined #git
07:00 ProbabilityMoon joined #git
07:01 harish joined #git
07:01 danslo joined #git
07:02 submitnine joined #git
07:03 MattMaker joined #git
07:06 diogenese joined #git
07:06 Raansu joined #git
07:08 t0by joined #git
07:08 t0by joined #git
07:09 dpower joined #git
07:09 moop joined #git
07:09 iota_pi joined #git
07:09 MattMake_ joined #git
07:10 aidalgol joined #git
07:10 romerocesar joined #git
07:12 finalbeta1 joined #git
07:14 MattMaker joined #git
07:16 a_thakur joined #git
07:17 TomyWork joined #git
07:19 MattMake_ joined #git
07:21 lb1c (and this is crazy)
07:21 Alienpruts joined #git
07:23 ShapeShifter499 joined #git
07:24 MattMaker joined #git
07:27 JeroenT joined #git
07:29 romerocesar joined #git
07:29 satya4ever joined #git
07:29 mingrammer joined #git
07:29 MattMaker joined #git
07:31 jokajak joined #git
07:32 encod3 joined #git
07:32 * osse waits for Seveas' number
07:33 ProbabilityMoon joined #git
07:35 MattMaker joined #git
07:35 lindenle joined #git
07:37 ahmedelgabri joined #git
07:37 Balliad joined #git
07:38 stuh84 joined #git
07:39 phanimahesh joined #git
07:40 stuh84 joined #git
07:40 flaviodesousa joined #git
07:42 elect joined #git
07:44 MattMaker joined #git
07:44 prawnzy joined #git
07:47 romerocesar joined #git
07:49 thierryp joined #git
07:52 jceb joined #git
07:53 osse Sometimes I'm so confident in my interactive rebases I do  GIT_EDITOR=cat git rebase -i
07:53 MattMaker joined #git
07:56 _ikke_ osse: Do you use fixup commits? Because otherwise that wouldn't be different from a normal rebase
07:56 romerocesar_ joined #git
07:56 osse _ikke_: fixup all day every day
07:57 _ikke_ Rite
07:57 _ikke_ Very nice feature
07:57 osse now I even added "-f" to my rewrite alias that does the GIT_EDITOR thing \o/
07:57 _ikke_ cool
07:57 mjt left #git
07:58 osse lias.rewrite ![ "$1" = -f ] && { export GIT_EDITOR=cat; shift; }; git rebase -i $(git merge-base HEAD ${1:-"@{u}"}) && :
07:58 osse But it's approaching ALIAS_LEN_MAX, so it'll go in a script soon
07:59 _ikke_ How long is that?
07:59 _ikke_ ALIAS_LEN_MAX
07:59 dan2k3k4 joined #git
07:59 _ikke_ why do you use merge base btw?
07:59 osse Depends on my mood
07:59 osse The limit is only in my head
07:59 _ikke_ ah ok\
08:00 osse I use merge-base because I do not want to actually do a rebase. I want to do  git rebase -i HEAD~n where n is some suitable number. rebasing on the merge-base is often Good Enough (tm)
08:00 osse And git rebase is clever enough to skip directly ahead if the first few commits are only picks
08:01 qws-user-1228 joined #git
08:01 _ikke_ Ah right, makes sense
08:02 cilkay joined #git
08:02 Vampire0 joined #git
08:03 armyriad joined #git
08:05 mikecmpbll joined #git
08:06 finalbeta1 joined #git
08:06 du joined #git
08:06 Dazzyp joined #git
08:07 johnny56_ joined #git
08:07 kurkale6ka joined #git
08:07 djb-irc joined #git
08:07 osse But isn't there some way to use .. or ... to do this directly? Seems weird to me to give a range to git-rebase, but we've talked about it beofre
08:08 Lomex joined #git
08:08 MattMaker joined #git
08:08 d0nn1e joined #git
08:11 Homerone joined #git
08:12 _ikke_ git diff also treats ranges differently
08:12 lss8 joined #git
08:13 _ikke_ So rebase a...b would make sense to me in that case
08:15 romerocesar joined #git
08:15 bongjovi joined #git
08:16 osse so what does it mean? git rebase $(git merge-base a b) b ?
08:16 _ikke_ git rebase $(git merge-base a b)
08:17 _ikke_ So in that way, it would not make sense
08:17 _ikke_ but with -i it does
08:17 nilsi joined #git
08:17 MattMaker joined #git
08:22 itosh joined #git
08:23 MattMaker joined #git
08:23 ochorocho__ joined #git
08:23 cdown joined #git
08:24 heroux_ joined #git
08:24 mingrammer joined #git
08:25 clmsy joined #git
08:27 rory_ left #git
08:27 rory joined #git
08:27 rory Hi. How can I squash all commits before a certain one? Preferably a nicer way than interactive rebase, since there's 100k+ commits
08:28 _ikke_ So you want truncate history?
08:28 rory hard forked a project and don't care about its commit history. so yes I guess.
08:28 _ikke_ git replace + git filter-branch then
08:28 _ikke_ git replace --graft
08:29 selckin git reset --hard <sha>, copy backup of workdir back in, git commit
08:29 selckin easy
08:29 BackEndCoder joined #git
08:29 rory that would work but ugly
08:30 rory also using rebase -i would work, but slow and ugly
08:30 _ikke_ selckin: that's the opposite right?
08:30 selckin same effect and deosn't require reading 6 manuals for the magic incantations
08:30 _ikke_ Ignore everything *after* the commit
08:30 selckin _ikke_: no? its all in the workdir
08:30 _ikke_ I mean, ignore every commit
08:30 selckin lemme read q again
08:30 _ikke_ That does not truncate history before a specific commit
08:31 selckin you are right, i misread the question, sorry
08:31 osse TIL git replace can also create commits.
08:31 osse _ikke_: i thought you had to create the new commit by hand, then graft it in place
08:32 _ikke_ You can just replace the parents of a commit
08:32 osse seems like all rory needs to do is ''git replace --graft a_certain_one''
08:32 _ikke_ osse: exactly
08:33 MattMaker joined #git
08:34 _ikke_ this does require that all there are no other branches to older history
08:35 irco joined #git
08:35 usm4n joined #git
08:36 grift joined #git
08:36 thadtheman joined #git
08:37 JeroenT joined #git
08:37 thadtheman How can I generate the hashes of every commit of every branch of a git repo?
08:37 osse *generate*? Do you mean list them?
08:37 osse git log --format='%H' --all
08:37 thadtheman Oops,
08:37 grawity git rev-list --all
08:38 romerocesar joined #git
08:38 _ikke_ ^
08:38 phanimahesh joined #git
08:38 thadtheman osse, sorry I meant "generate of list of the hashes"
08:39 usm4n joined #git
08:39 selckin isn't that what his command does?
08:40 osse Go with rev-list --all.  It's more suitable
08:40 romerocesar joined #git
08:40 ANTIsurveillance joined #git
08:40 ap0c joined #git
08:41 boogibugs joined #git
08:42 Lomex joined #git
08:43 leftriver05 joined #git
08:43 thadtheman Oops, Thanks all.
08:43 mikecmpbll joined #git
08:44 osse I actually expected a bigger difference in speed between log and rev-list... Not that I'm disappointed
08:44 grawity well, they both have to read the commit object (which is the slowest part)
08:45 grawity and really not much else besides pretty printing
08:45 stamina joined #git
08:45 selckin ~10ms difference for me
08:45 osse Yeah... log does stuff like parsing --format and is able to do diffing. but I suppose that overhead is constant.
08:45 osse and there's no diff here
08:45 selckin 10%
08:45 shams joined #git
08:46 grawity parsing --format is next to nothing
08:46 grawity and diffs aren't requested in this case
08:46 johnny56_ joined #git
08:47 usm4n joined #git
08:47 ahmedelgabri joined #git
08:47 cdown_ joined #git
08:48 usm4n joined #git
08:48 BadSnappa joined #git
08:49 spriz joined #git
08:50 Lomex joined #git
08:50 leftriver45 joined #git
08:50 osse In a repo with only one branch and only one commit log is 200% slower!!!!1
08:51 usm4n joined #git
08:51 osse 0.003 vs 0.009 seconds
08:51 yuhlw_ joined #git
08:51 jceb joined #git
08:51 MattMaker joined #git
08:52 _ikke_ wat?
08:52 _ikke_ UNACCEPTABLE!
08:52 selckin never ignore the constant factor with small values of n
08:54 tango_ osse: issue a bug report
08:55 osse fuckit, I'm requesting a CVE
08:58 usm4n joined #git
08:58 PioneerAxon joined #git
09:00 romerocesar joined #git
09:01 thadtheman CVE?
09:02 MattMaker joined #git
09:02 _ikke_ https://cve.mitre.org/
09:02 _ikke_ Database of public vulnerabilities
09:04 Lomex joined #git
09:05 usm4n_ joined #git
09:06 elect joined #git
09:09 wrouesnel joined #git
09:09 leeN joined #git
09:11 drizztbsd joined #git
09:11 a_thakur joined #git
09:12 MattMaker joined #git
09:13 isbotnetcool joined #git
09:14 fracting joined #git
09:16 notebox joined #git
09:17 a_thakur joined #git
09:18 irqq joined #git
09:25 romerocesar joined #git
09:25 MattMaker joined #git
09:26 nonconvergent joined #git
09:28 JeroenT joined #git
09:29 GandalfTheWizard joined #git
09:31 MattMaker joined #git
09:36 as_g5pw joined #git
09:36 Limes left #git
09:36 Limes joined #git
09:37 ap0c joined #git
09:38 baxx joined #git
09:41 GandalfTheWizard joined #git
09:42 GandalfTheWizard joined #git
09:42 GandalfTheWizard joined #git
09:45 goxul joined #git
09:45 MattMaker joined #git
09:45 romerocesar joined #git
09:46 a3pq51 joined #git
09:47 goxul gitinfo
09:48 blackwind_123 joined #git
09:48 Akimb joined #git
09:48 the_last joined #git
09:49 _ikke_ !bot
09:49 gitinfo [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans.  Please see http://jk.gs/git/bot for more information about how to (ab)use me.
09:49 the_last hi, i'm releasing a new version of software on github (so its tagged as a new version), just wondering if i can rebase into master instead of merge, or is there a reason this might conflict badly with previous tags?
09:50 _ikke_ depends on what commits you are rebasing
09:50 jonno11 joined #git
09:50 nilg joined #git
09:51 MattMaker joined #git
09:51 heroux joined #git
09:51 jianyang joined #git
09:52 mischat joined #git
09:54 jhgundersen joined #git
09:55 dimi1947 joined #git
09:56 chrisml with master, develop and feature branches, when ready to merge, do i merge the feature into develop then develop into master?
09:57 chrisml or just feature into master?
09:58 _ikke_ That's entirely up to you and is basically part of the workflow you choose
09:58 _ikke_ !workflow
09:58 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
09:58 chrisml with git-flow what would it be?
09:58 * chrisml reads
09:58 _ikke_ in git-flow you would merge them in develop first
09:59 chrisml ta
09:59 _ikke_ then from develop you create a release branch, which would get merged into master
10:02 Homerone joined #git
10:08 AfroThundr joined #git
10:09 ljaulin joined #git
10:09 romerocesar_ joined #git
10:09 ljaulin left #git
10:10 stuh84 joined #git
10:14 drizztbsd joined #git
10:15 Emperor_Earth joined #git
10:16 LiENUS joined #git
10:17 ShekharReddy joined #git
10:18 budre joined #git
10:19 prawnzy joined #git
10:20 MattMaker joined #git
10:20 dan2k3k4 joined #git
10:21 CussBot joined #git
10:23 ochorocho__ joined #git
10:24 bumbala joined #git
10:25 fees joined #git
10:30 romerocesar joined #git
10:30 mingrammer joined #git
10:33 MattMaker joined #git
10:37 gechr joined #git
10:38 lindenle joined #git
10:39 MattMaker joined #git
10:43 somaReverse joined #git
10:43 sin3t joined #git
10:44 Asenar joined #git
10:44 rnsanchez joined #git
10:44 mycyber joined #git
10:47 a_thakur joined #git
10:48 King_Hual joined #git
10:49 JeroenT joined #git
10:49 MattMaker joined #git
10:50 circ-user-E1qCe joined #git
10:50 finalbeta joined #git
10:51 romerocesar joined #git
10:52 mehola joined #git
10:53 tlaxkit joined #git
10:54 mikecmpbll joined #git
10:55 syg_ joined #git
10:56 romerocesar joined #git
10:57 yqt joined #git
10:57 abhinav joined #git
10:58 abhinav how can i discard unwanted changes in git add -p. pressing n do not discard it
10:58 osse git checkout -p
10:58 brn joined #git
11:02 espindola joined #git
11:02 tlaxkit joined #git
11:02 abhinav osse: its opposite of add i think. is that right.
11:03 dodobrain joined #git
11:04 osse kind of
11:04 osse you want to undo changes to files, yes?
11:04 abhinav yeah
11:04 osse then use checkout -p
11:04 osse answer y to things you want to discard
11:05 m0viefreak joined #git
11:05 selckin you either add all the things you want to keep and discard the rest (add -p; git checkout -- .), or discard the parts you want to remove (git checkout -p )
11:07 mkoskar joined #git
11:07 MattMaker joined #git
11:10 mizu_no_oto joined #git
11:14 romerocesar joined #git
11:14 shams joined #git
11:14 dsdeiz joined #git
11:15 GavinMagnus joined #git
11:17 a3Dman_ joined #git
11:17 shams joined #git
11:18 MattMaker joined #git
11:18 usm4n joined #git
11:19 eihabarabia joined #git
11:20 shams joined #git
11:21 CheckDavid joined #git
11:23 heroux joined #git
11:25 nilez joined #git
11:26 narendraj9 joined #git
11:27 tom[] joined #git
11:28 DolpheenDream joined #git
11:28 chachasmooth joined #git
11:30 romerocesar joined #git
11:30 nilez joined #git
11:31 choki joined #git
11:33 vlt joined #git
11:34 nilez joined #git
11:36 MattMaker joined #git
11:37 shams joined #git
11:37 ayjay_t joined #git
11:39 notebox joined #git
11:40 ochorocho__ joined #git
11:41 espindola joined #git
11:42 Darcidride joined #git
11:43 nilez joined #git
11:43 t0by joined #git
11:46 MattMaker joined #git
11:46 nilez joined #git
11:46 raijin joined #git
11:47 rffleaie joined #git
11:49 narendraj9 joined #git
11:50 vuoto joined #git
11:50 romerocesar joined #git
11:50 Sceorem joined #git
11:50 nilez joined #git
11:51 MattMaker joined #git
11:52 Lomex joined #git
11:53 nilez joined #git
11:54 abhinav can anyone tell me real use of PowerBanks for mobile phones and tablets? why not jsut plug them into AC wall and charge it?
11:54 abhinav wrong channel.
11:54 ahmed_elgabri joined #git
11:54 selckin kinda hard to plug into ac when you're walking
11:54 matthiaskrgr it's for when there is no wall around
11:55 cdown joined #git
11:55 selckin abhinav: why have a battery in your phone? just keep it plugged in
11:55 liquidjamm joined #git
11:55 abhinav matthiaskrgr: when does that happen? when we finish walking we reach home / office / something where we can have AC wall??
11:57 MattMaker joined #git
11:57 a_thakur joined #git
11:57 _ikke_ When you need to use the mobile / tablet when there is no AC aruond and battery is running out
11:57 abhinav ok...
11:58 rjack2 joined #git
11:58 selckin why put more then 2l of feul in the car, just drive from gasstation to gasstation
11:59 abhinav thets answer to your own quetion of why have batteri inside mobile phone! :-p
11:59 qt-x joined #git
11:59 BackEndCoder joined #git
11:59 selckin woosh
11:59 _ikke_ Because having an external battery attached all the time is impractical
12:00 markmarkmark imagine that you get up at 3am to get to the airport for a 6am flight on a regional jet with no power outlet. that's a 4 hour flight that gets you to your connecting airport with 10 minutes before your next flight boards onto another regional outletless plane for your next 2.5 hour flight.
12:00 markmarkmark then you have to drive ~1.5 hours to your hotel
12:01 markmarkmark that's like 13 hours of probably using your phone as entertainment no the flights, and now you're using it as a gps to navigate in this place you've never been
12:01 t0by joined #git
12:01 markmarkmark that's why I have a battery pack for my phone
12:01 abhinav but how many times these type of situatiosn arise? its just once a month.
12:01 markmarkmark there was a time last year where I was doing that at least 2 times a month
12:02 markmarkmark and it doesn't really matter how often it happens, once you are in the middle of nowhere and your phone dies and you have no map, you're already going to be pretty unhappy
12:02 markmarkmark or at least, I would be
12:02 espindola joined #git
12:02 selckin it's only  usefull for 1% of the people, clearly it shouldn't exist
12:02 matthiaskrgr music + gps + mobile data for several hours can be quite taxing on the battery
12:02 _ikke_ ideally the battery of your phone should last 1 year
12:03 matthiaskrgr ^
12:03 matthiaskrgr just make it nuclear :P
12:04 markmarkmark or, for a more silly example, I usually like to keep one around and charged because my fiance almost never charges her phone and it is prone to dying while we're out and about
12:06 nilez joined #git
12:06 abhinav now I know why I never felth need for any powerbank.....cause I dont have a gf!!
12:07 MattMaker joined #git
12:07 elementalest joined #git
12:07 JeroenT joined #git
12:08 sdothum joined #git
12:08 rhlkjh joined #git
12:09 fahadash joined #git
12:10 SoRoot joined #git
12:11 JSharpe joined #git
12:12 markmarkmark lol
12:12 bruce_lee joined #git
12:12 bruce_lee joined #git
12:13 synthroid joined #git
12:13 eduardas_m hello, I am new to git... gitk shows only the master branch on my remote git repository that I keep in a networked PC's drive mounted on my Linux host... I know that there is also a development branch there from the command line
12:13 t0by joined #git
12:13 selckin gitk --all
12:14 synthroi_ joined #git
12:15 eduardas_m selckin, thanks a lot... it works..but I am not sure why it is organized in such a way... as qgit also did not show development branch by default
12:15 selckin it should the current branch
12:15 selckin *shows
12:16 eduardas_m but what sense does current branch have if the repository is bare.. I mean nothing is being checked out there
12:16 canton7 in a bare repository, there's still a 'default' branch: it's the branch that's checked out when someone clones the repo
12:16 canton7 gitk will have picked up on that branch as the 'current' branch
12:17 eduardas_m canton7, thanks...yes, that makes good sense
12:18 MattMaker joined #git
12:18 mingrammer joined #git
12:19 Prisoner-2460_1 joined #git
12:20 jaafar joined #git
12:20 a_thakur joined #git
12:20 knittl is there a way to say gitk A...B with multiple branches? gitk A...B...C
12:20 knittl or is this ambiguous?
12:20 prawnzy joined #git
12:20 selckin gitk A B
12:21 knittl but this will include common commits of the branches
12:21 selckin oh like that hmm
12:24 knittl hm. I did it manually now. found the common commit and run gitk A B C ^common
12:25 salamanderrake joined #git
12:25 selckin git merge-base will give common ib elieve
12:26 knittl yes. but also only for two branches. nevermind, I have what I need :] thanks
12:26 timothy joined #git
12:26 nilez joined #git
12:26 selckin gitk A B C ^$(git merge-base $(git merge-base A B) C)
12:26 selckin might work
12:28 GodGinrai joined #git
12:30 nilez joined #git
12:31 bytesnz joined #git
12:34 a_thakur joined #git
12:34 ItSANgo joined #git
12:35 nilez joined #git
12:36 Oebele joined #git
12:38 bytesnz Hello. Would someone be able to tell me what I am looking for? I have a repository with a single branch on it (the new branch contains a new version). Since the branch was created a single commit has been added to the (master) branch, the changes of which are not required in the new branch. I would new like to *insert word here (merge?)* the new branch onto the master branch (so the master HEAD is pointing to the new branch HEAD) with
12:38 skypuke_ joined #git
12:39 knittl bytesnz: so 2 branches? master & a branch?
12:39 selckin message got cut of after 'HEAD) witho'
12:39 bytesnz ... Merging the branch into master will cause the change on the master branch to be included, which I don't want.  Should I just reset the master HEAD to the branch head and push that?...
12:39 bytesnz knittl: correct
12:39 harish joined #git
12:40 knittl and master has 1 commit which is not in your branch?
12:40 nilez joined #git
12:40 ahmedelgabri joined #git
12:40 selckin sounds like you want to throw away cahnges on master and make it equal to the branch?
12:40 MattMaker joined #git
12:40 bytesnz knittl: yes, it includes a change that is not required in the new version (the version in the branch)
12:40 njbair joined #git
12:41 knittl but you want the changes of the branch (the new version?) in your master?
12:41 cyan__ joined #git
12:42 selckin think you just want git reset --hard branch, from master, but not entirely sure
12:42 bytesnz knittl: correct
12:42 knittl i think you simply want "git checkout master; git merge branch"
12:43 knittl changes of your branch will then be in master, but the branch will not contain anything new from master
12:43 nilez joined #git
12:45 lennoo joined #git
12:45 finalbeta joined #git
12:45 Noldorin joined #git
12:46 nydel07 joined #git
12:47 nilez joined #git
12:48 mycyber joined #git
12:48 bytesnz knittl: but that will merge the new version branch onto the master that includes the change(/commit) that isn't required in the new version
12:49 knittl bytesnz: but the branch will still not contain it. what should happen with this single new commit that is not required? should it be removed/deleted/forgotten?
12:49 knittl or do you want to keep it in master (or possibly some other branch)?
12:49 chll_ joined #git
12:51 nilez joined #git
12:51 MattMaker joined #git
12:53 djb-irc joined #git
12:53 bytesnz knittle: no, so as my master (and the remote master) contains the change the changes in the branch will be merged onto the master branch and will include the change/commit I don't want. What I want is to scrap the last commit on master and just merge (will be a fastforward) the changes onto the master branch. I'm just not sure on the safe way of doing that (won't break other peoples copies of the repo). Can I just use reset to move th
12:53 nettoweb joined #git
12:53 knittl bytesnz: so you want to get rid of the commit on master?
12:53 cdown_ joined #git
12:54 kadoban joined #git
12:54 bytesnz knittl: ... well yes, but I don't want to delete commit (as the history has already been pushed to the server)
12:55 subhojit777 joined #git
12:56 mehola joined #git
12:56 knittl bytesnz: sounds like a merge --ours or merge --theirs
12:56 YourTheBombNow23 joined #git
12:57 kadoban joined #git
12:57 fguillot joined #git
12:57 zivester joined #git
13:00 dviola joined #git
13:00 bytesnz knittl: is there such a thing?
13:02 MattMaker joined #git
13:02 knittl bytesnz: yes. git merge -s ours
13:02 knittl bytesnz: git checkout branch ; git merge -s ours master ;
13:04 rgrinberg joined #git
13:04 stuh84 joined #git
13:04 knittl will make a merge commit which moves master to the state of branch. all changes of master are basically *lost*
13:05 al-damiri joined #git
13:06 bytesnz knittle: Ah cool. Would you then reset the master HEAD onto that new commit?
13:06 knittl onto your branch
13:07 knittl well, one ahead. it will create a new commit. has to, due to cryptographic integrity
13:07 nikivi joined #git
13:08 bytesnz knittl: yeah. Awesome. Thank you very much knittl!
13:08 yoh for e.g. this repo  http://datasets.datalad.org/openfmri/ds000006/.git  how to list only stats on the merges into the master?  I am trying   git log --merges --stat --left-only   but it gives all other merges as well :-/ (and no stats really)
13:09 ExoUNX joined #git
13:09 grawity --first-parent?
13:10 raijin joined #git
13:10 cdg joined #git
13:12 yoh grawity: sweet -- not sure how I have missed it!
13:12 MattMaker joined #git
13:12 yoh thanks... now I wonder if possible to get stats since otherwise I came up only with this ugly shell beast ...
13:12 yoh > p=; git log --merges --stat --right-only --pretty=oneline | grep 'Merge branch.*process' | while read next l1 l2 l3; do if [ ! -z "$p" ]; then echo -n "$p "; git diff --stat $next..$p 2>/dev/null | grep 'files ch' ; fi; p=$next; done
13:12 yoh to get summaries ;)
13:13 rgrinberg joined #git
13:13 mingrammer joined #git
13:13 Shentino joined #git
13:14 nidr0x joined #git
13:15 fmcgeough joined #git
13:15 yoh fwiw -- here is the refined (not only merges and using --first-parent):  p=; git log --first-parent --pretty=oneline | while read l; do next=${l%% *}; if [ ! -z "$p" ]; then echo -n "$l "; git diff --stat $next..$p 2>/dev/null | grep 'files ch' ; fi; p=$next; done
13:16 Lomex joined #git
13:16 grawity try diff'ing $commit^..$commit
13:16 grawity gives you exactly what got merged in
13:18 Noldorin joined #git
13:18 yoh grawity: all ingenious is simple! ;-)  should get more coffee
13:19 Vivekananda joined #git
13:21 MattMaker joined #git
13:22 Prisoner-2460_1 joined #git
13:22 crose joined #git
13:25 Noldorin joined #git
13:25 paws_ joined #git
13:28 sangy joined #git
13:28 lolmac joined #git
13:28 narendraj9 joined #git
13:28 yoh FWIW -- my ultimate helper atm:  git log --first-parent --pretty=oneline | while read l; do p=${l%% *}; gd=$(git describe $p 2>/dev/null); printf "%-20s %8s %-40s" "$gd" "${l:0:8}" "${l:40:40}"; git diff --stat $p^..$p 2>/dev/null | grep --color=never 'files* ch' || echo ; done
13:30 AaronMT joined #git
13:30 berndl joined #git
13:30 MattMaker joined #git
13:36 yoh grr... failed to bring it into a git alias... heh -- later ;)
13:37 re1 joined #git
13:38 Noldorin_ joined #git
13:39 yoh never give up -- here is the alias! ;)  lgl = "!bash -c 'git log --first-parent --pretty=oneline | while read l; do p=${l%% *}; gd=$(git describe $p 2>/dev/null); printf \"%-20s %8s %-40s\" \"$gd\" \"${l:0:8}\" \"${l:40:40}\"; git diff --stat $p^..$p 2>/dev/null | grep --color=never \"files* ch\" || echo ; done'"
13:40 lindenle joined #git
13:40 dviola joined #git
13:41 ochorocho__ joined #git
13:42 YourTheBombNow23 joined #git
13:42 rnsanchez_ joined #git
13:43 Phlogistique joined #git
13:44 griffindy joined #git
13:44 circ-user-E1qCe joined #git
13:45 a3pq51 joined #git
13:46 MattMaker joined #git
13:49 nikivi joined #git
13:50 isysd joined #git
13:50 rahtgaz joined #git
13:52 romerocesar joined #git
13:53 Darren__ joined #git
13:54 rnsanchez_ joined #git
13:54 choki hi
13:54 choki oh it works, thanks bytesnz
13:55 MattMaker joined #git
13:55 bytesnz +choki: np
13:56 ash_workz joined #git
14:03 nydel07 joined #git
14:03 dendazen joined #git
14:03 Lomex joined #git
14:04 ProbabilityMoon joined #git
14:04 phaleth joined #git
14:06 nonconvergent joined #git
14:06 YourTheBombNow23 joined #git
14:07 osse yoh: you can save yourself some quoting madness by ditching bash -c.  the code is run as a shell command
14:09 oldrobot joined #git
14:09 ResidentBiscuit joined #git
14:09 sin3t joined #git
14:09 leeN joined #git
14:10 ResidentBiscuit joined #git
14:10 MattMaker joined #git
14:10 ResidentBiscuit joined #git
14:10 oldrobot joined #git
14:11 eizua joined #git
14:12 gf_ joined #git
14:12 jeffreylevesque joined #git
14:13 le_melomane joined #git
14:13 ToBeCloud joined #git
14:13 utrack joined #git
14:13 Bowel joined #git
14:13 oldrobot joined #git
14:14 LionsMane joined #git
14:15 MattMaker joined #git
14:18 jhgundersen joined #git
14:20 MattMaker joined #git
14:20 Zamerick joined #git
14:21 prawnzy joined #git
14:22 jceb joined #git
14:23 clemf joined #git
14:24 synthroid joined #git
14:25 NwS joined #git
14:25 Bowel joined #git
14:25 jstein_ joined #git
14:27 e14 joined #git
14:28 e14 joined #git
14:29 MattMaker joined #git
14:30 usm4n joined #git
14:31 selckin osse: under the current shell?
14:31 * selckin believes it might just use /bin/sh and then you get actual crap sh on debian
14:32 selckin probably $SHELL maybe
14:32 _ikke_ I suspect /bin/sh
14:32 raijin joined #git
14:33 _ikke_ git -c alias.sh='! echo $SHELL' sh
14:34 MattMaker joined #git
14:34 _ikke_ So looks like selckin is right
14:35 BrianBlaze420 joined #git
14:36 lindenle joined #git
14:37 osse selckin: I took the time to scan yoh's alias for bashisms and found none
14:37 osse ehh, never mind. I think ${var:n:m} is
14:38 actinide joined #git
14:39 MattMake_ joined #git
14:39 le_melomane joined #git
14:40 osse also in this case the extra bash -c doesn't add any quting headaches anyway
14:40 * osse shows himself out
14:40 selckin just put it in a script :)
14:41 osse agreed
14:41 cami_78 joined #git
14:44 MattMaker joined #git
14:45 ProbabilityMoon joined #git
14:45 clemf_ joined #git
14:47 ahmedelgabri joined #git
14:48 chrisshattuck joined #git
14:48 nonconvergent joined #git
14:49 MattMake_ joined #git
14:51 happy-dude joined #git
14:52 romerocesar joined #git
14:52 matsaman joined #git
14:52 andlabs joined #git
14:53 e14 joined #git
14:54 MattMaker joined #git
14:55 e14 joined #git
14:56 everamzah joined #git
14:57 chrisshattuck joined #git
14:59 chrisshattuck joined #git
14:59 e14 joined #git
15:00 raspado joined #git
15:01 mingrammer joined #git
15:01 finalbeta1 joined #git
15:02 espindola joined #git
15:03 MattMaker joined #git
15:07 e14 joined #git
15:07 jknetl joined #git
15:08 MattMake_ joined #git
15:09 rsukla joined #git
15:12 ejb joined #git
15:13 MattMaker joined #git
15:14 marcogmonteiro joined #git
15:14 sanketdg joined #git
15:15 tyreld joined #git
15:17 the_cybersphinx joined #git
15:18 MattMaker joined #git
15:18 xlegoman joined #git
15:19 przemoc joined #git
15:19 satbyy joined #git
15:19 satbyy joined #git
15:22 nd_ joined #git
15:22 wrouesnel joined #git
15:22 Zamyatin joined #git
15:22 robotroll joined #git
15:22 InfoTest joined #git
15:23 MattMake_ joined #git
15:25 thiago joined #git
15:26 shgysk8zer0 joined #git
15:27 alfism joined #git
15:28 MattMaker joined #git
15:28 raijin joined #git
15:29 madewokherd joined #git
15:32 zivester joined #git
15:33 zeroed joined #git
15:33 zeroed joined #git
15:33 shinnya joined #git
15:34 timmu joined #git
15:34 pasadinhas joined #git
15:34 danslo joined #git
15:36 dreiss joined #git
15:37 MattMaker joined #git
15:38 lindenle joined #git
15:39 rubyonrailed joined #git
15:39 yoh osse: my motto in life -- never "fix" working git alias ;)
15:40 osse yoh: That's probably good life advice
15:42 ochorocho__ joined #git
15:42 MattMake_ joined #git
15:44 patarr joined #git
15:45 patarr Hi all. I had a branch where I had a few commits, and then I squash merged them onto master. How can I also now take that squashed commit and place it on staging as well?
15:46 nettoweb joined #git
15:47 MattMaker joined #git
15:47 afuentes joined #git
15:49 NimeshNeema joined #git
15:49 e14 joined #git
15:49 Noldorin_ joined #git
15:51 e14 joined #git
15:52 MattMake_ joined #git
15:52 romerocesar joined #git
15:53 hobodave joined #git
15:55 zhodge joined #git
15:55 subhojit777 joined #git
15:55 mingrammer joined #git
15:56 EvilPenguin joined #git
15:56 matsaman joined #git
15:57 MattMaker joined #git
15:58 alfism joined #git
15:59 andlabs joined #git
16:00 kingarmadillo joined #git
16:00 kingarmadillo is there a way to move a set of commited files to a new branch?
16:00 romerocesar joined #git
16:01 alfism joined #git
16:01 thiago joined #git
16:02 MattMaker joined #git
16:02 jeffreylevesque i just merged my friends pull request (he also created the issue) to my github master branch, but it doesn't show him as a "contributor" above the colored bar on the repo (designating the programming languages used)
16:03 jeffreylevesque i thought if someone contributes, and it gets merged to the repo, they become a "contributor"?
16:04 canton7 (asked in #github as well)
16:04 espindola joined #git
16:05 a_thakur joined #git
16:06 lindenle joined #git
16:06 energizer joined #git
16:07 ochorocho__ joined #git
16:08 BSab joined #git
16:11 MattMaker joined #git
16:11 Electrometro joined #git
16:12 BSAlb joined #git
16:13 choki_ joined #git
16:16 zhodge if I add a new file in my last commit along with other file modifications, what's the quickest way to edit that commit to exclude the file addition and bring it onto the staging area?
16:16 MattMaker joined #git
16:18 zhodge I usually do `cp file ~/Desktop; git rm file; git commit --amend; cp ~/Desktop/file .; git add file` :)
16:18 Seveas zhodge: git rm --cached the-new-file && git commit --amend
16:18 e14 joined #git
16:19 Seveas rm --cached only removes it from the index, leaves the file on disk intact
16:20 zhodge Seveas: very nice, thanks!
16:21 MattMaker joined #git
16:22 prawnzy joined #git
16:26 neilthereildeil joined #git
16:26 MattMaker joined #git
16:26 cagedwisdom joined #git
16:27 neilthereildeil if i do "git diff Branch1 Branch2" and there is not output, does that mean the branch tips point to the same commit?
16:27 neilthereildeil how can i veify that the branches are the same?
16:27 thiago no, it doesn't mean they point to the same commit
16:27 thiago it means they have the same content
16:27 nitric joined #git
16:27 thiago being at the same commit is just one way to have the same content
16:28 raspado joined #git
16:28 neilthereildeil how can i verify that Branch1 and Branch2 are the same?
16:28 finalbeta joined #git
16:28 EvilPeng1 joined #git
16:29 neilthereildeil if they are, i want to delete one...
16:31 MattMaker joined #git
16:32 flavius joined #git
16:32 durham joined #git
16:34 robotroll joined #git
16:35 danslo joined #git
16:35 e14 joined #git
16:36 MattMake_ joined #git
16:41 M-shine joined #git
16:41 actinide joined #git
16:42 hobodave joined #git
16:42 EvilPeng1 joined #git
16:43 osse neilthereildeil: git rev-parse Branch1 Branch2
16:44 osse neilthereildeil: git show Branch1 will show at the top if Branch2 is the same thing
16:45 MattMaker joined #git
16:47 Noldorin_ joined #git
16:47 efco joined #git
16:49 sonikspin joined #git
16:50 MattMake_ joined #git
16:50 mingrammer joined #git
16:53 liquidjamm joined #git
16:53 patarr joined #git
16:55 MattMaker joined #git
16:55 boombatower joined #git
16:57 SteffanW joined #git
16:58 newbiee joined #git
17:00 MattMaker joined #git
17:00 jon-mac joined #git
17:01 antispaceman joined #git
17:02 _tgunr joined #git
17:03 actinide joined #git
17:03 a_thakur joined #git
17:03 hobodave_ joined #git
17:04 JamesBaxter joined #git
17:04 laumann joined #git
17:04 neilthereildeil osse: the output of that command just shows the same hash twice. Was i supposed to pass some additional parameters?
17:04 Electrometro joined #git
17:05 osse neilthereildeil: no. that's what i expected. it means they're equal
17:05 MattMake_ joined #git
17:05 osse they point to the same commit.
17:05 neilthereildeil ok thanks. ill delete one of them
17:08 nilez joined #git
17:08 Mobutils joined #git
17:10 rinwa joined #git
17:10 MattMaker joined #git
17:10 relgar joined #git
17:12 ochorocho__ joined #git
17:12 thierryp joined #git
17:12 dreiss joined #git
17:12 mischat joined #git
17:14 michaelsharpe joined #git
17:15 raspado joined #git
17:15 VagabondAzulien joined #git
17:16 QwertyDragon joined #git
17:19 MattMaker joined #git
17:19 roentgen joined #git
17:20 Lunatrius joined #git
17:23 terminal_echo joined #git
17:24 MattMake_ joined #git
17:24 WayToDoor joined #git
17:27 ahmedelgabri joined #git
17:27 robotroll joined #git
17:29 MattMaker joined #git
17:31 romerocesar joined #git
17:32 Darren__ joined #git
17:32 patarr joined #git
17:33 scorphus joined #git
17:33 sbeller joined #git
17:34 MattMake_ joined #git
17:36 danslo joined #git
17:36 Sasazuka joined #git
17:36 berndl joined #git
17:37 rubyonrailed joined #git
17:39 krs93 joined #git
17:40 yqt joined #git
17:42 ansimation joined #git
17:43 rominronin joined #git
17:44 thiago joined #git
17:44 mingrammer joined #git
17:45 glebihan_ joined #git
17:46 synthroid joined #git
17:46 M-shine joined #git
17:47 jrun joined #git
17:47 jrun can upstream be a tag?
17:48 jrun ...for a branch i mean.
17:49 King_Hual` joined #git
17:50 osse easy enough to test
17:50 osse $ git branch --set-upstream-to=refs/tags/v2.9.0
17:50 osse fatal: Cannot setup tracking information; starting point 'refs/tags/v2.9.0' is not a branch.
17:50 BrianJ joined #git
17:50 osse IOW: no.
17:51 durham_ joined #git
17:51 jrun what's the difference between refs/tags and branches?
17:52 King_Hual_ joined #git
17:53 ojacobson refs are the base naming system
17:54 ojacobson tags and branches are kinds of refs that imply workflow
17:54 i7c There are two kinds of tags. Lightweight tags are a lot like branches, i.e. simply a name for an object (commit). But when you checkout a (lightwheight) tag you are in detached head which means the tag won’t move if you commit.
17:54 ojacobson git's high-level interfaces make assumptions based on what kinds of refs you're working with.
17:54 i7c The other tags are real objects, they behave like tags but you can sign them for example with pgp.
17:54 ojacobson `git branch --set-upstream-to` requires that the named ref is either a local branch (`refs/heads/*`) or a remote-tracking branch (`refs/remotes/REMOTE/*` for some REMOTE)
17:55 ojacobson it makes workflow decisions based on which of the two cases you select, and rejects any other kind of ref
17:55 durham joined #git
17:56 mohabaks joined #git
17:56 multi_io joined #git
17:58 durham joined #git
17:59 ShekharReddy joined #git
18:00 rubyonrailed joined #git
18:00 mikecmpbll joined #git
18:00 jrun i build asterisk off the official git repo and would like to keep up with their LTS. their workflow is as follows: create a *release* branch (13 if 13 doesn't exist else create 13.11); create a tag off of with (13.x) but keep the release branch around for future pulls.
18:01 jrun i want to have a testing branch, say next-LTS, that tracks the upstream LTS
18:01 eshlox joined #git
18:02 a3pq51 joined #git
18:03 patarr joined #git
18:03 circ-user-E1qCe joined #git
18:04 cdg joined #git
18:04 jrun but now i know that i can't track the release tag which is what release tars are based off.
18:04 jrun so any idea what's the best way to go about this?
18:05 ejb joined #git
18:05 King_Hual` joined #git
18:05 choki_ hello
18:05 gitinfo choki_: 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.
18:07 DonRichie joined #git
18:09 LionsMane joined #git
18:10 Sadeukko joined #git
18:11 BackEndCoder joined #git
18:12 rsukla joined #git
18:13 thierryp joined #git
18:15 bmahe joined #git
18:16 WayToDoor joined #git
18:16 vuoto joined #git
18:17 patarr joined #git
18:17 cdown joined #git
18:17 le_melomane joined #git
18:18 ShekharReddy joined #git
18:19 msonntag joined #git
18:19 govg joined #git
18:19 kingarmadillo joined #git
18:20 raspado joined #git
18:21 timmu_ joined #git
18:22 raspado joined #git
18:22 kyan joined #git
18:22 stamina joined #git
18:23 prawnzy joined #git
18:24 satifant joined #git
18:27 cdown_ joined #git
18:29 nonconvergent joined #git
18:30 irqq joined #git
18:32 BrianJ joined #git
18:36 danslo joined #git
18:38 astrofog joined #git
18:38 mingrammer joined #git
18:39 durham joined #git
18:40 bluj joined #git
18:40 durham joined #git
18:42 le_melomane joined #git
18:44 rominronin joined #git
18:44 afuentes joined #git
18:45 nettoweb joined #git
18:46 AnarchyAo joined #git
18:49 Zamyatin joined #git
18:50 Ryanar joined #git
18:51 QwertyDragon joined #git
18:51 elastix joined #git
18:53 d10n-work joined #git
18:53 duderonomy joined #git
18:53 vuoto joined #git
18:55 thierryp joined #git
18:55 Dummy joined #git
18:56 finalbeta joined #git
18:56 Salander27 joined #git
18:56 Guest36300 hey guys
18:56 gitinfo Guest36300: 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.
18:57 Guest36300 I have a question. I'm not an expert on git by any chance, so let me know if Im missing something silly:
18:58 patarr joined #git
19:02 EvilPeng1 joined #git
19:02 GodGinrai Guest92408: you're missing a question: :P
19:03 dreiss joined #git
19:04 ItSANgo joined #git
19:04 mikecmpbll joined #git
19:06 Seveas GodGinrai: the question must be enormous if he's still typing it :)
19:06 finalbeta joined #git
19:06 joshuaturner joined #git
19:07 liberpater joined #git
19:07 liberpater I have two files that shows as modified when I do "git status"  How do I undo those changes?
19:08 vuoto joined #git
19:09 Mobutils joined #git
19:09 dsantiago joined #git
19:09 GodGinrai Seveas: it's a shame his novel will likely either get cut off very early on by the character limit, or his client will be "helpful" enough to split it into multiple message, getting him booted for flooding the network
19:10 GodGinrai *messages
19:10 alexclark joined #git
19:12 sonikspin joined #git
19:12 mischat joined #git
19:12 romerocesar joined #git
19:13 Seveas liberpater: git status tells you how to :)
19:15 jason237 joined #git
19:15 mohabaks joined #git
19:17 fahadash joined #git
19:18 alexclark does anyone know the command to update a git submodule to a specific commit?
19:19 yqt joined #git
19:20 Hello71 checkout.
19:20 madewokherd (cd submodule/ && git checkout ...)
19:22 liberpater Seveas: It tells me how to add the files, but I don't want to do that.
19:22 liberpater wait, nm
19:23 elsevero joined #git
19:23 GodGinrai Seveas: oh, he disconnected before I even answered him.  Wow.
19:24 liberpater Seveas: I did "git checkout -- path/to/some/file.ext" but git status still shows that file
19:26 pandeiro joined #git
19:26 Muzer joined #git
19:26 bsanford_ joined #git
19:26 OnBrokenWings joined #git
19:28 Balliad joined #git
19:28 Seveas GodGinrai: heh, I've set my client to ignore joins/parts/quits :)
19:28 GodGinrai lol
19:29 Seveas liberpater: smells like a dodgy filter or broken crlf settings. Can you pastebin the output of that checkout command and the git status command. And the content of the .gitattributes file, if it exists.
19:30 sangy joined #git
19:30 terminal_echo joined #git
19:31 boombatower joined #git
19:33 mingrammer joined #git
19:33 raijin joined #git
19:34 liberpater Seveas: My "git status" http://sprunge.us/TLJJ
19:34 drawkula joined #git
19:34 anuxivm joined #git
19:34 liberpater git checkout -- drupal_web/vendor/phpunit/phpunit/build/tools/phpab; produces no output
19:35 m0viefreak are you on windows?
19:37 danslo joined #git
19:38 actinide joined #git
19:38 Seveas liberpater: and the .gitattributes file?
19:38 Ryanar joined #git
19:39 alexclark madewokherd: exactly what i wanted to do, thanks!
19:41 OnOut2k16 joined #git
19:42 Seveas madewokherd: alexclark: that can be shortened to git -C submodule checkout ...
19:42 BrianJ joined #git
19:43 romerocesar joined #git
19:44 liberpater Seveas: http://sprunge.us/IhAA
19:44 theskillwithin joined #git
19:44 BrianJ joined #git
19:45 dangerousdave joined #git
19:45 Seveas liberpater: that looks sane. What does git diff say about the files?
19:45 rominronin joined #git
19:46 liberpater Seveas: they look like binaries, so git diff is a mess
19:46 OnOut2k16 left #git
19:47 Seveas that means git is interpreting them as text
19:48 lagothri1 joined #git
19:48 Seveas ah yes, the .gitattributes file tells it to. That's not quite sane.
19:49 ejb joined #git
19:49 liberpater Seveas: what should I change in the .gitattributes?
19:50 Seveas not sure, I don't use the attribute system that much.
19:52 clemf joined #git
19:52 actinide joined #git
19:53 eivarv joined #git
19:55 ExoUNX git --good
19:55 michaelsharpe joined #git
19:57 actinide joined #git
19:59 _ikke_ liberpater: <path> binary
19:59 _ikke_ binary is a macro for several attributes
20:00 stompleee joined #git
20:00 dodobrain joined #git
20:01 actinide joined #git
20:03 dreiss joined #git
20:06 cdown joined #git
20:07 _ikke_ Hmm, lots of submodule topics on the mailing list lately
20:08 sbeller _ikke_: because we're trying to jump start usage of submodules here for dogfooding and we like doing things in the open ;)
20:09 osse I don't trust things with "sub" in the name. submodule, subtree, subversion.
20:09 _ikke_ sbeller: Not only talking about patches, but also user requests
20:09 _ikke_ sbeller: But I like the work you're doing
20:10 stomplee joined #git
20:10 osse _ikke_: would you say it's sublime?
20:11 _ikke_ Hehe
20:13 salamanderrake_ joined #git
20:13 grayjoc joined #git
20:15 emg joined #git
20:15 netj joined #git
20:16 clemf joined #git
20:22 patarr joined #git
20:22 `mx joined #git
20:23 cdown_ joined #git
20:23 actinide joined #git
20:23 cdg joined #git
20:24 mischat joined #git
20:24 prawnzy joined #git
20:24 cdg joined #git
20:24 everamzah joined #git
20:24 nwkj86 joined #git
20:25 le_melomane joined #git
20:25 dodobrain joined #git
20:27 ankitraj joined #git
20:27 michaelsharpe joined #git
20:27 mingrammer joined #git
20:28 salamanderrake joined #git
20:28 M-meznak joined #git
20:28 aviraldg joined #git
20:28 Remram[m] joined #git
20:28 Ineentho[m] joined #git
20:28 M-mistake joined #git
20:29 crayon joined #git
20:30 crayon joined #git
20:30 Shearer joined #git
20:30 Darren__ joined #git
20:37 GodGinrai joined #git
20:37 baxx joined #git
20:37 terminal_echo joined #git
20:41 GodGinrai joined #git
20:42 guampa joined #git
20:43 newbie1 joined #git
20:45 cdown joined #git
20:46 jason237 joined #git
20:46 rominronin joined #git
20:47 hweaving joined #git
20:47 syg_ joined #git
20:47 le_melomane joined #git
20:47 hweaving "man git reset" says "It does not affect the wokring tree or the current branch" for "git reset <tree-ish> <paths>"
20:47 gitinfo the git-reset manpage is available at http://jk.gs/git-reset.html
20:48 hweaving When it says it doesn't affect the current branch, this just means that no commits etc. are modified, merely the tracking?
20:48 hweaving Just sanity checking myself
20:48 ToBeCloud joined #git
20:49 Gsham joined #git
20:49 WayToDoor joined #git
20:53 newbie1 joined #git
20:54 swiftgeek left #git
20:55 bsanford_ joined #git
20:56 hweaving I guess so :D
20:56 clr hweaving: it only updates the index (aka, staging)
20:57 dan2k3k4 joined #git
20:57 hweaving clr:  Cheers
20:57 clr hweaving: "tracking" refers to whether Git knows about a file or not
20:57 clr hweaving: cheers
20:59 nidr0x joined #git
21:00 hweaving left #git
21:02 Ninzex joined #git
21:03 EvilPeng1 joined #git
21:03 dangerousdave joined #git
21:07 sonikspin joined #git
21:09 rbern joined #git
21:10 Nikitaw99 joined #git
21:10 Nikitaw99 hi
21:10 gitinfo Nikitaw99: 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.
21:13 Orion3k joined #git
21:13 Gitzilla joined #git
21:17 finalbeta joined #git
21:18 MacWinner joined #git
21:19 kingarmadillo joined #git
21:21 cdown_ joined #git
21:21 ankitraj left #git
21:21 mingrammer joined #git
21:21 Guest55 joined #git
21:22 Rodya_ joined #git
21:22 thierryp joined #git
21:25 Nikitaw99 rip
21:25 crayon joined #git
21:27 aidalgol joined #git
21:29 mattcen joined #git
21:31 NeverDie joined #git
21:33 ejb joined #git
21:38 jeffreylevesque joined #git
21:38 prawnzy joined #git
21:41 sangy joined #git
21:43 madknight "git commit --amend --no-edit" does the commit hash change because of different timestamp?
21:43 osse yes
21:43 madknight osse, ah okay thx
21:43 LabMonkey joined #git
21:44 moestevens_ joined #git
21:44 Jon28_ joined #git
21:45 PaulCape_ joined #git
21:45 evilmquin2 joined #git
21:45 cust_ joined #git
21:46 Zarthus_ joined #git
21:46 Bigcheese_ joined #git
21:47 i8c joined #git
21:47 jgrasser joined #git
21:47 shauna joined #git
21:47 Forkk joined #git
21:47 moestevens joined #git
21:47 wcpan joined #git
21:47 rominronin joined #git
21:48 Neo_ joined #git
21:48 r3c0d3x joined #git
21:48 gigq joined #git
21:48 emilyrose joined #git
21:48 souther joined #git
21:48 cdesai joined #git
21:48 thebope joined #git
21:48 systmkor joined #git
21:48 Seveas joined #git
21:49 geko joined #git
21:49 ahr3n joined #git
21:49 Peng_ joined #git
21:50 lebster joined #git
21:50 Lowell joined #git
21:50 rfv joined #git
21:51 wrouesnel1 joined #git
21:51 bremner joined #git
21:51 dhollinger joined #git
21:51 barq joined #git
21:51 NightStrike joined #git
21:51 bremner joined #git
21:51 d0nn1e joined #git
21:51 bcardarella joined #git
21:51 cjbrambo joined #git
21:51 imdsm_ joined #git
21:51 uidzer0 joined #git
21:51 uebera|| joined #git
21:51 uebera|| joined #git
21:52 timwis joined #git
21:52 devster31 joined #git
21:52 CustosLimen joined #git
21:52 aca20031 joined #git
21:52 POQDavid joined #git
21:52 nedbat joined #git
21:52 hide joined #git
21:52 nchambers joined #git
21:52 [diecast] joined #git
21:52 ojacobson joined #git
21:52 evanc joined #git
21:52 bouncy joined #git
21:52 krillr joined #git
21:52 cschneid joined #git
21:52 ec joined #git
21:52 superteece joined #git
21:52 Eugene joined #git
21:52 e14 joined #git
21:52 bauruine joined #git
21:53 gmh joined #git
21:54 flupke joined #git
21:54 Shearer left #git
21:55 ec joined #git
21:56 hagabaka joined #git
21:56 blackjid joined #git
21:56 thecomedian joined #git
21:57 zeller joined #git
21:57 murph joined #git
21:57 Awesomecase joined #git
21:57 Guest77202 joined #git
21:57 ToeSnacks joined #git
21:57 mehdi__ joined #git
21:58 asdofindia joined #git
21:58 devhoag joined #git
21:59 jokester joined #git
21:59 sparr joined #git
21:59 andlabs joined #git
21:59 armenzg joined #git
21:59 Riviera joined #git
21:59 vktec joined #git
21:59 Mannn joined #git
21:59 harleypig joined #git
22:00 Remram joined #git
22:00 slixpk joined #git
22:00 Remram joined #git
22:00 de-vri-es joined #git
22:00 Fissure joined #git
22:00 asd5a joined #git
22:00 Gsham joined #git
22:00 GGMethos joined #git
22:00 creppe joined #git
22:02 rancyd joined #git
22:03 dhanush joined #git
22:04 Ineentho[m] joined #git
22:05 codebam joined #git
22:06 Klumben joined #git
22:06 gitinfo joined #git
22:08 ghostlight joined #git
22:08 ejb joined #git
22:09 King_Hual joined #git
22:10 raijin joined #git
22:14 romerocesar joined #git
22:14 Immune__ joined #git
22:15 mingrammer joined #git
22:19 l4v2 joined #git
22:20 l4v2 left #git
22:20 prawnzy joined #git
22:22 emg joined #git
22:23 AfroThundr joined #git
22:25 rj1 joined #git
22:27 HoierM joined #git
22:29 gravitron joined #git
22:40 heroux_ joined #git
22:40 SonOfLilit joined #git
22:41 SonOfLilit I have identical .gitattributes for *.csv and *.tsv, but git only listens to the *.tsv
22:41 SonOfLilit any idea how to debug this?
22:41 SonOfLilit (I'm trying to set up textconv or an external differ for csv files)
22:43 zhodge_ joined #git
22:44 duderono_ joined #git
22:45 madewokherd joined #git
22:45 heroux joined #git
22:47 e14 joined #git
22:48 rominronin joined #git
22:53 mizu_no_oto joined #git
22:56 isysd joined #git
22:58 martin_g joined #git
22:58 bbhoss joined #git
22:58 cstrahan joined #git
22:58 mischat joined #git
23:01 matthiaskrgr ls
23:02 neilthereildeil left #git
23:02 newbiee joined #git
23:03 romerocesar joined #git
23:03 Ryanar joined #git
23:06 SonOfLilit joined #git
23:10 rbern joined #git
23:10 mingrammer joined #git
23:13 rsukla joined #git
23:13 Ryanar joined #git
23:16 nitric joined #git
23:16 kaldoran joined #git
23:17 blueyed joined #git
23:17 NeverDie joined #git
23:18 rubyonrailed joined #git
23:19 AlHafoudh joined #git
23:19 MacGyver joined #git
23:19 roflin joined #git
23:20 ohcibi joined #git
23:20 Nothing4You joined #git
23:22 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
23:22 SonOfLilit joined #git
23:25 cagmz joined #git
23:27 johnnyfive joined #git
23:29 Rodya_ joined #git
23:29 shinnya joined #git
23:31 e14 joined #git
23:32 prawnzy joined #git
23:34 kaldoran joined #git
23:35 Sasazuka__ joined #git
23:35 dendazen joined #git
23:38 dsdeiz joined #git
23:38 durham_ joined #git
23:40 e14 joined #git
23:46 Rodya_ joined #git
23:48 newbie1 joined #git
23:49 dsdeiz joined #git
23:50 rominronin joined #git
23:50 bronson joined #git
23:54 fguillot joined #git
23:55 ap0c joined #git
23:57 e14 joined #git
23:58 JamesBaxter joined #git
23:59 Guest77202 left #git

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