Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-30

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

All times shown according to UTC.

Time Nick Message
00:02 liquidjamm joined #git
00:02 tristanp joined #git
00:04 Grimm_ So when I do a git status I get the following message.  http://hastebin.com/soyiqigabu.vhdl
00:04 Grimm_ how do I get rid of the untracked content?
00:08 tristanp_ joined #git
00:09 drodger joined #git
00:09 tristanp joined #git
00:11 trista___ joined #git
00:13 prsn joined #git
00:14 jstimm joined #git
00:15 tristanp joined #git
00:16 JanC_ joined #git
00:18 tristanp joined #git
00:19 NeverDie When trying to merge separate branches, is it always best to checkout a new temporary branch to do stuff there?
00:19 NeverDie And then merge it to a higher ranked branch after?
00:19 rainbyte joined #git
00:21 diegoaguilar joined #git
00:28 david007 joined #git
00:29 mingrammer__ joined #git
00:31 tomog999_ joined #git
00:31 watabou NeverDie: You don't need to. I just merge branches, commit if I choose a non fast-forward merge, and then keep merging branches on top of it. At the end, I can just rearrange or edit the merges with git-rebase before I push
00:31 NeverDie watabou: Hmm. I feel like there needs to be a clean and concise way of doing this.
00:33 NeverDie watabou: If I do git merge -v <branch> into my current branch, what does it really mean by being verbose?
00:33 cmwslw joined #git
00:33 NeverDie Like in what way?
00:33 tristanp_ joined #git
00:34 interne7y joined #git
00:35 Blkt joined #git
00:35 NeverDie watabou: git merge - -no-ff <branch> right?
00:35 trista___ joined #git
00:38 watabou NeverDie: Yeah, I like doing topic branches, and then committing the merge. That way, I can tell when I merge a branch easily. I've never used merge -v though, I don't think it outputs more information most of the time. Probably if you have merge conflicts.
00:38 tristanp joined #git
00:38 NeverDie watabou: I just did git merge -v branch and it just overwrote all of the shit I had lol.
00:39 NeverDie With like none of those >>>>> HEAD messages. I need to do git merge - -no-ff <branch> in order to see those merge conflicts?
00:39 watabou NeverDie: You can revert easily, you can go back in time to any point in `git reflog`
00:39 watabou NeverDie: merge conflicts will really only be possible if a fast forward merge is not possible.
00:40 NeverDie watabou: Like I want it to overwrite all the files I have, but with those messages within the files telling me the before & after changes.
00:40 NeverDie How do I do that?
00:40 NeverDie Makes it a lot better to really know what happened.
00:41 watabou Not sure what your question is. What do you mean by messages within the files?
00:43 watabou NeverDie: To me, a non-fast forward merge already does a merge with enough information. I can just look at the merge commit in that case to figure out what happened.
00:43 tristanp_ joined #git
00:45 efco joined #git
00:45 NeverDie watabou: Like sometimes I'll get something that says >>>>> Head  or w/e.
00:45 nettoweb joined #git
00:45 cmwslw joined #git
00:45 NeverDie And it shows the places where the files are being overwritten.
00:45 ochorocho__ joined #git
00:45 Noldorin joined #git
00:46 watabou NeverDie: Those are merge conflicts. That means git doesn't know how to merge because it doesn't know which of the changes you want to keep.
00:46 tristanp joined #git
00:47 NeverDie Except it just overwrote all of what I had this time lol.
00:47 watabou I would read `man git-merge` and read about how git shows merge conflicts and what you can do if you have one.
00:47 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
00:47 NeverDie So how do I make sure I always get merge conflicts?
00:48 watabou Huh? No merge conflicts is best :)
00:48 prsn joined #git
00:50 watabou git will only produce merge conflicts if, for example, you changes several of the same lines on different branches and now you're trying to merge them together. In that case, git will mark that file as having a conflict when you try to merge. If you don't have merge conflicts, you don't need to do anything.
00:56 NeverDie Yeah but I need to fix this guy's code lol.
00:57 NeverDie So I have to go over his changes and then tune it up.
00:57 shantanoo joined #git
00:58 qpdb joined #git
00:58 watabou NeverDie: I would just merge commit and then fix it. Otherwise, you could do a merge, but stop before committing with  git merge --no-ff --no-commit <branch>
01:00 mda1 joined #git
01:00 thiago joined #git
01:07 WebDawg joined #git
01:07 tgies joined #git
01:10 eletuchy joined #git
01:12 tgies joined #git
01:13 ediz_ joined #git
01:15 tanuki joined #git
01:15 Rodya_ joined #git
01:20 fling joined #git
01:22 tristanp joined #git
01:23 docnvk joined #git
01:25 tristanp_ joined #git
01:28 tristanp joined #git
01:31 tristanp_ joined #git
01:32 tgies joined #git
01:32 thiago joined #git
01:33 rnsanchez joined #git
01:34 tristanp joined #git
01:34 bollullera left #git
01:35 interne7y joined #git
01:35 dermoth joined #git
01:36 alex1a joined #git
01:38 sdothum joined #git
01:42 tgies joined #git
01:46 pks joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git1015FM, the place for git help and classic rock | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Carry on my wayward vim, there'll be a build when you're done. https://madeitwor.se/git-jokes
01:49 liuzhen joined #git
01:50 shantanoo joined #git
01:50 shantanoo joined #git
01:51 nettoweb joined #git
01:52 m_antis joined #git
01:52 tgies joined #git
01:53 cmwslw joined #git
01:55 tristanp_ joined #git
01:55 Limes__ joined #git
01:57 trista___ joined #git
01:57 tgies joined #git
01:59 mjuszczak joined #git
01:59 mjuszczak joined #git
02:00 tristanp joined #git
02:02 harish joined #git
02:02 SwiftMatt joined #git
02:02 tgies joined #git
02:02 tristanp_ joined #git
02:07 tgies joined #git
02:12 sgen joined #git
02:12 tgies joined #git
02:13 Noldorin joined #git
02:17 tgies joined #git
02:18 johnnyfive joined #git
02:18 sangy joined #git
02:19 SteenJobs joined #git
02:20 liuzhen joined #git
02:22 hexagoxel joined #git
02:22 tristanp joined #git
02:22 tgies joined #git
02:24 NeverDie Does each commit keep track of the branch it was made under?
02:25 chachasmooth joined #git
02:25 thiago no
02:27 tvon joined #git
02:27 NeverDie I see.
02:27 tgies joined #git
02:30 Joaquin-V joined #git
02:31 Joaquin-V hello, for some reason a submodule isn't updating when I `git pull --recurse-submodules=yes`
02:31 Joaquin-V it pulls the new commits, but it's not updating the files themselves
02:32 drodger joined #git
02:32 rgrinberg joined #git
02:32 mellernoia joined #git
02:32 tgies joined #git
02:33 tristanp joined #git
02:36 interne7y joined #git
02:36 artemisart joined #git
02:37 tgies joined #git
02:39 shantanoo joined #git
02:39 shantanoo joined #git
02:39 preaction Joaquin-V: the docs say it only applies to the fetch portion of the pull. you still have to git submodule update
02:39 preaction git pull is "fetch + merge". but merge isn't what updates submodules
02:46 fracting joined #git
02:47 ochorocho__ joined #git
02:47 tgies joined #git
02:48 astrofog joined #git
02:50 tristanp joined #git
02:51 jaguarmagenta joined #git
02:52 a_thakur joined #git
02:53 a_thakur joined #git
02:58 tgies joined #git
03:00 MDRXB95AP joined #git
03:00 arescorpio joined #git
03:02 tristanp_ joined #git
03:03 tgies joined #git
03:03 drodger joined #git
03:04 aavrug joined #git
03:06 tristanp joined #git
03:08 tgies joined #git
03:09 rodarmor joined #git
03:10 tristanp_ joined #git
03:10 fuchstronaut joined #git
03:10 a_thakur_ joined #git
03:11 rodarmor left #git
03:14 dodobrain joined #git
03:14 dodobrain hi all
03:14 robbyoconnor joined #git
03:16 Goplat joined #git
03:18 tgies joined #git
03:19 wgrant joined #git
03:20 sangy joined #git
03:20 k3rn31 joined #git
03:21 drodger joined #git
03:22 cmwslw joined #git
03:23 tgies joined #git
03:27 nettoweb joined #git
03:30 mda1 joined #git
03:32 tgies joined #git
03:35 eletuchy joined #git
03:37 interne7y joined #git
03:38 safe joined #git
03:39 mda1 joined #git
03:39 shantanoo joined #git
03:42 tgies joined #git
03:43 drodger joined #git
03:47 tgies joined #git
03:48 tristanp joined #git
03:48 ochorocho__ joined #git
03:48 happy-dude joined #git
03:52 dreiss joined #git
03:53 snufft joined #git
03:53 tristanp_ joined #git
03:55 rkazak joined #git
03:57 tristanp joined #git
03:57 tgies joined #git
04:03 tgies joined #git
04:03 tristanp joined #git
04:04 xlegoman joined #git
04:07 Goobbue joined #git
04:08 tgies joined #git
04:09 robotroll joined #git
04:12 shantanoo joined #git
04:13 tgies joined #git
04:16 blackwind_123 joined #git
04:16 tristanp_ joined #git
04:17 cagedwisdom joined #git
04:19 tristanp joined #git
04:20 mariuscc joined #git
04:20 Goobbue joined #git
04:21 fracting joined #git
04:22 david007 joined #git
04:22 jaguarma_ joined #git
04:22 tgies joined #git
04:24 tristanp_ joined #git
04:27 diogenese joined #git
04:28 tgies joined #git
04:28 khmarbaise joined #git
04:28 n00bdev joined #git
04:28 tristanp joined #git
04:29 n00bdev how do i clone a pull request on the commandline given information from a webhook pullrequest event?
04:31 k3rn31 joined #git
04:31 tristanp_ joined #git
04:32 Cabanossi joined #git
04:32 tax joined #git
04:33 fscala joined #git
04:38 interne7y joined #git
04:39 mikecmpbll joined #git
04:43 tgies joined #git
04:43 Goobbue joined #git
04:47 SteenJobs joined #git
04:47 mingrammer__ joined #git
04:47 clemf joined #git
04:49 a_thakur joined #git
04:52 ygeLN joined #git
04:53 tgies joined #git
04:54 armyriad joined #git
04:57 Chunk2 joined #git
05:00 elsevero joined #git
05:01 netj joined #git
05:02 sargas joined #git
05:03 tgies joined #git
05:05 shantanoo joined #git
05:05 shantanoo joined #git
05:07 mehola joined #git
05:07 tristanp joined #git
05:08 tgies joined #git
05:09 mehola joined #git
05:11 mingrammer_ joined #git
05:13 tgies joined #git
05:14 subhojit777 joined #git
05:14 Kulrak joined #git
05:14 Kulrak joined #git
05:15 liuzhen joined #git
05:15 tristanp joined #git
05:18 tgies joined #git
05:18 Kicer86 joined #git
05:21 a_thakur joined #git
05:21 qt-x joined #git
05:23 tgies joined #git
05:28 Chunk2 joined #git
05:28 tgies joined #git
05:30 Akagi201 joined #git
05:30 Raging_Hog joined #git
05:31 mablae__ you checkout that branch and merge it in
05:31 dimi1947 joined #git
05:32 mablae__ git does not know a PR - It is just a pointer to a specific commit that on a specific branch that should be merged
05:32 PCatinean joined #git
05:33 grawity yeah you have to `git fetch` it though
05:33 tgies joined #git
05:34 mablae__ ^^ after setting up the remote :-)
05:36 Goobbue joined #git
05:38 grawity not necessarily
05:38 tgies joined #git
05:38 interne7y joined #git
05:39 lindenle joined #git
05:40 Sonderblade git commit --amend can change the last commit, but is there an easy way to do the same thing to the penultimate commit?
05:41 dimi1947 joined #git
05:42 raininja joined #git
05:42 mohabaks joined #git
05:43 tristanp joined #git
05:43 tgies joined #git
05:45 Seveas commit --fixup HEAD^ and rebase -i --autosquash
05:46 SimpleName joined #git
05:46 elsevero joined #git
05:46 SimpleName git diff master other — file, how to show the change is which user change
05:47 ThomasLocke joined #git
05:47 kami joined #git
05:47 tristanp_ joined #git
05:49 ochorocho__ joined #git
05:49 kami` joined #git
05:49 glebihan joined #git
05:50 kami` left #git
05:50 Seveas That's not possible. If other is a direct descendant of master, git blame or git log -p may help. In all other cases the question makes little to no sense.
05:52 artemisart joined #git
05:52 settermjd joined #git
05:53 diogenese joined #git
05:54 rscata joined #git
05:55 ramsub07 joined #git
05:58 tgies joined #git
06:03 zeroed joined #git
06:03 zeroed joined #git
06:03 tgies joined #git
06:03 orbitphreak joined #git
06:04 freimatz joined #git
06:09 Macaveli joined #git
06:11 wcpan joined #git
06:13 tgies joined #git
06:14 tristanp joined #git
06:14 fwdit joined #git
06:15 shantanoo joined #git
06:16 vompatti joined #git
06:16 tristanp_ joined #git
06:17 ciampix joined #git
06:18 tgies joined #git
06:18 trista___ joined #git
06:19 inflames joined #git
06:19 jceb joined #git
06:22 tristanp joined #git
06:24 lamppid joined #git
06:25 _ng joined #git
06:26 mehola joined #git
06:27 tristanp_ joined #git
06:27 ronskisika joined #git
06:27 elsevero joined #git
06:27 tax joined #git
06:28 tgies joined #git
06:29 eletuchy joined #git
06:30 shantanoo joined #git
06:31 tristanp joined #git
06:31 vompatti left #git
06:32 Rish joined #git
06:33 grassass joined #git
06:33 mynameisbrian joined #git
06:34 tristanp_ joined #git
06:34 mynameisbrian hey guys, how does git work with databases exactly? Do you not version control things like blog posts, or do you just do backups?
06:36 mynameisbrian I'm trying to think of a decent workflow for working with databases. having a nice local environment for each of my machines. I guess I'm used to simpler things where all I have to do is clone and my environment is setup, whereas with databases ill have to setup mysql or something
06:36 shantanoo joined #git
06:36 phroa usually versioning blog posts implies that blog posts are stored as text files and transformed from something like markdown or reStructuredText into HTML by a webserver reading the files directly.
06:36 eijk_ joined #git
06:36 JeroenT joined #git
06:37 phroa versioning databases could mean storing a series of SQL migration procedures that can be used to rebuild a schema, or storing a pre-filled sqlite database. database server backups... that's not really great version control material
06:37 mynameisbrian for example right now I can clone a site and then create my production from it, but how do you guys do that for databases? do you set them up for each machine?
06:37 phroa !git-lfs for that stuff (meaning large binaries, hard to diff) if you must
06:38 tgies joined #git
06:38 drbean joined #git
06:38 mynameisbrian how do you do it phroa, do you just setup a DB on your machine and then clone your files to work with that db?
06:39 mynameisbrian I'll use markdown, and then store that in a DB
06:39 phroa I only use sqlite for development, and postgres in production. postgres data never touches git, it's backed up, mirrored, replicated, whatever-ed on separate systems
06:39 interne7y joined #git
06:39 shantanoo joined #git
06:40 mynameisbrian well sqlite sounds perfect, it says it's "self contained"
06:41 Sceorem joined #git
06:41 User458764 joined #git
06:41 phroa it's not scalable by any means, and not suitable for production. it's basically SQL-as-a-file. excellent for developing applications with that eventually get hooked up to beefier databases.
06:42 mynameisbrian yeah, I just want an easy way to pass around dev files without setting up environments on each machine. And then I'll have a procedure for making everything ready for production
06:43 tgies joined #git
06:44 glandium joined #git
06:48 tgies joined #git
06:49 realz joined #git
06:50 _weyer joined #git
06:50 simenbrekken joined #git
06:50 simenbrekken Is there an easy way of producing a list of branches that if merged won't result in any changes? I'm trying to clean up various branches that have been merged with --squash
06:51 mehola joined #git
06:52 settermjd joined #git
06:53 jagob joined #git
06:53 SimonNa joined #git
06:53 tristanp joined #git
06:54 isxek joined #git
06:55 osse simenbrekken: i think your best bet is to actually do the merge in a temporary branch and see
06:55 simenbrekken osse: there's like 40-50 stale branches :/
06:56 osse do it for one branch then slap a for loop onto it
06:56 osse there's also git merge-tree
06:58 nadim joined #git
06:58 tgies joined #git
06:59 tristanp_ joined #git
06:59 HeaTxTM joined #git
07:00 shantanoo joined #git
07:01 osse simenbrekken:  git branch --no-merged | while read -r branch do; git checkout -B tmp master; if git merge $branch && ! git diff --quiet tmp~ tmp; then echo "$branch can be deleted"; fi; done
07:01 simenbrekken osse: thanks! will try that :)
07:02 mikecmpbll joined #git
07:02 tristanp joined #git
07:05 tristanp joined #git
07:05 Akagi201_ joined #git
07:07 jeeger joined #git
07:09 shantanoo joined #git
07:09 Thorn__ joined #git
07:10 dling` joined #git
07:11 rewt joined #git
07:12 fuchstronaut joined #git
07:13 tgies joined #git
07:14 PasiFist joined #git
07:14 SimpleName joined #git
07:14 Ariadeno joined #git
07:15 jrun joined #git
07:15 BlackMaria joined #git
07:17 dreiss joined #git
07:17 josuebrunel joined #git
07:18 mda1 joined #git
07:18 tgies joined #git
07:20 Mowgli joined #git
07:21 mikecmpbll joined #git
07:22 bjpenn joined #git
07:22 ome joined #git
07:23 eletuchy joined #git
07:23 tgies joined #git
07:23 sgfgdf joined #git
07:25 User458764 joined #git
07:26 Ariadeno_ joined #git
07:26 sgfgdf hi, guys! if i have two branches master and develop is it better to branch from master (where things should be stable) or develop and when finish your feature/bug try to merge it into develop?
07:29 moritz sgfgdf: is this your own project? or somebody elses?
07:29 fuchstronaut joined #git
07:29 troulouliou_div2 joined #git
07:29 sgfgdf moritz: a shared one.
07:29 ceaucari joined #git
07:30 moritz sgfgdf: so the most important thing is to have a consensus on how you do it
07:30 moritz sgfgdf: if you can influense that consensus, merging off of develop is typically better
07:30 djb-irc joined #git
07:31 moritz but it's a bit strange to start off with the assumption of two branches, but not having a branching model that tells you how to branch and merge
07:33 sgfgdf moritz: what are the benefits when branching from develop compared to branching from master?
07:33 tristanp joined #git
07:33 tgies joined #git
07:33 moritz sgfgdf: well, if you want master to be the more stable branch, you'll merge the feature branch into develop
07:34 ahmedelgabri joined #git
07:34 moritz sgfgdf: and when you merge into develop, you generally get fewer merging conflicts if you start from the same branch
07:36 sgfgdf moritz: but if you branch from master you are sure that the thing is stable. if you branch from develop you are not sure.
07:36 sgfgdf moritz: i'm tryning to measure the plus and minuses so i can decide which is better for the case.
07:37 moritz sgfgdf: how often do you plan to merge from develop to master?
07:38 sgfgdf moritz: one a week probably.
07:38 moritz sgfgdf: suppose I want to build three small features, A, B, C, and each builds on the previous one
07:38 GavinMagnus joined #git
07:38 jeeger left #git
07:39 moritz sgfgdf: if I start the branches from develop, I can develop B as soon as the feature branch from A is developed
07:39 moritz sgfgdf: if I have to start from master, I have to also wait until develop is merged into master
07:39 Junior joined #git
07:39 moritz sgfgdf: so, the turnaround time for these three features can't be smaller than two weeks
07:40 sgfgdf moritz: yes that is an issue.
07:40 moritz also, what exactly does starting from a stable base give you?
07:40 moritz I hope you have some kind of automated tests
07:40 interne7y joined #git
07:40 moritz and keep them passing in develop
07:40 moritz that's enough for starting development, no?
07:43 Psych joined #git
07:43 tgies joined #git
07:44 r0bby_ joined #git
07:45 r0bby_ joined #git
07:45 sgfgdf moritz: yes, but sometimes two separate features can pass their tests, but in combination they can make the tests to fail. so if two features with passing tests are merged into develop they make develop bad and then you branch from bad branch.
07:48 sgfgdf moritz: and at the same time i'm not sure if the situations i've stated are more likely to happen than yours.
07:48 tgies joined #git
07:49 dopesong joined #git
07:49 ochorocho__ joined #git
07:50 TomyWork joined #git
07:50 a_thakur joined #git
07:50 hfp joined #git
07:50 faux___ joined #git
07:51 rominronin joined #git
07:51 osse simenbrekken: how goes it
07:51 leeN joined #git
07:52 moritz sgfgdf: that's why you merge, then test, and only push if the test succeeds
07:52 watersoul joined #git
07:53 txdv joined #git
07:53 tgies joined #git
07:54 wagle joined #git
07:55 Derega joined #git
07:55 inflames joined #git
07:55 neanderslob joined #git
07:56 lukechen joined #git
07:56 lukechen Hi everyone
07:56 xai joined #git
07:56 johnny56 joined #git
07:56 lukechen joined #git
07:57 moritz hello lukechen
07:58 unforgiven512 joined #git
07:58 Mowgli joined #git
07:58 Balliad joined #git
07:58 codebam joined #git
07:58 tgies joined #git
08:02 ketas joined #git
08:03 Gonzo89 joined #git
08:03 tgies joined #git
08:04 mwhooker joined #git
08:06 marcogmonteiro joined #git
08:06 choki joined #git
08:06 lucido-cwl joined #git
08:06 tucco joined #git
08:07 tucco whats up
08:07 tucco im new
08:07 choki joined #git
08:07 ocbtec joined #git
08:07 tucco anyone there want to talk
08:07 tucco 1173 users
08:08 tucco makes me feel sad
08:08 tristanp joined #git
08:08 Stace joined #git
08:09 choki joined #git
08:09 n00bdev joined #git
08:09 tgies joined #git
08:09 tucco left #git
08:09 Stace Did I do something really bad? I branched from master at A, did a whole bunch of commits to the branch (no push), then rebased the branch (but only after A) and then merged with the master.
08:10 Borkr joined #git
08:10 Stace Now stackoverflow is telling me branch + rebase + merge is bad
08:10 Stace but if I only rebased after A, then that's fine, right?
08:10 osse is A specific commit ?
08:10 Stace yes
08:10 _pix joined #git
08:10 Stace a parent commit
08:11 ix007 joined #git
08:11 osse did you do 'git merge master' on this new branch or 'git merge newbranch' on master?
08:11 Stace git merge branch on master
08:11 jbitdrop joined #git
08:11 rchavik joined #git
08:11 osse i see no problems
08:11 Stace oh good
08:12 fees joined #git
08:12 knittl I get STATUS_ACCESS_VIOLATION in perl.exe when I try to run git svn fetch on windows
08:12 clmsy joined #git
08:12 knittl even with a newly created repository (so it's not a malformed index)
08:12 choki joined #git
08:12 knittl any idea? any open bug reports?
08:12 knittl win7, 64bit
08:12 Stace osse I'm getting "does not have our version" now so perhaps I messed up somewhere
08:12 knittl worked in the past. not sure if windows updates changed something, or newer versions of git are broken
08:13 Raging_Hog joined #git
08:13 r00twrh joined #git
08:13 johnny56 joined #git
08:13 tgies joined #git
08:14 osse Stace: from where did you get that?
08:15 cyan__ joined #git
08:15 ash_workz joined #git
08:16 Stace osse, I have another branch (that's way before A, like 10 versions before A) that I just merged into this, again "get merge branch" on master
08:17 Alienpruts joined #git
08:17 Stace I thought it would be ok because the rebased history is only after A and so this is still on the un-rebased portion.
08:18 ash_workz joined #git
08:18 osse sure, sounds good. what I was asking though is what produced that error message
08:19 peepsalot joined #git
08:19 tgies joined #git
08:19 osse I don't recognize it
08:19 Stace I did a git checkout --ours on a conflicted binary file
08:19 star_prone joined #git
08:19 Stace it produced error: path '...path/waveform.wcfg' does not have our version
08:20 osse are you in a merge conflict ?
08:20 Stace yes
08:20 Raging_Hog joined #git
08:20 osse what is the conflict? both modified?
08:20 Stace yes
08:21 osse dunno
08:21 osse !repro
08:21 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
08:21 Stace would a reflog also be helpful?
08:21 emPi joined #git
08:21 JeroenT_ joined #git
08:21 ronskisika joined #git
08:23 osse i don't know
08:23 osse !lol might be
08:23 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
08:24 tgies joined #git
08:24 narendraj9 joined #git
08:24 JeroenT_ joined #git
08:25 ramsub08 joined #git
08:25 osse if it's huge an confusing then replace '--all' with a list of the relevant branches
08:34 Stace https://gist.github.com/StaceyRieck/4f601cfb08aa87501535625b8b65a769
08:34 tgies joined #git
08:35 grawity makes sense, since your side deleted it
08:35 Fijit joined #git
08:35 Stace grawity: "deleted" as in removed from git or from the filesystem?
08:36 mda1 joined #git
08:37 jaguarmagenta joined #git
08:37 Stace I didn't remove that file from the repo intentionally
08:37 mda1 joined #git
08:38 encod3 joined #git
08:39 tgies joined #git
08:40 ramsub07 joined #git
08:40 lindenle joined #git
08:41 osse you said it was "both modified" ;_;
08:41 osse y u lie :(
08:41 osse Stace: at least removed from git. maybe filesystem too but that's not relevant
08:41 choki joined #git
08:41 osse Git is correct; the --ours version doesn't exist
08:42 Stace osse, sorry! I honestly thought it was that, deleted by us was only noticed when I made the pastie :/
08:43 osse Stace: you can find which commit deleted it with:  git log --diff-filter=D -- path/waveform.wcfg
08:43 osse no worries
08:43 mingrammer__ joined #git
08:44 nilg joined #git
08:44 tgies joined #git
08:44 tristanp_ joined #git
08:44 nwkj86 joined #git
08:45 eletuchy joined #git
08:46 netj joined #git
08:47 UncleCJ joined #git
08:47 Martian joined #git
08:49 tgies joined #git
08:49 Stace ohhh, I moved that file like ages ago and completely forgot
08:49 strk left #git
08:49 Stace osse: so actually I don't want it anymore!
08:50 Stace "ages ago" being 2 weeks :p
08:50 mingrammer__ joined #git
08:51 eletuchy joined #git
08:51 tristanp joined #git
08:54 emPi joined #git
08:54 tgies joined #git
08:54 osse Stace: but it was *modified* in the other branch; it wasn't just there.
08:54 osse So you gotta make a desicion
08:56 Stace osse: yeah I don't want those changes, so git rm fixed it
08:57 osse \o/
08:57 Stace Is that right? I just did git rm
08:57 Stace and then it went away
08:57 osse should be fine
08:57 osse quoth git status:  (use "git add/rm <file>..." as appropriate to mark resolution)
08:57 Stace yes I saw
08:57 eletuchy joined #git
08:57 Stace those hints are useful
08:58 Stace now that solves the first of my conflicts
08:58 Stace lots more to go
08:58 Stace but these should be easier because I know what I want
08:59 tuor Hi, how can i show the diff from the remote repo and the current (not staged) files?
08:59 fuchstronaut joined #git
08:59 osse tuor: git diff origin/master naster
08:59 osse for example
08:59 eletuchy_ joined #git
08:59 grawity just `git diff origin/master` for the worktree, no?
08:59 grawity also, don't forget to fetch origin
08:59 knutstrut joined #git
09:00 osse ah
09:01 netj joined #git
09:01 choki joined #git
09:01 eletuch__ joined #git
09:01 mda1 joined #git
09:02 zincrokx joined #git
09:03 eletuchy joined #git
09:03 tuor 'git diff origin/master' works.
09:03 tuor thx.
09:04 fuchstronaut joined #git
09:04 tgies joined #git
09:06 eletuchy_ joined #git
09:07 Macaveli joined #git
09:07 zamba joined #git
09:08 eletuch__ joined #git
09:09 tgies joined #git
09:15 redeemed joined #git
09:15 HeaTxTM joined #git
09:15 t-mart_ joined #git
09:16 User458764 joined #git
09:20 kellytk joined #git
09:21 kellytk What did I do by typing `git status file`?
09:21 selckin ?
09:22 weckl joined #git
09:22 JeroenT joined #git
09:22 emPi joined #git
09:22 osse kellytk: nothing very interesting. same as 'git status' except you limit it to only take 'file' into account
09:22 kellytk I read the doc entry but I don't understand how that would be interpreted
09:23 kellytk Oh, thanks osse
09:23 JeroenT joined #git
09:24 weckl joined #git
09:24 tgies joined #git
09:25 weckl joined #git
09:26 mwhooker joined #git
09:26 JeroenT_ joined #git
09:26 mariuscc joined #git
09:29 tgies joined #git
09:30 tristanp_ joined #git
09:31 Stace what if I don't want to commit at the end of the merge?
09:31 Stace can I end it some other way?
09:32 Stace I would literally be doing git commit and then git reset --soft
09:32 osse I think you can do git reset --soft now
09:32 osse but why would you
09:32 digidog joined #git
09:33 Stace I have all the merged changes as staged and I am still in "merge mode"
09:33 tristanp joined #git
09:33 dsdeiz joined #git
09:33 Stace is the only way of getting out of merge mode is to do a commit?
09:33 osse try gti reset without --soft
09:34 Stace but then wouldn't it unstage everything?
09:34 Stace "All conflicts fixed but you are still merging.(use "git commit" to conclude merge)"
09:34 trista___ joined #git
09:36 Stace eh, I'll just do a commit to get out of merged mode and then do a reset --soft
09:36 ceaucari joined #git
09:38 HeaTxTM try git merge --abort
09:38 HeaTxTM its equivalent to git reset --merge
09:39 tgies joined #git
09:39 Stace HeaTxTM: would that undo all of my changes?
09:40 Stace what would the state of the repo be after that?
09:42 interne7y joined #git
09:42 paul424 joined #git
09:42 Stace I don't think it's possible.
09:42 Stace Man for --abort says "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
09:43 Stace It looks like the whole merge process requires a commit at the end (http://stackoverflow.com/questions/8640887/git-merge-without-auto-commit) so I'll just have to reset soft afterward
09:44 kellytk left #git
09:44 tgies joined #git
09:44 tobiasvl Stace: why do you not want to commit?
09:44 Stace tobias: I want to make further changes to the staged files before comitting
09:45 Stace tobiasvl:
09:45 tobiasvl amend the commit?
09:45 selckin make the changes and stage them?
09:45 HeaTxTM Stace: now i understand what you wanted to do
09:45 Stace Essentially, I actually don't want a merge in the first place. I could have done a cherry pick of all the branched commits and that would have achieved my goals too. This was just a shortcut
09:46 paul424 joined #git
09:46 Stace I just wanted to get the branched changes into the master to modify them further before comitting
09:47 HeaTxTM Stace: before start merging you have to git stash
09:48 Stace HeaTxTM: I did - I did the merge from a clean master
09:48 tvw joined #git
09:49 ramsub07 joined #git
09:50 ochorocho__ joined #git
09:50 |ifei5good joined #git
09:52 slappymcfry joined #git
09:53 howdoi joined #git
09:57 dsdeiz joined #git
09:59 tgies joined #git
09:59 harish joined #git
10:00 MadHatter42 joined #git
10:01 mikecmpbll joined #git
10:04 tgies joined #git
10:04 SimonNa joined #git
10:07 osse Stace: yes it would unstage everything, but is that a problem ?
10:07 osse Stace: hmm ok sounds like you wanted to rebase the branch onto master instead of merging it tinto master
10:08 osse rebase = lots of cherry-picks
10:09 tgies joined #git
10:10 mdw joined #git
10:12 eletuchy joined #git
10:12 UncleCJ joined #git
10:14 eletuchy_ joined #git
10:14 patarr joined #git
10:14 tgies joined #git
10:15 tristanp joined #git
10:16 dsdeiz_ joined #git
10:16 crater2150 joined #git
10:16 dsdeiz_ joined #git
10:17 dsdeiz_ left #git
10:17 dsddeiz joined #git
10:17 eletuchy joined #git
10:17 dsddeiz left #git
10:17 dsdeiz joined #git
10:18 cdown joined #git
10:18 tristanp_ joined #git
10:18 Borkr joined #git
10:18 realz_ joined #git
10:19 tgies joined #git
10:21 tristanp joined #git
10:21 ximvan joined #git
10:26 trista___ joined #git
10:26 weather2 joined #git
10:26 moldy joined #git
10:26 moldy hi
10:26 moldy what is a good way to preview a merge before comitting it?
10:27 osse git merge --no-commit
10:27 moldy osse: ah, thanks
10:27 eletuchy joined #git
10:27 moldy also: on `git merge`, if i exit my editor without saving, the merge is still made. is that normal?
10:27 osse moldy: but the absolutely easiest thing to do is to merge like normal and then undo it afterwards if needed
10:28 notfrosty joined #git
10:28 notfrosty left #git
10:28 moldy osse: so that would be `git merge` followed by `git reset --soft HEAD~`?
10:28 osse moldy: git uses the exit status of the editor
10:29 digidog joined #git
10:29 ceaucari joined #git
10:29 nilg joined #git
10:29 tgies joined #git
10:29 osse moldy: that depends. i am saying it's easier to *re*view instead of *pre*view, and then undo if needed
10:29 moldy osse: my git seems to use the exit status except for git merge. there it seems to ignore it.
10:30 moldy osse: my question is wether `git merge` followed by `git reset --soft HEAD~` is the recommended way to review
10:30 osse imho no
10:31 moldy osse: what would you recommend instead?
10:31 osse git merge followed by nothing
10:31 moldy osse: and how do you undo then?
10:31 osse depends on how hard you want to undo.
10:32 moldy i don't follow
10:32 osse if you want to throw it all away and start over: git reset --hard HEAD~
10:32 zeroed joined #git
10:32 osse if you want to make a small change, then make it and do commit --amend
10:32 kervan joined #git
10:33 flopsec joined #git
10:33 Urbany joined #git
10:33 moldy osse: ah, i see. thanks.
10:33 moldy any idea about my editor issue? i somewhat doubt that vim produces a different exit status on `git merge` than on `git commit`.
10:34 b_jonas How do I make git tell me about the cherry-pick state of the current working tree, as in, whether a cherry-pick is in progress and what commits I'm cherry-picking from?
10:34 tgies joined #git
10:34 moldy b_jonas: `git status`, iirc?
10:34 kervan joined #git
10:34 kervan joined #git
10:34 b_jonas moldy: that doesn't seem to tell about it -- or maybe I'm just not in a cherry-pick state, I don't know
10:35 kervan Hello, I was doing 8-10 commits in several days. But I shouldn't push them. Today I have mistakely push them all. The other develops was making chance at the same time. So I have crashed the project. How can I delete the last push and all commits?
10:35 b_jonas hmm wait
10:35 m1dnight_ joined #git
10:35 b_jonas it says "but you are still merging" so I'm actually merging, not cherry-picking
10:35 osse moldy: if you exit without saving git will still commit
10:36 nettoweb joined #git
10:36 b_jonas moldy: thanks
10:38 kervan Can any body help me please?
10:38 jaguarmagenta joined #git
10:38 stuh84 joined #git
10:38 kervan it is not only one commit with one push. There is many commits and one push. So, I can see all browken commits in past days.
10:38 tobiasvl kervan: !revert
10:38 gitinfo kervan: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
10:39 tgies joined #git
10:39 tobiasvl kervan: a) or e) most relevant for you probably. for e), see !rewrite
10:39 gitinfo kervan: 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
10:41 kervan Bu I'm not able to reset to last working copy. Because last working copy was pushed 1 hours later. But I made changes 2 days aga and pushed it an half hour ago. So, when I reset to last working copy wont work.
10:42 freimatz joined #git
10:42 ahmedelgabri joined #git
10:43 moldy osse: but only on merge?
10:43 osse no
10:43 moldy osse: it says that "an empty message aborts the commit"
10:43 osse yes
10:43 moldy osse: and that seems to work just as i expect, except for merges.
10:43 osse but the default merge message is not empty
10:44 tgies joined #git
10:44 kervan So I need a solution to extract last push with 8-10 commits, is that possible?
10:44 moldy osse: but it works *differently* for commit than for merge
10:44 kervan no body loves me huh :(
10:45 arand joined #git
10:45 moldy osse: i think i understand it now, but this is a rather confusing ui. so i have to delete the message in my editor to abort the merge.
10:45 osse moldy: it works the same way in the sense that it uses the contents of the file if the editor exits successfully.
10:45 illusionmedic joined #git
10:46 moldy i see. so i either have to tell my editor exit non-zero, or delete the message.
10:46 osse yes
10:47 Lvjasha joined #git
10:48 sdothum joined #git
10:48 moldy thanks!
10:49 tgies joined #git
10:49 bsanford joined #git
10:50 howdoi still looking for a git post-pull hook...
10:50 PaulePanter Hi. Is there a trick how to easily solve conflicts, where a big code block was intended (due to new if condition around for example) and in the mean time something in that block was changed?
10:50 osse howdoi: it's called post-merge
10:51 fscala joined #git
10:52 howdoi osse: part of git or a work around?
10:52 wmsuvd joined #git
10:52 osse howdoi: part of git. man githooks
10:52 gitinfo howdoi: the githooks manpage is available at http://jk.gs/githooks.html
10:52 osse my guess is it's also invoked after a merge
10:53 howdoi osse: nice, say I need to check if a file changed after pull/merge and then run a specific command, that's easy?
10:53 howdoi pull = fetch + merge right?
10:54 osse yes and yes
10:54 howdoi ????
10:54 eletuchy joined #git
10:54 tgies joined #git
10:55 subhojit777 joined #git
10:55 nnyk_ joined #git
10:57 howdoi osse: same as post-checkout?
10:57 satbyy joined #git
10:58 tristanp joined #git
10:58 WizJin joined #git
10:59 tgies joined #git
11:01 WayToDoor joined #git
11:02 Psych joined #git
11:03 tlaxkit joined #git
11:03 choki joined #git
11:03 bernalex what's the most reasonable workflow when I have two repos for the same project? there's project Foo and Bar, which both have a directory Quux. inside Quux they have different files (there should be no overlaps, if there are, that's a terrible mistake).
11:04 tristanp joined #git
11:04 osse howdoi: in what sense?
11:04 bernalex they *need* to be separate repos, and they *need* to populate files in that same directory. but I'm not sure what's the nicest way to work with them.
11:04 tgies joined #git
11:04 tobiasvl bernalex: how do the repos share the non-Quux files?
11:05 WayToDoor joined #git
11:05 bernalex one immediately simple way of doing it is to have Foo, Bar, and then just make FooBar which uses symbolic links, and then hack hack hack, and then do commits in the separate repos.
11:05 howdoi osse: post-checkout and post-merge seems very much the same to me, I might be missing the obvious
11:05 osse agreed
11:06 bernalex tobiasvl: oh, good point! there aren't any ATM. I'm thinking of just not allowing that. Foo is the "main" repo, so I'm thinking about just having all interesting metadata etc in there, and just naming things like README-BAR in the Bar project.
11:08 bernalex tobiasvl: so what I mean to say is that there should be no filename collisions between them even with non-Quux files. so they could just as well be all linked together. but in general, the non-Quux files of Bar simply doesn't matter.
11:08 bernalex Bar is in many respects the 'add-on' repo here. if Bar had Xyzzy instead of Quux, I'd just use a submodule.
11:09 diegoaguilar joined #git
11:10 PCatinean_ joined #git
11:10 MDRXB95AP joined #git
11:14 tgies joined #git
11:15 fracting joined #git
11:15 tinajohnson___ joined #git
11:15 Stace osse I'm not particularly familiar with rebase, but a quick google indicates you're correct
11:17 Stace So the difference between a merge and a rebase is that a merge is used when the history needs to remain intact (because it's already been pushed) and a rebase the history can be rewritten because it hasn't been pushed
11:17 osse Stace: thank djezus i am an ascii art GOD then: https://raw.githubusercontent.com/Osse/git-stuff/master/merge-vs-rebase.txt
11:17 osse BAM!
11:17 Stace so what I'm doing, essentially, is a merge and then throwing away history by doing git reset soft HEAD~n
11:18 User458764 joined #git
11:18 Stace where n is the branch-master divergence point
11:19 settermjd joined #git
11:19 tgies joined #git
11:21 Stace Am I correct  when I say that merge and rebase will both have the same end repository state, but the histories will be different
11:21 johnmilton joined #git
11:22 fuchstronaut joined #git
11:22 osse yes
11:23 osse sounds like you want merge --squash
11:23 osse aka. an svn-style merge
11:23 osse aka. an Stace-style merge
11:23 osse s/an/a/
11:23 Stace ooh, I'm not familiar with merge --squash
11:25 djb-irc joined #git
11:26 elf_ joined #git
11:26 elf_ left #git
11:29 tgies joined #git
11:31 weather2 left #git
11:32 weather2 joined #git
11:33 samsonizzle joined #git
11:33 tristanp joined #git
11:34 volter joined #git
11:34 volter Hello!
11:34 tgies joined #git
11:34 volter I set the environment variable GIT_CONFIG to point to my configuration file. git config --list looks good.
11:35 djb-irc joined #git
11:35 Pulp joined #git
11:36 _ikke_ hey volter :-)
11:36 volter _ikke_: Hey!
11:37 volter However, when I actually do a commit, user.name is apparently not set.
11:37 _ikke_ volter: how does git var -l look like?
11:38 osse I think only git-config respects GIT_CONFIG
11:38 osse not the rest of git
11:38 bernalex I have never heard of GIT_CONFIG even. and I have a correct user.name.
11:38 volter _ikke_: Perhaps no, I'm not sure what to expect there.
11:39 volter osse: Hm!
11:39 volter (We are doing something nasty, that's why we need this in the first place.)
11:39 volter We can work around it, but it came as a surprise.
11:40 dimi1947 joined #git
11:40 Stace osse: Any Idea what an octopus is? --squash man: "This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)"
11:40 tristanp_ joined #git
11:40 _ikke_ man git does not mention GIT_CONFIG indeed
11:40 gitinfo the git manpage is available at http://jk.gs/git.html
11:41 bernalex volter: is the problem in a repo, or globally?
11:41 bernalex if you set user.name in project-repo/.git/config that really should do it.
11:42 _ikke_ Stace: That's a merge with more then 2 parents
11:42 volter bernalex: Unfortunately we can't do that. As I said, we are doing something nasty. :)
11:42 bernalex volter: well then I can't really help you. I don't have the time to play a guessing game about your setup. -_o_-
11:43 volter bernalex: I created a different repo and thus came to the conclusion that it is global.
11:43 bernalex it will just end up with a case of x/y anyway.
11:43 tristanp joined #git
11:43 interne7y joined #git
11:43 volter Multiple people are working in the same checkout
11:43 jceb joined #git
11:43 osse Stace: http://sprunge.us/JdEC
11:44 albel727 joined #git
11:44 tgies joined #git
11:45 tristanp_ joined #git
11:46 Stace osse: oh cool, I didn't know merge took more than one argument
11:47 Stace that must be a real abomination to sort out
11:47 osse Stace: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2cde51fbd0f3
11:48 SimpleName joined #git
11:49 mylord joined #git
11:50 tgies joined #git
11:51 ochorocho__ joined #git
11:52 Stace osse: geesh, and I thought my branch was a pain to merge!
11:54 osse Stace: I think this usually happens only to "bundle up" completely separate developments
11:54 zadock joined #git
11:55 tgies joined #git
11:55 osse Stace: the kernel is a large project. pretty sure you can find 66 different files to work in :p
11:56 nettoweb joined #git
11:56 ojdo joined #git
11:57 Stace osse: it's different when there are lots of people working on a repo. This one is just mine, so I don't have to worry about merging with other peopel, just myself :)
11:57 Stace s/el/le
11:58 nettoweb joined #git
12:00 tgies joined #git
12:00 prsn joined #git
12:04 tristanp joined #git
12:04 Sceorem joined #git
12:04 leeN joined #git
12:05 tgies joined #git
12:08 tristanp_ joined #git
12:09 n00bdev joined #git
12:09 josuebrunel joined #git
12:09 Jellyg00se joined #git
12:10 tgies joined #git
12:10 tristanp joined #git
12:13 Bear13tye joined #git
12:13 tristanp_ joined #git
12:13 Meteorhead joined #git
12:16 durham joined #git
12:17 |meta joined #git
12:17 k3rn31 joined #git
12:19 durham joined #git
12:19 tgies joined #git
12:20 Bear13tye joined #git
12:20 nardev joined #git
12:21 nardev hey guys, i switched back to some previous commit, i made some changes and i want to make that commit as head..
12:21 nardev i did it like git checkout --hard ... hash name of commit
12:22 nardev but i have problems again...
12:22 nardev i can't commit
12:22 Repox joined #git
12:22 nardev i get HEAD detached from 22e6f3f
12:23 Repox Hello. I'm in a branch that I just did a "git reset --hard HEAD" on, but doing a "git status" tells me that my branch is ahead by 3 commits. I don't know which commits these are and how to get out of those commits.
12:25 ramsub08 joined #git
12:26 pol123456 joined #git
12:26 tobiasvl Repox: probably the most recent three commits?
12:27 tobiasvl what do you mean by getting out of the commits?
12:27 tobiasvl you can git reset --hard to the remote-tracking branch if you're sure you want them in sync
12:27 JeroenT joined #git
12:28 Repox tobiasvl , well, it's our develop branch and I did a "git pull origin develop" and for some reason it wanted me to merge changes, but I'm pretty sure I haven't made any changes to my local develop branch.
12:28 tobiasvl git was pretty sure you had
12:29 lucido-cwl joined #git
12:29 sans_s3r1f joined #git
12:29 Repox tobiasvl , and git is probably right, so I probably messed it up. Doing "git reset --hard" didn't fix it, though. It still says I'm three commits ahead.
12:29 tgies joined #git
12:29 tobiasvl well, you only reset to HEAD...
12:30 tobiasvl git reset --hard HEAD = throw away uncommited changes
12:30 Repox tobiasvl , I'll be completely honest - I have no idea what HEAD is in this context.
12:30 tobiasvl !head
12:30 gitinfo [!HEAD] HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
12:30 tobiasvl if you're on develop, HEAD is just the same as develop.
12:31 tobiasvl so you told git to reset back to develop. you might want "git reset --hard HEAD^3" instead, to throw away HEAD and its two parent commits
12:31 tobiasvl or just "git reset --hard origin/develop" to make sure it's the same as origin/develop
12:31 tobiasvl but know that this will make you lose the extra 3 commits you have
12:32 nilsi joined #git
12:32 tobiasvl so make sure you know what they contain first, in case you'd forgotten you'd made some local changes
12:32 Repox Well, as long as I get to state that my remote branch is in, I'd be fine. I have no idea what those three commits are.
12:33 Repox tobiasvl , the "git reset --hard origin/develop" fixed it for me. Thank you for your help.
12:33 tobiasvl np
12:34 Snopandan joined #git
12:34 fracting joined #git
12:34 tobiasvl you should probably read a !book or something though, knowing stuff like what HEAD is is useful
12:34 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
12:34 Snopandan joined #git
12:34 tgies joined #git
12:35 Repox tobiasvl , thank you, I'd take a look at it.
12:35 d0nn1e joined #git
12:35 dermoth joined #git
12:35 fuchstronaut joined #git
12:35 k3rn31 joined #git
12:36 exawatts joined #git
12:38 Impaloo Are git functions executed in bourne shell?
12:39 jaguarmagenta joined #git
12:39 tgies joined #git
12:41 tobiasvl Impaloo: what do you mean?
12:41 tobiasvl git commands are executed in the shell you use, surely
12:41 tobiasvl git functions are usually written in C, if that's what you mean
12:43 lindenle joined #git
12:44 star_prone joined #git
12:44 tgies joined #git
12:45 interne7y joined #git
12:45 Impaloo tobiasvl: git alias functions
12:45 osse Impaloo: aliases that start with '!' are run in /bin/sh
12:45 osse other aliases are interpreted by git itself
12:45 Impaloo osse: where is this documented?
12:45 Impaloo trying to find docs about it but nope cant find
12:46 osse not sure. probably man git-config
12:46 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
12:46 ismithers joined #git
12:46 ismithers Good day sirs
12:46 osse "If the alias expansion is prefixed with an exclamation point, it will be treated as a shell command."
12:47 rnsanchez joined #git
12:48 Impaloo osse: by shell they mean /bin/sh (and not $SHELL)?
12:48 ismithers I'm trying to migrate some repos from TFS to Git, and am using Git-tf. But I am running into this issue: https://db.tt/xa2gc2xY I am hopeful some smart person may know why. It says it cannot find a required file, and yet, the files are there.
12:49 narendraj9 joined #git
12:49 tristanp joined #git
12:49 FilipNortic joined #git
12:50 tgies joined #git
12:51 osse ismithers: yes
12:51 osse oops
12:51 osse Impaloo: yes
12:51 osse I don't think git uses $SHELL for anything
12:51 trista___ joined #git
12:51 thiago_ joined #git
12:52 JeroenT joined #git
12:52 mda1 joined #git
12:53 tristanp_ joined #git
12:53 tax joined #git
12:55 tgies joined #git
12:55 mda1 joined #git
12:55 cdown_ joined #git
12:55 tristanp joined #git
12:55 JeroenT joined #git
12:57 trista___ joined #git
12:58 wviana joined #git
12:59 irco joined #git
13:01 mdw joined #git
13:03 mdw_ joined #git
13:04 tristanp_ joined #git
13:04 tgies joined #git
13:05 linuxmint joined #git
13:07 moldy left #git
13:10 tgies joined #git
13:10 plungerparty joined #git
13:14 a_thakur joined #git
13:15 tgies joined #git
13:15 FunkyAss joined #git
13:16 dshap joined #git
13:17 bjpenn joined #git
13:17 rnsanchez_ joined #git
13:20 dopesong joined #git
13:20 MDRXB95 joined #git
13:21 ciampix joined #git
13:21 ramsub07 joined #git
13:22 ceaucari joined #git
13:23 dopesong joined #git
13:24 Psych joined #git
13:24 Jellyg00se joined #git
13:24 flaguy48 joined #git
13:24 tgies joined #git
13:27 snowbound joined #git
13:28 rkazak joined #git
13:30 tgies joined #git
13:30 albertoc joined #git
13:31 faux___ joined #git
13:32 tristanp joined #git
13:33 mdw joined #git
13:33 weather2 left #git
13:34 trista___ joined #git
13:35 tgies joined #git
13:35 sangy joined #git
13:36 bounceman joined #git
13:37 bounceman General question, if I am on an old commit and run git fetch --all followed by git reset --hard origin/master will it remove all local changes and stay on that commit? I do not wish it to jump the latest commit available in the repo.
13:38 alcohol joined #git
13:38 osse bounceman: are you detached at the time?
13:39 mdw joined #git
13:39 nilg joined #git
13:39 tristanp joined #git
13:39 qsx ismithers: you could try https://github.com/git-tfs/git-tfs
13:40 qsx (also, how could you tell we’re all sirs?  hint: it’s false.  don’t say that.)
13:40 bounceman osse: nope, I am not.
13:40 osse bounceman: in that case you will make whatever branch is checked out idential to master at origin.
13:41 bounceman am guessing that is what I do not want
13:41 tristanp_ joined #git
13:41 osse me too
13:41 bounceman ideas? Without having to pluck the SHA
13:41 osse I don't know what you want
13:42 bounceman I wish to stay on my current commit and simply remove all changes I've done to it
13:42 bounceman checking out all edited files basically, but with one neat command
13:43 ismithers I resolved the issue qss, thanks though. It turns out that I was using a newer version of mysis and in the git-tf startup script it had a switch statement which checked what version I was using. I had to add a case for the newer version I was using.
13:43 osse bounceman: git status tells you how
13:43 osse bounceman: git checkout -- .  probably does the trick
13:43 osse bounceman: or git reset --hard   (NOT with origin/master or any other argument)
13:44 ismithers Thank you kindly though qsx
13:44 skylite joined #git
13:44 Kulrak joined #git
13:44 Kulrak joined #git
13:44 bounceman Resets the index and working tree. Any changes to tracked files in the working tree since <commit> are discarded.
13:44 bounceman Looks like it
13:46 Bear13tye joined #git
13:46 interne7y joined #git
13:46 User458764 joined #git
13:48 drbean_ joined #git
13:49 ceaucari joined #git
13:49 GandalfTheWizard joined #git
13:49 tgies joined #git
13:52 Mowgli joined #git
13:53 a_thakur joined #git
13:55 cyan__ joined #git
13:55 tgies joined #git
13:56 ar1s joined #git
13:57 phaleth joined #git
13:57 drodger joined #git
13:58 ar1s Hi gitters, I have a commit where I moved some code from a file to others, that I then rebased on recent HEAD. Is there a way to check that I haven't mistakenly erased changes that were pushed in the meantime? The commit: https://git.libssh.org/users/aris/libssh.git/commit/?h=gex_aris&amp;id=f6b66e308f70085d23874084b9a3860f997b1d5e
13:58 Guest35452 joined #git
13:59 Limes_ joined #git
13:59 settermjd joined #git
13:59 a_thakur joined #git
14:00 tgies joined #git
14:01 SwiftMatt joined #git
14:01 King_Hual joined #git
14:01 cyan__ joined #git
14:02 jagob joined #git
14:03 m_antis joined #git
14:03 Sendoushi joined #git
14:04 AndreasLutro joined #git
14:04 AaronMT joined #git
14:04 AndreasLutro so I tried doing git revert with --author and got a cryptic error message: "fatal: BUG: expected exactly one commit from walk" -- is there some way to make a revert commit with a custom author?
14:04 AndreasLutro do I have to set the environment variables?
14:05 AaronMT joined #git
14:05 tgies joined #git
14:05 WayToDoor joined #git
14:06 qsx AndreasLutro: a message with "BUG" is (surprise!) a bug in git itself
14:06 qsx could you please !paste a full !repro?
14:06 gitinfo Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.
14:06 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
14:06 dopesong joined #git
14:07 AndreasLutro sure...
14:07 Gamecubic joined #git
14:08 AndreasLutro https://gist.github.com/anlutro/67e0cec1a6a419e6d44131b0bc1deff6
14:09 AndreasLutro qsx: ^
14:10 qsx hmm.
14:10 qsx i guess you should report it to the !list (git does not have a bug tracker, the list comes closest)
14:10 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
14:11 osse AndreasLutro: try putting the hash at the end
14:11 AndreasLutro osse: same thing, also tried with --
14:11 sarbs joined #git
14:12 osse AndreasLutro: my manpage for git-revert doesn't mention --author at all
14:12 AndreasLutro I'll send a mail. I guess I'll do the same as with merges, --no-commit and then manually commit afterwards
14:12 qsx osse: i guess it is passed to rev-list
14:12 osse maybe it doesn't exist? in that case it's probably interpreted as a non-option
14:13 AndreasLutro osse: yeah I know, I just tried it, but I expected a more readable error at least
14:13 AndreasLutro I spent like 5 minutes trying to debug what was wrong with the git repo
14:13 AndreasLutro only to find out, oh, it's just the author argument
14:14 bollullera joined #git
14:15 tgies joined #git
14:15 Kulrak joined #git
14:15 Kulrak joined #git
14:15 Vinnie_win_o joined #git
14:15 User458764 joined #git
14:15 nnyk_ joined #git
14:16 k3rn31 joined #git
14:17 bjpenn joined #git
14:17 toogley joined #git
14:17 Impaloo joined #git
14:18 drbean joined #git
14:19 Martian joined #git
14:20 tgies joined #git
14:21 _ng joined #git
14:22 tristanp joined #git
14:24 madewokherd joined #git
14:25 tgies joined #git
14:25 Akagi201 joined #git
14:26 faux___ joined #git
14:27 ferr joined #git
14:30 drodger joined #git
14:30 tgies joined #git
14:31 kriskropd joined #git
14:32 drbean_ joined #git
14:33 Kulrak joined #git
14:33 Kulrak joined #git
14:33 nfk joined #git
14:35 tristanp_ joined #git
14:37 drodger joined #git
14:38 justanotheruser joined #git
14:39 daguilaraguilar joined #git
14:39 jaguarmagenta joined #git
14:40 Grimm_ joined #git
14:40 tgies joined #git
14:41 mdw joined #git
14:42 bitkiller joined #git
14:42 octocat joined #git
14:43 monoxane joined #git
14:44 joki joined #git
14:44 faux___ joined #git
14:45 tristanp joined #git
14:45 lindenle joined #git
14:46 interne7y joined #git
14:47 Calrik joined #git
14:47 Guest35452 joined #git
14:48 ocbtec joined #git
14:49 djb-irc joined #git
14:49 moriko joined #git
14:50 guampa joined #git
14:50 tgies joined #git
14:50 tristanp joined #git
14:51 SonikBoom joined #git
14:51 ceaucari joined #git
14:54 Rodya_ joined #git
14:54 JeroenT joined #git
14:55 tgies joined #git
14:56 octocat joined #git
14:59 drbean joined #git
15:00 tgies joined #git
15:00 djb-irc joined #git
15:00 runlevl4 joined #git
15:01 Mowgli joined #git
15:02 liquidjamm joined #git
15:02 dopesong joined #git
15:03 drbean_ joined #git
15:03 Calrik joined #git
15:03 octocat joined #git
15:04 fscala joined #git
15:04 faux___ joined #git
15:05 Khisanth joined #git
15:05 CheckDavid joined #git
15:05 monbro joined #git
15:06 octocat joined #git
15:06 a_thakur joined #git
15:07 prsn joined #git
15:07 e01 joined #git
15:08 NeverDie joined #git
15:08 heroux joined #git
15:08 cdown_ joined #git
15:10 tgies joined #git
15:11 drbean joined #git
15:11 Sendoushi joined #git
15:11 tristanp joined #git
15:12 Wysi joined #git
15:13 dsdeiz joined #git
15:13 dsdeiz joined #git
15:13 mizu_no_oto joined #git
15:13 tristanp_ joined #git
15:14 Psych joined #git
15:15 tgies joined #git
15:15 trista___ joined #git
15:16 bitkiller joined #git
15:16 drbean_ joined #git
15:17 drbean joined #git
15:18 dsdeiz joined #git
15:18 tristanp joined #git
15:19 leehambley joined #git
15:20 tgies joined #git
15:20 tristanp_ joined #git
15:21 drbean- joined #git
15:23 unbalancedparen joined #git
15:23 tristanp joined #git
15:24 blackwind_123 joined #git
15:25 tgies joined #git
15:28 trista___ joined #git
15:28 UTAN_dev joined #git
15:28 nettoweb joined #git
15:29 SteffanW joined #git
15:30 drbean joined #git
15:32 drbean_ joined #git
15:34 snufft joined #git
15:34 drbean- joined #git
15:35 TomyLobo joined #git
15:36 fedexo joined #git
15:39 slayerjain joined #git
15:39 a_thakur joined #git
15:44 Musok joined #git
15:46 Sendoushi joined #git
15:47 drbean joined #git
15:47 interne7y joined #git
15:48 Guest35452 joined #git
15:48 Sendoushi joined #git
15:48 fuchstronaut joined #git
15:50 tgies joined #git
15:52 ochorocho__ joined #git
15:55 tgies joined #git
15:56 star_prone joined #git
15:57 octocat joined #git
15:58 fahadash joined #git
15:59 fedexo joined #git
15:59 drbean_ joined #git
16:00 tgies joined #git
16:03 tristanp joined #git
16:03 toogley joined #git
16:03 orbitphreak joined #git
16:04 lolmac joined #git
16:04 peeps joined #git
16:04 ediz_ joined #git
16:04 drbean joined #git
16:05 tgies joined #git
16:06 armyriad joined #git
16:06 InfoTest joined #git
16:11 armyriad joined #git
16:12 sharpy joined #git
16:13 drodger joined #git
16:13 Noldorin joined #git
16:15 drbean_ joined #git
16:15 tgies joined #git
16:17 drbean- joined #git
16:17 bjpenn joined #git
16:17 rominron_ joined #git
16:17 moriko joined #git
16:18 drbean| joined #git
16:19 drbean joined #git
16:19 kulelu88 joined #git
16:20 kriskropd joined #git
16:20 tgies joined #git
16:20 tristanp_ joined #git
16:21 franl joined #git
16:22 wviana_ joined #git
16:23 mohabaks joined #git
16:23 tristanp joined #git
16:24 Goplat joined #git
16:24 subhojit777 joined #git
16:25 Stace left #git
16:25 tgies joined #git
16:25 flavius joined #git
16:26 tristanp_ joined #git
16:26 SwiftMatt joined #git
16:27 sargas joined #git
16:27 ochorocho__ joined #git
16:28 eijk_ joined #git
16:28 drbean_ joined #git
16:29 wviana joined #git
16:30 tgies joined #git
16:30 tristanp joined #git
16:31 Impaloo joined #git
16:33 diegoaguilar joined #git
16:35 AndreasLutro left #git
16:37 drbean joined #git
16:40 drodger joined #git
16:40 mand0 joined #git
16:40 jaguarmagenta joined #git
16:40 tgies joined #git
16:42 efco joined #git
16:42 alex1a joined #git
16:45 tgies joined #git
16:45 drodger joined #git
16:47 tristanp_ joined #git
16:47 Rish joined #git
16:48 fstd joined #git
16:48 InfoTest joined #git
16:48 interne7y joined #git
16:49 ramsub07 joined #git
16:50 ocbtec joined #git
16:50 tgies joined #git
16:50 mykespb joined #git
16:51 SimonNa joined #git
16:51 tristanp joined #git
16:52 NeverDie joined #git
16:52 Rodya_ joined #git
16:52 bluezone joined #git
16:53 IWishIKnew joined #git
16:53 drbean joined #git
16:56 tgies joined #git
16:57 nardev joined #git
16:57 nnyk_ joined #git
16:58 paul424 joined #git
17:01 tgies joined #git
17:01 ash_workz joined #git
17:01 jbitdrop joined #git
17:02 _ng joined #git
17:04 User458764 joined #git
17:07 monbro joined #git
17:10 DuckMaestro joined #git
17:10 fragMental joined #git
17:10 tgies joined #git
17:12 Noldorin joined #git
17:14 tristanp_ joined #git
17:15 tgies joined #git
17:15 droidicus joined #git
17:17 tristanp joined #git
17:17 drbean_ joined #git
17:18 rominronin joined #git
17:19 dsfreak93 joined #git
17:20 cdown joined #git
17:21 tristanp joined #git
17:21 riceandbeans left #git
17:22 liquidjamm joined #git
17:22 choki joined #git
17:23 franl left #git
17:24 clemf joined #git
17:26 franl joined #git
17:28 deadmund joined #git
17:29 OnBrokenWings joined #git
17:30 tgies joined #git
17:30 deadmund Can someone help me fix my small repo?  I messed it up like an idiot!  http://imgur.com/SiPXjeF   I want to get that node that says "GPLv3 Copyright stuff added" to be the HEAD node of the official branch and not in the master branch at all.  Also, I want to get rid of the merge commit.
17:31 User458764 joined #git
17:31 khmarbaise joined #git
17:35 dimi1947 joined #git
17:35 tristanp_ joined #git
17:36 _ikke_ deadmund: git rebase 1.0 official should do it
17:36 deadmund _ikke_: Really?  I should be checked into official when I do that?
17:36 _ikke_ deadmund: It will check it out
17:37 deadmund _ikke_: That will put 1.0 at the top of official?  What about the merge commit?
17:37 deadmund I guess that 1.0 is the merge?  But I thought that official's HEAD is the merge commit?
17:37 _ikke_ deadmund: No, it will leave 1.0 alone
17:37 _ikke_ That's just the base
17:38 rahtgaz joined #git
17:38 tristanp joined #git
17:38 _ikke_ rebase flattens history, so the merge will disappeary
17:38 deadmund _ikke_: So it will make official's HEAD be based on 1.0
17:38 _ikke_ !HEAD
17:38 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
17:38 _ikke_ But official will be 1 commit ahead of 1.0
17:38 PryMar56 joined #git
17:38 a3Dman joined #git
17:39 deadmund _ikke_: You are really good with git.  Wow!
17:39 _ikke_ I've been using it for quite some years :-)
17:39 deadmund _ikke_: That's fine.  I want official to be one commit ahead of the 1.0 tag.
17:39 faux___ joined #git
17:39 _ikke_ That's what I figured
17:39 deadmund _ikke_: wow
17:39 nettoweb joined #git
17:40 deadmund That is just really impressive.  I can't wait until I get that good with git (get good with git: lol).  It's still like magic to me!
17:40 wviana joined #git
17:40 Guest55 joined #git
17:40 tgies joined #git
17:40 _ikke_ git is often depicted to be harder then it is
17:41 cdown joined #git
17:41 deadmund _ikke_: apparently so
17:41 YoLoGrimm joined #git
17:42 _ikke_ !book has some good resources
17:42 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
17:43 realz joined #git
17:44 mdw joined #git
17:45 tgies joined #git
17:47 ajf- joined #git
17:49 interne7y joined #git
17:50 tgies joined #git
17:52 drbean joined #git
17:52 anberg joined #git
17:52 GavinMagnus left #git
17:53 GavinMagnus joined #git
17:54 dsfreak93 joined #git
17:55 star_prone joined #git
17:55 DolpheenDream joined #git
17:55 deanj left #git
17:55 tgies joined #git
17:56 GavinMagnus left #git
17:56 leehambley joined #git
17:57 dopesong joined #git
17:59 nnyk_ joined #git
18:00 star_prone joined #git
18:00 inflames joined #git
18:01 m8 joined #git
18:02 e01 joined #git
18:04 drbean_ joined #git
18:05 Crash1hd_ joined #git
18:05 tgies joined #git
18:06 sargas joined #git
18:07 meLon joined #git
18:07 Rodya_ joined #git
18:08 kulelu88 what license is the most open source friendly?
18:08 _ikke_ Depends on what you want to achieve
18:08 kulelu88 like "you can use my software for whatever, but if you make code changes, you need to commit them back to make the project better"
18:08 arooni joined #git
18:08 kulelu88 and does that ^^ license feel restrictive?
18:09 _ikke_ sounds like GPLv2/3
18:09 _ikke_ kulelu88: Depends on your perspective
18:09 _ikke_ It's restrictive for developers, because they have to share their changes, it's non-restrictive to end-users
18:09 WayToDoor joined #git
18:10 kulelu88 do you get a license where "you can do whatever you want with it except re-package it and sell it" ?
18:10 Guest_84477 joined #git
18:10 Guest_84477 left #git
18:10 Guest_84477 joined #git
18:10 tgies joined #git
18:10 preaction that's not a very open-source license
18:11 nadim joined #git
18:11 preaction the Artistic license gets you nearly there. they can't repackage and call it the same thing unless it is exactly the same thing
18:12 kulelu88 licensing feels like such an after-thought to many contributors, but it is so important in many cases
18:13 n00bdev joined #git
18:13 madduck joined #git
18:13 clemf joined #git
18:13 ojacobson You have a few options if you don't want to hire a lawyer to write exactly the license you want
18:14 ojacobson All of them are "use a canned license" so it's mostly a matter of which one gives you most of what you want: OSI has a catalogue of them, and creative commons has a fairly nice license options system
18:14 ojacobson If you want any terms more restrictive than "do what you like" you probably shouldn't try to write one yourself
18:15 kulelu88 I see some projects released under BSD license, some under Apache licenses, some under GPL, some under LGPL. you gotta wonder whether copyright violation is occurring at any given time
18:15 Eugene WTFPL is best license
18:15 Jeroen joined #git
18:15 ojacobson No, you really don't.
18:15 Eugene "you must commit back" is actually really restrictive. Writing your own license is always the wrong thing to do
18:16 ojacobson The terms under which you can redistribute someone's intellectual property are: "almost not at all" if you don't have a license, or "in line with this license" otherwise.
18:16 Eugene If you want it to be "libre forever" and all the rest of the Stallmanist garbage, use AGPL. If you don't care what people do, MIT or BSD or Apache or WTFPL are great
18:17 ojacobson If you obtain a project for free, but it has no license, you _may_ be in a position where you can use it, but you're _definitely not_ in a position where you can modify it or distribute it (fun fact: the _preparation_ of derivative works -- such as modifying someone else's code -- is itself infringing, in the US.)
18:17 ferr joined #git
18:17 bjpenn joined #git
18:17 ojacobson (You don't even have to distribute a derivative work to be in theoretical trouble, though obviously nobody's ever going to know if you never distribute your modified version.)
18:17 rominronin joined #git
18:18 Eugene The reality is that if you have it out in public, somebody will steal your stuff, claim it as their own, and ignore your requests. So either you're the asshole who made it a strong copyleft license(restricting what other developers can do with it), or you say "here's some shit, enjoy"
18:18 Eugene (guess which one I prefer)
18:21 tgies joined #git
18:21 ril joined #git
18:21 tristanp_ joined #git
18:21 jagob joined #git
18:24 slayerjain joined #git
18:26 tgies joined #git
18:28 Spacew00t joined #git
18:28 kulelu88 ojacobson: if you were theoretically building your own hosted git service, what names might you suggest to call it?
18:29 ciampix joined #git
18:29 preaction giterdone
18:29 toogley joined #git
18:29 Shentino2 joined #git
18:29 preaction that'll be $20
18:30 ojacobson I'd call it hire a branding consultant dot com
18:30 robotroll joined #git
18:30 preaction yeah. hire a branding consultant dot eye oh is way too expensive
18:30 ojacobson yeah for reals
18:30 kulelu88 well it's not a commercial project.
18:30 nilg`` joined #git
18:30 ojacobson sure, but if you want free branding work, diy
18:31 tgies joined #git
18:31 ojacobson if you want other people to do it for you, fuck you, pay me. :)
18:31 ojacobson whether you will make money on it or not does not have any impact on whether i need to eat or not
18:31 kulelu88 is swearing allowed here?
18:31 fakenullie gitofu
18:31 preaction fuck no
18:32 ojacobson "fuck you, pay me" was meant as an allusion to https://creativemornings.com/talks/mike-monteiro--2/1, I didn't consider whether it'd come off as direct hostility
18:32 ojacobson which was dumb, obviously it would, my apologies
18:33 kulelu88 the internet needs a 'context' reference, so people can understand when someone else is not necessarily being hostile
18:33 preaction especially regarding design and branding services in open source, which are seen as unimportant and therefore not worth the cost
18:33 franl joined #git
18:34 multi_io joined #git
18:34 drbean joined #git
18:34 kulelu88 preaction: does that always apply? commercial open source probably values design and branding
18:34 ojacobson yep
18:35 ojacobson see for example the phenomenal work (and the phenomenal amount of money) hashicorp put into branding
18:35 preaction commercial open source is funded by non-open things. and once a project has money to pay people, then they can actually do branding
18:35 ojacobson rather, once a project has money people, they tend to understand that investing in decent branding has real returns down the road :)
18:35 tgies joined #git
18:36 ojacobson both in terms of longevity and in terms of finance
18:37 ojacobson anyways, that's probably enough… kulelu88: I am serious that you should get a brand consultant or a designer to work with you on that, and that will cost money
18:37 ojacobson I am not literally serious about "fuck you" :)
18:37 preaction or just... giterdone.com. that'll be $20
18:37 preaction damnit. some stupid cable company has that site already
18:37 m0viefreak joined #git
18:39 Dyonisos joined #git
18:39 osse I believe I already won this competition
18:41 tgies joined #git
18:41 settermjd joined #git
18:41 jaguarmagenta joined #git
18:41 sargas joined #git
18:42 k3rn31 joined #git
18:44 sharpy joined #git
18:44 phroa I'm surprised.
18:44 phroa No match for "GITASASERVICE.COM".
18:44 phroa >>> Last update of whois database: Mon, 30 May 2016 18:43:42 GMT <<<
18:44 ojacobson gaas, nice
18:44 italoacasas joined #git
18:45 tristanp joined #git
18:46 tgies joined #git
18:46 Crash1hd__ joined #git
18:46 star_prone joined #git
18:47 lindenle joined #git
18:47 lmat joined #git
18:48 tristanp_ joined #git
18:48 lmat Sometimes I do  git rebase --onto A B C; I get some conflicts, resolve them by accepting one version or the other (nothing complicated). Then I run  git add file;  then git rebase --continue;
18:48 lmat I get the error: "No changes - did you forget to use 'git add'?"
18:49 Rodya_ joined #git
18:49 lmat What do I do now? Conflicts are resolved in the file, but now they show as "no change" (so they're not eligible for git add treatment).
18:49 osse rebase --skip
18:49 lmat osse: thanks!
18:50 mdw_ joined #git
18:50 lmat osse: So...what did this do? ^_^
18:50 interne7y joined #git
18:50 lmat osse: Does that mean the commit isn't rebased?
18:50 osse The commit is
18:51 osse *Drumroll*
18:51 osse skipped
18:51 tgies joined #git
18:51 lmat osse: ;-)
18:51 lmat So I guess that means I was editing out my commit when resolving conflicts.
18:53 star_prone joined #git
18:53 lmat I'm rebasing like two dozen commits. Every one of them conflicts :-(
18:53 Rish joined #git
18:56 Guest35452 joined #git
18:56 tgies joined #git
18:56 ramsub07 hello, i want to pull a branch from a collaborator's clone and i need to checkout to that branch simultaneously. How do i go about ?
18:57 kriskropd joined #git
18:57 octocat joined #git
18:57 lmat ramsub07: there are instructions toward the bottom of git help remote ("Add a new remote, ...")
18:58 ramsub07 lmat: i have added the new remote
18:58 ramsub07 how do i pull from that repo and checkout simultaneously ?
18:59 Sasazuka joined #git
19:00 lmat ramsub07: What do you care if it's simultaneous?
19:00 sargas joined #git
19:00 paul424 joined #git
19:00 lmat ramsub07: Depending on how you added the remote, you may already have pulled all his branches.
19:00 lmat not pull, fetch.
19:01 ramsub07 lmat: i did git remote add anotherupstream <link>
19:01 ramsub07 so i need to do get fetch anotherupstream <branch_name> ?
19:01 GavinMagnus joined #git
19:02 lmat ramsub07: git fetch remoterepo branch && git co remoterepo/branch;  ?
19:02 lmat ramsub07: Or you can   git fetch --all && git co <remote>/<branch>;
19:03 drbean_ joined #git
19:03 djb-irc joined #git
19:04 fuchstronaut joined #git
19:05 dsdeiz joined #git
19:05 mdw joined #git
19:06 tgies joined #git
19:06 mda1 joined #git
19:07 mdw__ joined #git
19:07 johnmilton joined #git
19:08 bibble joined #git
19:11 tgies joined #git
19:11 tarkus joined #git
19:11 Akagi201 joined #git
19:12 tarkus How to make sure that "git init" does nothing if a repo was already initialized?
19:12 aard_ joined #git
19:12 tristanp joined #git
19:13 ar1s [ test -d .git ] then ?
19:13 samsonizzle joined #git
19:15 tristanp_ joined #git
19:16 tgies joined #git
19:16 fscala joined #git
19:17 mda1 joined #git
19:18 rominronin joined #git
19:18 ojacobson `git init` already does something safe when run in an existing repo or work tree; what are you trying to do differently?
19:21 tristanp joined #git
19:21 tgies joined #git
19:22 CEnnis91 joined #git
19:26 tgies joined #git
19:29 mizu_no_oto joined #git
19:30 johnmilton joined #git
19:31 tgies joined #git
19:32 mda1 joined #git
19:32 Juzzika joined #git
19:34 nardev joined #git
19:36 tgies joined #git
19:38 inflames joined #git
19:39 leehambley joined #git
19:41 espindola joined #git
19:41 cyan__ joined #git
19:41 tgies joined #git
19:42 samsonizzle joined #git
19:43 axisys joined #git
19:44 chachasmooth joined #git
19:45 ramsub07 joined #git
19:45 satifant joined #git
19:45 bjpenn joined #git
19:46 DolpheenDream joined #git
19:47 tgies joined #git
19:47 tristanp_ joined #git
19:49 mda1 joined #git
19:50 tristanp joined #git
19:51 interne7y joined #git
19:52 tgies joined #git
19:53 paul424 joined #git
19:54 tristanp joined #git
19:56 Rodya_ joined #git
19:57 irco joined #git
19:57 tgies joined #git
19:57 linuxmint joined #git
19:57 getynge joined #git
19:57 chachasmooth joined #git
19:58 getynge I'm new to using git, If I create a fork to a project and there is some change upstream, how do I merge those changes into my fork?
19:59 osse !sync > getynge
19:59 gitinfo [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
20:00 getynge osse: Thank you!
20:00 osse de rien, brosef
20:02 poz3idon joined #git
20:03 nardev_ joined #git
20:05 EduardoMartins joined #git
20:05 justanotheruser joined #git
20:05 tristanp_ joined #git
20:06 tgies joined #git
20:10 tristanp joined #git
20:10 yqt joined #git
20:11 Rodya_ joined #git
20:11 tgies joined #git
20:11 mmlb joined #git
20:12 tristanp_ joined #git
20:14 chachasmooth joined #git
20:14 netj_ joined #git
20:16 tgies joined #git
20:17 IWishIKnew joined #git
20:21 rominronin joined #git
20:21 mykespb joined #git
20:21 tgies joined #git
20:24 Grimm_ joined #git
20:24 pokergod joined #git
20:25 mizu_no_oto joined #git
20:25 pokergod i just checked out a feature branch.  How do i show only the changes in that branch compared to master|develop?
20:25 kus joined #git
20:26 tgies joined #git
20:26 ojacobson git log master..feature # individual commits
20:27 ojacobson git diff master...feature # in aggregate - count the dots, that is intentional
20:27 peeps joined #git
20:27 denimsoft joined #git
20:27 peeps joined #git
20:28 _rnsanchez_ joined #git
20:28 pokergod thank you
20:31 Corosauce joined #git
20:32 UTAN_dev_ joined #git
20:33 LeBlaaanc joined #git
20:36 tristanp joined #git
20:36 tgies joined #git
20:36 LeMike joined #git
20:37 ahmedelgabri joined #git
20:37 kadoban joined #git
20:38 trista___ joined #git
20:40 mohabaks_ joined #git
20:41 tristanp_ joined #git
20:41 acetakwas joined #git
20:41 tgies joined #git
20:41 jaguarmagenta joined #git
20:43 mozzarella joined #git
20:44 zincrokx joined #git
20:45 aidalgol joined #git
20:49 Guest35452 joined #git
20:50 nilg` joined #git
20:52 interne7y joined #git
20:52 SwiftMatt joined #git
20:53 Cheiron joined #git
20:56 tgies joined #git
20:56 m0viefreak joined #git
20:57 c0ded joined #git
20:58 nnyk_ joined #git
20:59 ramsub07 joined #git
21:01 fuchstronaut joined #git
21:02 tristanp joined #git
21:06 tgies joined #git
21:11 tgies joined #git
21:12 Guest1100101 joined #git
21:14 kriskropd joined #git
21:16 mizu_no_oto joined #git
21:16 tgies joined #git
21:17 SwiftMatt joined #git
21:18 acetakwas joined #git
21:20 jimmyeatworld joined #git
21:21 Orion3k joined #git
21:21 tgies joined #git
21:21 monbro joined #git
21:24 Balliad joined #git
21:25 unbalancedparen joined #git
21:26 tgies joined #git
21:27 drodger joined #git
21:29 mwhooker joined #git
21:29 mase-tech joined #git
21:29 rahtgaz joined #git
21:29 tristanp_ joined #git
21:29 mdw joined #git
21:31 trista___ joined #git
21:31 tgies joined #git
21:33 tristanp joined #git
21:34 franl joined #git
21:36 eletuchy joined #git
21:36 inflames joined #git
21:36 tristanp joined #git
21:37 raijin joined #git
21:39 mdw joined #git
21:41 eletuchy_ joined #git
21:41 tgies joined #git
21:41 rominronin joined #git
21:42 orbitphreak joined #git
21:43 boombatower joined #git
21:44 kulelu88 left #git
21:44 eletuchy joined #git
21:46 eletuch__ joined #git
21:46 tgies joined #git
21:47 raininja joined #git
21:48 acetakwas joined #git
21:48 tristanp_ joined #git
21:49 spudowiar joined #git
21:49 eletuchy joined #git
21:50 tristanp joined #git
21:51 |ifei5g00d joined #git
21:51 eletuchy_ joined #git
21:51 tgies joined #git
21:52 kriskropd joined #git
21:53 interne7y joined #git
21:54 exawatts joined #git
21:54 eletuchy joined #git
21:55 zincrokx joined #git
21:55 mwhooker joined #git
21:57 eletuchy_ joined #git
21:58 SwiftMatt joined #git
22:00 eletuchy joined #git
22:01 tvw joined #git
22:01 tgies joined #git
22:04 eletuchy_ joined #git
22:05 blackwind_123 joined #git
22:05 tristanp_ joined #git
22:06 eletuch__ joined #git
22:06 tgies joined #git
22:08 tristanp joined #git
22:09 eletuchy joined #git
22:09 trista___ joined #git
22:11 eletuchy_ joined #git
22:11 sctskw joined #git
22:13 nadim joined #git
22:14 eletuchy joined #git
22:15 bibble joined #git
22:16 tgies joined #git
22:19 CalimeroTeknik joined #git
22:20 SwiftMatt joined #git
22:21 tlaxkit joined #git
22:22 tgies joined #git
22:25 jstimm joined #git
22:27 tgies joined #git
22:27 cdown_ joined #git
22:30 CEnnis91 joined #git
22:31 tristanp joined #git
22:32 radsy joined #git
22:32 tgies joined #git
22:34 tristanp_ joined #git
22:35 ochorocho__ joined #git
22:36 tristanp joined #git
22:39 xlegoman joined #git
22:40 ToBeCloud joined #git
22:42 tgies joined #git
22:42 jaguarmagenta joined #git
22:47 tgies joined #git
22:48 mizu_no_oto joined #git
22:49 tristanp_ joined #git
22:52 tgies joined #git
22:52 tristanp joined #git
22:54 interne7y joined #git
22:55 hekto joined #git
22:56 knutstrut joined #git
22:57 tgies joined #git
22:58 GavinMagnus left #git
22:59 Goplat joined #git
23:01 rafalcpp joined #git
23:01 dreiss joined #git
23:02 tgies joined #git
23:03 italoacasas joined #git
23:04 lindenle joined #git
23:07 eletuchy joined #git
23:07 tristanp joined #git
23:09 Noldorin joined #git
23:11 tgies joined #git
23:12 tristanp_ joined #git
23:12 mda1 joined #git
23:14 Eryn_1983_FL hi guys
23:15 tristanp joined #git
23:17 z1haze left #git
23:18 |meta joined #git
23:19 sarbs joined #git
23:20 justanotheruser joined #git
23:20 ffabi joined #git
23:21 dsantiago joined #git
23:22 tgies joined #git
23:23 mda1 joined #git
23:23 mizu_no_oto joined #git
23:25 Eryn_1983_FL um i can do a git pull origin master but i cant do my other branches? is there a way i can make my git repo do that?
23:26 lindenle joined #git
23:27 tgies joined #git
23:28 alex1a_ joined #git
23:28 ffabi joined #git
23:28 mablae_ joined #git
23:32 tgies joined #git
23:33 rkazak joined #git
23:35 fuchstronaut joined #git
23:36 drodger joined #git
23:37 tgies joined #git
23:37 liquidjamm joined #git
23:37 tristanp joined #git
23:39 jstimm joined #git
23:39 rgrinberg joined #git
23:40 denimsoft joined #git
23:42 tgies joined #git
23:42 tristanp_ joined #git
23:43 rominronin joined #git
23:44 mingrammer__ joined #git
23:45 tristanp joined #git
23:45 drodger joined #git
23:46 mattfoo joined #git
23:47 tgies joined #git
23:48 Guest35452 joined #git
23:49 hahuang65 joined #git
23:51 gsingh joined #git
23:52 tristanp joined #git
23:52 Spacew00t joined #git
23:52 tgies joined #git
23:53 endiruna joined #git
23:54 Akagi201 joined #git
23:54 Goobbue joined #git
23:54 interne7y joined #git
23:55 jumpman joined #git
23:55 GavinMagnus joined #git
23:57 tgies joined #git

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