Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-27

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

All times shown according to UTC.

Time Nick Message
00:00 hvxgr joined #git
00:01 de-facto joined #git
00:08 gugah joined #git
00:09 matoro joined #git
00:12 gugah joined #git
00:13 theiostream joined #git
00:13 ReenignE- joined #git
00:15 cqi joined #git
00:18 jokajak joined #git
00:19 l4v2 joined #git
00:20 zipeya joined #git
00:23 jokajak joined #git
00:23 ReenignE- joined #git
00:27 mda1 joined #git
00:41 bronson joined #git
00:43 gugah joined #git
00:44 pks joined #git
00:44 mehola joined #git
00:53 misosoup joined #git
00:56 nckpz joined #git
00:58 jab416171 joined #git
01:01 safe joined #git
01:04 orbyt_ joined #git
01:06 d^sh joined #git
01:07 hahuang65 joined #git
01:09 l4v2 left #git
01:09 finalbeta joined #git
01:11 bsanford joined #git
01:14 Cavallari joined #git
01:15 l4v2 joined #git
01:16 dreiss joined #git
01:18 l4v2 left #git
01:19 snowkidind joined #git
01:20 alexandre9099 joined #git
01:25 re1 joined #git
01:26 dsdeiz joined #git
01:28 Cabanossi joined #git
01:28 Goplat joined #git
01:28 menip joined #git
01:28 cam27 joined #git
01:31 chigang joined #git
01:31 WhiskerBiscuit joined #git
01:32 cam27 joined #git
01:34 cyphase joined #git
01:34 mizu_no_oto joined #git
01:36 fstd_ joined #git
01:39 Gustavo6046 joined #git
01:39 cam27 joined #git
01:40 theiostream joined #git
01:46 cyberz joined #git
01:46 cam27 left #git
01:46 cam27 joined #git
01:46 LeBlaaanc joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 cam27 joined #git
01:52 pks_ joined #git
01:57 dreiss joined #git
01:57 eclecticjohny joined #git
01:59 jameser joined #git
02:03 d^sh joined #git
02:05 pzp joined #git
02:08 chachasmooth joined #git
02:11 sunrunner20 joined #git
02:13 Gsham joined #git
02:14 Nilesh_ joined #git
02:15 bezhermoso joined #git
02:17 bsanford joined #git
02:18 webdev007 joined #git
02:21 Rodya_ joined #git
02:22 LeBlaaanc joined #git
02:22 lagothrix joined #git
02:25 orbyt_ joined #git
02:29 Rodya_ joined #git
02:29 Emperor_Earth joined #git
02:29 hexagoxel joined #git
02:30 MacWinner joined #git
02:34 aidalgol joined #git
02:37 matoro joined #git
02:42 bronson joined #git
02:47 dsdeiz joined #git
02:47 dsdeiz joined #git
02:49 sammyo joined #git
02:51 hvxgr joined #git
02:52 ahrs joined #git
02:52 jeffreylevesque joined #git
02:52 dsdeiz joined #git
02:52 mizu_no_oto joined #git
02:58 kbeflo joined #git
02:58 mizu_no_oto joined #git
02:59 Vortex34 joined #git
03:00 aavrug joined #git
03:00 z8z joined #git
03:01 de-facto joined #git
03:02 flegent joined #git
03:02 cqi joined #git
03:03 cqi joined #git
03:03 LeBlaaanc joined #git
03:05 shinnya joined #git
03:06 ojdo joined #git
03:11 Cabanossi joined #git
03:14 Andrew_K joined #git
03:20 Isla_de_Muerte joined #git
03:22 tristanp joined #git
03:22 flegent joined #git
03:24 andrew710 joined #git
03:25 cyberz joined #git
03:30 Gsham joined #git
03:36 pks joined #git
03:48 bariscant joined #git
03:49 Rodya_ joined #git
03:56 Cabanossi joined #git
03:57 a_thakur joined #git
03:57 rchavik joined #git
03:58 a_thakur joined #git
04:01 nckpz joined #git
04:01 midnightmagic joined #git
04:04 chipotle joined #git
04:12 tubaman joined #git
04:13 robotroll joined #git
04:14 mostlybadfly joined #git
04:25 Peuc joined #git
04:29 elinux joined #git
04:29 ayogi joined #git
04:31 Oatmeal joined #git
04:39 pks joined #git
04:42 stevenbenner joined #git
04:43 stevenbenner joined #git
04:43 bronson joined #git
04:45 raijin joined #git
04:46 holodoc joined #git
04:49 stevenbenner joined #git
04:52 Skyfinn joined #git
04:56 Cabanossi joined #git
04:56 fakenerd joined #git
04:57 pks joined #git
04:57 fuzzybear3965 joined #git
05:00 chipotle joined #git
05:01 venmx joined #git
05:02 dreiss joined #git
05:03 dec0n joined #git
05:06 jozwior joined #git
05:08 flegent joined #git
05:11 rscata joined #git
05:20 Skyfinn joined #git
05:21 Brski joined #git
05:25 imack joined #git
05:26 Cabanossi joined #git
05:29 PtxDK joined #git
05:30 zefferno joined #git
05:30 jozwior_ joined #git
05:31 jozwior joined #git
05:32 z8z joined #git
05:37 a_thakur joined #git
05:40 sbulage joined #git
05:41 dersand joined #git
05:41 myhau joined #git
05:42 a_thakur joined #git
05:44 MrWoohoo joined #git
05:46 kharloss joined #git
05:47 cyphase joined #git
05:47 MathNeverEnds joined #git
05:49 MathNeverEnds I have a local copy of a branch I am working on, but a partner has created a new branch with a bunch of stuff I need to migrate to my local copy.
05:49 MathNeverEnds but his branch has old files ive improved already
05:49 MathNeverEnds how do i do this without overwriting my files
05:51 drodger joined #git
05:53 Rodya_ joined #git
05:57 Raging_Hog joined #git
05:57 tazle_ joined #git
05:59 ThomasLocke joined #git
05:59 ThomasLocke joined #git
06:02 Chch joined #git
06:04 Jan2 joined #git
06:07 freimatz joined #git
06:08 lb1c joined #git
06:11 acetakwas joined #git
06:11 Assault joined #git
06:11 Cabanossi joined #git
06:14 ePirat joined #git
06:14 ePirat good morning
06:14 ePirat I am having a very weird problem with git…
06:15 ePirat I can't git clone repos of a specific host using https
06:15 BadApe joined #git
06:15 ePirat but as soon as I use any of the verbose logging env variables to debug it, it works.
06:16 chele joined #git
06:16 ePirat in this specific case, git clone https://git.xiph.org/opus.git
06:17 neunon joined #git
06:18 Wulf joined #git
06:18 kharloss joined #git
06:19 Wulf Good Morning! I deleted some files from my working dir, in "git status" they show as "deleted" in red colour. How can I delete them from the index too?
06:19 cyberz joined #git
06:20 Wulf I could delete each file with git rm. But looking for a command that deletes all deleted files at once
06:20 Taikibansei joined #git
06:21 kadoban Wulf: git add -A .  if you have no other unstaged changes, otherwise -A with narrowing it down
06:22 MineCoins joined #git
06:22 ePirat interesting, seems it does actually clones it but just gives no output anymore… except the "Cloning into 'opus'..." line
06:22 mehola joined #git
06:22 ePirat but not the usual "counting objects…" stuff
06:25 dreiss joined #git
06:26 Wulf kadoban: no, that would add stuff that I don't want to add
06:26 kadoban Then specify with globs or otherwise
06:29 makinen left #git
06:30 roentgen joined #git
06:32 fbwnd joined #git
06:33 ok91 joined #git
06:33 dreiss joined #git
06:36 jnavila joined #git
06:36 jstimm joined #git
06:38 kharloss_ joined #git
06:41 kyan joined #git
06:44 bronson joined #git
06:48 rokups joined #git
06:48 ti2 Wulf: You do already know the 'git rm --cached FILE' thing, don't you?
06:50 Wulf ti2: yes, but I have to specify FILE, don't I?
06:50 osse you can specify many at once, or a whole dir
06:50 osse or use *
06:51 matoro joined #git
06:51 osse i think git add parentdir also works
06:51 Wulf Not what I'm looking for
06:52 thiago * doesn't catch files that don't exist
06:52 thiago Wulf: just commit with -a. It'll make the deletion permanent.
06:52 osse Wulf: what you're looking for doesn't exist unless you script it yourself. we're giving you alternatives that do exist
06:53 osse Wulf: git diff --name-only --diff-filter=D -z | xargs -0 git rm
06:54 Wulf osse: thanks, this looks good
06:56 nikitasius joined #git
06:57 kyan Hi, how can I get git to pull changes? It's complaining, even though git status indicates the working tree is clean: https://gist.github.com/ethus3h/43575e563c5ef849f734d00127811690
06:57 drodger joined #git
06:58 thiago kyan: you probably hae those 10000 files ignored
06:58 thiago remove them
06:58 thiago git clean can help
06:58 plexigras joined #git
06:58 kyan They're not in my .gitignore.
06:59 kyan (Unless I radically misunderstand .gitignore syntax.)
06:59 kyan https://gist.github.com/ethus3h/e4c8794eb41fbd8ebc01da68f94a15fb
06:59 bsanford joined #git
07:00 thiago well, Git wants those files gone
07:00 thiago try to move them out of the way
07:00 thiago you can't pull while they're there
07:00 jast yeah, that should ignore files and directories (plus all of their contents) of those names, anywhere in the tree
07:00 kyan jast: (was that to me? if so, I don't understand...)
07:01 kyan thiago: Cool, I tried a thing that was suggested on GitHub to do that (git clean  -d  -fx "") but it deleted a mess of important stuff and I had to restore from backup
07:01 kyan What's the right way to do it?
07:02 jast that's what 'git clean' is supposed to do: recursively delete all untracked files
07:02 thiago kyan: git clean deleted the files that were ignored
07:02 jast including ignored ones (-x)
07:02 thiago kyan: the point is that git can't pull while those files are in the way
07:02 thiago the commit you're trying to pull has those files
07:02 thiago but they are not in your current commit
07:02 kyan Ok, but I only want to delete those ~18k files causing collisions, not all my other projects ever
07:02 thiago you need to either delete them or move them out of the way
07:03 jast you have that many projects in a single repository?
07:03 kyan The git clean -x seemed to go nuclear on my stuff
07:03 thiago -x means "include ignored"
07:03 jast yeah, 'git clean' isn't exactly selective
07:03 thiago there's no option to delete only ignored
07:03 kyan No, I have a mess of projects all in this folder, but they're mostly in different repositories
07:03 jast there is... -X. but that might be too much, too.
07:04 thiago try moving everything away, pull, then move back
07:04 kyan This folder is itself two different git repositories
07:04 xaa joined #git
07:04 jast so you have nested repositories?
07:04 thiago no, it's just one
07:04 kyan I swap the GIT_DIR environment variable out to manage two subsets of folders within this folder
07:04 thiago you may think you have two, but Git only works on one at a time
07:04 kyan manage it with bash scripts
07:04 jast oh, I see
07:05 jast well, now you're seeing one of the downsides of that...
07:05 thiago agreed
07:05 thiago you created this mess
07:05 thiago now you get to live with it
07:05 kyan I guess, but I wish I understood why git is considering those files as "ignored" when they aren't
07:05 jast since git only knows about one of the sets of files at a time, there is nothing automatic you can do to remove precisely those files that are in the way... short of maybe parsing the output of 'git pull'
07:05 thiago kyan: it's something that isn't in your paste
07:05 kyan for instance, it's complaining about Futuramerlin Projects/Data/Stream Registry/f/f/f/fff9a64a57bf24ce908415f2e8464e0c47b00e3930aa1f5732fa9756f748bde5ef642f2869c189df7007f273f994242e08b5186bcad6dbc20176e411a3c91d0b
07:06 thiago kyan: either .git/info/excludes, or .gitignore in the subdirs, etc.
07:06 kyan That file isn't matched by any of the .gitignore entries
07:06 kyan thiago: Ah, forgot about .git/info/excludes. You can have .gitignore in subdirectories?!
07:06 jast yes you can
07:06 jast to troubleshoot ignore issues, there's git check-ignore
07:07 kyan cat "$GIT_DIR"/info/excludes says no such file or directory...
07:07 kyan running find . -name ".gitignore" now
07:07 kyan jast: ooh, that sounds handy, thanks :D
07:08 djb-irc joined #git
07:08 thiago there's also the fact that by switching $GIT_DIR, your index is out of sync
07:08 kyan (sudo find . -name ".gitignore" | grep Futuramerlin doesn't find anything, fwiw)
07:08 kyan thiago: hmm? I thought the index was in my GIT_DIR
07:09 wxg joined #git
07:09 thiago exactly
07:09 thiago that's why it will be out of sync
07:09 akkad joined #git
07:09 jast not necessarily, but I guess there could be situations in which it happens
07:09 kyan (I'm not really sure what you mean by out of sync, sorry)
07:10 jast though if the two sets of files are disjoint it could really only happen by accident
07:11 kyan git check-ignore says that file I mentioned above as being one of the culprits is not ignored: https://gist.github.com/ethus3h/90d03ebbbd18e10531dfbe6b49ea275d
07:11 kyan (at least, it doesn't mention it in the output)
07:12 kyan was hoping to avoid it, but I guess the easiest way to solve the problem is to just chunk up the list of problematic files and delete them manually
07:12 kyan kind of a pain because bash is always like, "sorry you have too many arguments"
07:13 kyan I guess I'm just argumentative that way
07:13 thiago did you also set $GIT_WORKTREE?
07:13 thiago use xargs to break down the list
07:14 * kyan looks at the script
07:14 kyan thiago: oooh, I didn't know that was what xargs does. This is an exciting revelation for me, thanks :D
07:15 kyan I set $GIT_WORK_TREE, which I assume is right?
07:16 kyan (has an extra underscore vs. what you said?)
07:16 jast yeah, that's the one
07:16 kyan cool cool
07:16 jast those files that are in the way, are they in a nested git repository, per chance?
07:16 kyan No, although this is kind of a nested git repo itself
07:16 elect joined #git
07:17 jast I'm asking because normally git doesn't look inside nested repos when looking for untracked files (but a 'git pull' does look because overwriting them would be bad :))
07:17 kyan (the parent repo in / contains two submodules, each of which contains several more submodules, one of which contains the repository I'm working in right now as a third-level submodule, except with its working tree in the top directory)
07:18 netroxen joined #git
07:18 jast actually I just checked, maybe this changed. the nested repo shows up as an untracked directory.
07:18 luke_nukem joined #git
07:18 thiago by setting GIT_WORK_TREE, note that the files in question are not in your current dir
07:19 thiago it's where the variable points to
07:19 kyan Right, my script cds to the GIT_WORK_TREE for me
07:20 kyan Oh, well, I don't think there are any ".git"s in folders enclosing the problem files: sudo find Futuramerlin\ Projects -name ".git" turns up nothing
07:20 kyan so I don't think those would make it a problematically nested repository
07:20 kyan I think the xargs solution will fix this one though :D
07:20 fbwnd joined #git
07:22 venmx joined #git
07:23 netroxen Is it possible for the sake of refactoring a working directory, to initiate a Git repo over a directory. So to inherit commits and so on, and to see the differences..?
07:23 Silenced joined #git
07:24 netroxen I have a package which needs to be updated to a new structure, instead of creating it myself there's already an installer/cookiecutter type setup for this. However I want to inherit the commits on that new dir..?
07:24 netroxen Not sure if this makes sense..?
07:25 Teny joined #git
07:25 Darcidride joined #git
07:26 thiago no, it doesn
07:26 thiago it doesn't
07:26 Cabanossi joined #git
07:27 kyan thiago and jast, xargs rm < /home/kyan/2017mar26a27-filenames.txt did the trick, thanks! :D (just copied and pasted the problem file list from git pull into that file and escaped the spaces, since the filenames were all fairly straightforward (no newlines or stuff))
07:28 ShapeShifter499 joined #git
07:28 kyan the repository seems to be all happy and back to normal again :D
07:30 jast well, that was more work than it should have been, but at least it's over :)
07:32 kyan (the source of the problem was me trying to undo some commits while keeping my local changes, but going back too far and trying to git pull to get up to date)
07:34 kyan Oh, interesting, it seems like git stash didn't stash those files it was complaning about either
07:36 diogenese joined #git
07:39 Doginal joined #git
07:41 octo8 joined #git
07:41 octo8 Hello, any resources that will make me professional in githooks?
07:42 sQVe joined #git
07:42 jast man githooks :)
07:42 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
07:42 Balliad joined #git
07:43 dreiss joined #git
07:43 ssarah joined #git
07:44 jnavila_ joined #git
07:46 schleppel joined #git
07:47 imack joined #git
07:51 thinkpad joined #git
07:54 Ardethian\work joined #git
07:55 Rodya_ joined #git
07:59 leeN joined #git
08:01 MonkOfCity joined #git
08:02 mikecmpbll joined #git
08:03 choice joined #git
08:04 choice Hello! Do you guys user a bare dev repository AND a dev repository?
08:04 ytrjkr joined #git
08:04 a_thakur joined #git
08:04 MonkOfCity joined #git
08:05 dvaske joined #git
08:06 imack joined #git
08:06 acetakwas joined #git
08:07 netj joined #git
08:12 ujjain joined #git
08:12 ujjain joined #git
08:12 MonkOfCity joined #git
08:12 alexandre9099 joined #git
08:13 Tobbi joined #git
08:15 jokajak joined #git
08:17 ariver joined #git
08:17 Lunatrius` joined #git
08:17 achadwick joined #git
08:18 jokajak joined #git
08:19 kristofferR joined #git
08:20 marcogmonteiro joined #git
08:22 de-facto joined #git
08:22 sQVe joined #git
08:24 notebox joined #git
08:25 jokajak joined #git
08:25 jokajak joined #git
08:27 Cabanossi joined #git
08:27 kbeflo joined #git
08:28 ssarah joined #git
08:31 bariscant joined #git
08:35 ssarah joined #git
08:37 acetakwas joined #git
08:41 karols146 joined #git
08:41 clmsy joined #git
08:41 zipeya joined #git
08:45 bronson joined #git
08:45 Murii joined #git
08:45 choice When doing the following, what does the '*:*' mean? git push reponame '*:*'
08:45 fatalhalt joined #git
08:45 osse choice: push all refs to reponame with the same names
08:46 choice Hmm... what would be different when just doing this? git push reponame
08:46 canton7 choice, (for an explanation, see '<refspec>...' in man git push - refspecs have the form <src>:<dst>)
08:46 gitinfo choice: the git-push manpage is available at http://jk.gs/git-push.html
08:46 govg joined #git
08:46 osse choice: then it will consult the config to determine what to use
08:47 canton7 'git push remotename *:*' should be the same as 'git push remotename --mirror', I think?
08:47 osse choice: most likely it will be the equivalent to 'refs/heads/blah:refs/heads/blah' where blah is the current branch name
08:47 choice Unfortunately, I don't know what refs are.
08:47 canton7 choice, see 'push.default' in man git config for an explanation of what 'git push' or 'git push remotename' will do, if you don't specify a branch
08:47 gitinfo choice: the git-config manpage is available at http://jk.gs/git-config.html
08:48 choice I guess '*:*' would push all branches?
08:48 osse all branches, all tags, all notes, all everything
08:48 choice I see. I don't know what tags and notes are though.
08:48 osse man git-tag, man git-notes
08:48 gitinfo the git-tag manpage is available at http://jk.gs/git-tag.html
08:48 gitinfo the git-notes manpage is available at http://jk.gs/git-notes.html
08:49 choice Will "git show-ref" show all refs?
08:50 ssarah joined #git
08:51 mehola joined #git
08:56 Rodya_ joined #git
08:56 bariscant joined #git
08:56 osse yers
08:57 sbulage joined #git
08:57 ronskisika joined #git
08:57 Cabanossi joined #git
08:57 mehola joined #git
08:58 choice Awesome. Only the master branch.
08:58 masuberu joined #git
08:58 luke_nukem left #git
09:00 jokajak joined #git
09:00 permalac joined #git
09:01 rominronin joined #git
09:03 overlord_tm joined #git
09:04 zerow joined #git
09:07 ij If I just pushed a new branch, can I set its upstream without fetching?
09:07 osse ij: push -u
09:07 osse ij: oh... branch -u
09:08 ij branch -u? No, push -u was right.
09:09 permalac joined #git
09:09 thesquib joined #git
09:11 choice Do you guys push directly to a dev repo or have a bare repo between you and dev?
09:12 ij There's usually a remote bare repo everyone syncs with.
09:12 jokajak joined #git
09:13 basy joined #git
09:13 Joost anyone know why cgit might be showing different download links for snapshots on the summary page as opposed to the tag page?
09:13 Joost i.e. on a tag page, the name of the repo is included in the file name
09:13 Joost I'd want that on the summary page as well, but that only lists [tagname].tar.gz
09:14 Joost note that this seems to occur for both simple and annotated tags
09:14 maroloccio joined #git
09:14 fees joined #git
09:15 ferr1 joined #git
09:15 CaptainHeavy joined #git
09:18 ssarah joined #git
09:18 King_Hual joined #git
09:18 mischat joined #git
09:19 jokajak joined #git
09:19 selckin joined #git
09:21 kexmex joined #git
09:23 govg joined #git
09:23 Lunatrius` joined #git
09:24 ssarah joined #git
09:25 courrier joined #git
09:25 pinkkis joined #git
09:26 basy left #git
09:26 Lunatrius joined #git
09:27 Cabanossi joined #git
09:32 ertes could someone please recommend a git GUI for mac that non-programmers can use?  it should handle branches and merging well
09:33 muhannad___ joined #git
09:35 ertes we're basically using subversion workflows right now, and even a poor form of that: only a master branch, and copying around between directories…  i really want to get proper git workflows into the team, and i strongly believe it's not gonna happen, unless i can recommend a GUI
09:37 friendly_fiend joined #git
09:38 henriknj joined #git
09:38 venmx joined #git
09:38 Joost ertes: Github's client is pretty ok
09:38 Joost (also for non-github repos)
09:39 Joost not sure how it does branches but in general my dad was able to use it pretty easily without any version control experience (or IT in general)
09:39 ertes Joost: that one requires a github repo though
09:39 Joost it doesn't
09:39 ertes it doesn't?
09:40 Joost nope, you can also import local repos
09:40 ertes ah, they have a desktop client?  let me check
09:40 Joost yeah, it's pretty fancy
09:41 ertes ah, "github desktop", i see
09:41 Joost it's quite visual wrt branches
09:41 ertes thanks, i'll check it out
09:45 octo8 Hello, this is the system we are planning to do for git, we talk to github, and github reflects the changes to the live version via hooks, see image http://i.imgur.com/AYAlLPO.png ... is there anything better ?
09:46 bremner does github handle hooks now?
09:47 Joost bremner: quite extensively https://developer.github.com/webhooks/
09:47 bremner cool.
09:48 Joost it's not like they're running shell code though; it's an outgoing POST
09:50 bremner I see. So you'd need some http / cgi /whatever handler
09:51 ugjka joined #git
09:51 Joost yeah
09:52 salvo joined #git
09:52 sbasso joined #git
09:52 mehola joined #git
09:53 eahmedshendy joined #git
09:53 mehola joined #git
09:54 choice When doing "git diff --staged" and the firs line reads "diff --git a/a b/a" - what does that mean?
09:54 mehola joined #git
09:55 grawity more or less just that it's a Git-format unified diff between these two files
09:55 grawity where 'a/' and 'b/' are made-up prefixes for old and new
09:56 choice i see
09:56 grawity (you can tell it to use 'o/' and 'n/' for example)
09:56 choice And then "index c4fd449..fc583ca 100644" .. what is that?
09:56 Rodya_ joined #git
09:57 grawity that it's a diff between these two blob objects, both having the filemode 100644
09:57 choice Interesting.
09:57 choice And "--- a/a" in the next line?
09:57 grawity (I think the index line used by `git apply` in some cases, though not really required in general)
09:58 minn joined #git
09:58 grawity and everything else is the same as standard `diff -u` unified diffs: --- describes the 'old' file, +++ describes the 'new' file, @@ marks the start of a new hunk (position and length)
09:58 bariscant joined #git
09:59 osse ij: branch -u is for when you have already pushed
09:59 ij osse, Right. :)
10:00 troulouliou_div2 joined #git
10:03 choice grawity: So the "--- a/..." and "+++b/..." will *always* be outputted?
10:03 grawity yes
10:03 grawity why?
10:04 mdw joined #git
10:07 dimi1947 joined #git
10:08 choice Seems kind of redundant then.
10:08 choice If it has no informational value.
10:08 osse it does if the fiel has changed name or location
10:09 osse or when you're explicitly diffing two different files
10:09 osse but that's somewhat a rationalization. it's probably there because that's what diff -U does
10:09 howdoi joined #git
10:10 qt-x joined #git
10:10 choice Ok. I think I will see it when I use it more.
10:10 zeroed joined #git
10:10 howdoi is there a way to take the diff between latest tag and the current branch?
10:11 choice What is a tag?
10:11 howdoi git tag
10:11 a_thakur joined #git
10:11 howdoi something like git diff ...v1.0.0
10:12 canton7 choice, can I recommend you read !book ?
10:12 gitinfo choice: 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
10:13 sQVe joined #git
10:13 choice I only listen to audio books.
10:14 canton7 choice, you're happy to ask people on IRC what a tag is - I don't see the difference between reading the answer here (in text), or in Pro Git?
10:14 paul424 joined #git
10:15 osse howdoi: git diff HEAD v1.0.0
10:15 osse howdoi: or  git diff  ..v1.0.0
10:18 mischat joined #git
10:18 choice Is there a way to preview a pull? I do not mean fetch. I mean without making any changes.
10:19 21WAAXP5Q joined #git
10:19 canton7 choice, preview what the output of the merge will be? No. Just do it, and roll it back afterwards if it's not what you want
10:19 choice Roll back?
10:20 canton7 yes, undo the merge
10:20 choice With which command?
10:20 friendly_fiend joined #git
10:20 i7c fetch does not change anything except updating your remote refs.
10:20 canton7 git reset. Maybe it's time to read that book ;)
10:20 i7c You can diff to a remote ref
10:21 osse I highly recommend fetching often and always
10:21 osse fetch and status as often as human(e)ly possible
10:21 i7c That’s why you alias git status to g s
10:21 i7c :p
10:21 howdoi osse: it's empty :(
10:22 ij or gst
10:22 dcpc007 hi all, is there an official repo to get git "up-to-date" or near on Centos 6.x stations ? (centos officials are 1.7.1 .... and rpmforge should not be used since some times
10:22 i7c I doubt that there is an official way to get git up to date on centos :D
10:22 choice How about git fetch --dry-run ?
10:23 osse howdoi: then there is no difference
10:23 i7c Centos is like the definition of aging software.
10:23 dcpc007 i'm looking on other third aparty repo (like epel or nux-desktop ... but seems ko)
10:23 canton7 choice, as others have said, 'fetch' only updates the remote-tracking branches, e.g. those that start with 'origin/'. It does not alter your local branches. It is safe to run 'git fetch' at any point - it won't overwrite anything
10:23 dcpc007 is github/git official ?
10:23 dcpc007 https://coderwall.com/p/w1t00a/upgrade-git-to-2-5-2-in-centos-6-4-through-yum
10:24 i7c github git is "official", yes.
10:24 canton7 choice, so if you want to see what some remote branches look like, run 'git fetch' and then inspect the stuff under origin/
10:24 howdoi osse: strange
10:24 choice canton7: Where is origin/ ?
10:24 e maybe worth noting that that is not true for fetch commands in general
10:24 canton7 choice, ... but a pull = a fetch + a merge. If you want to see the output of that merge, you'll need to do the merge
10:24 canton7 choice, e.g. 'git log origin/master', 'git diff <something>..origin/master'
10:24 dcpc007 i7c: thx, will try, but really not an easy task to deploy after :(
10:24 e it's true for 'git fetch' but fetch can be induced to overwrite local refs
10:24 i7c dcpc007, git is rather easy to build.
10:25 canton7 choice, if you were prepared to read a book, this stuff would be explained much more clearly than I can do on here
10:25 howdoi $ git pull origin
10:25 howdoi Already up-to-date.
10:25 howdoi but I am sure there must be updates, as I have merged many PRs to that branch
10:25 howdoi osse: ^
10:25 dcpc007 yes maybe, but would stick to centos stanrd location and rules for other tools compatibility
10:25 i7c dcpc007, if you’re familiar with the usualy process of building with autotools and make.
10:25 i7c dcpc007, mhm yeah
10:26 i7c dcpc007, git 1.7.x is pretty old tho :-/
10:26 e howdoi: origin ain't a branch
10:26 osse howdoi: i can't say anything more. if 'git diff HEAD v1.0.0' doesn't print anything then there are no differences between HEAD and v1.0.0
10:26 i7c Became much more user-friendly with 1.8 and later
10:26 minn What's the correct way to diff a file in a non-initial commit against /dev/null?
10:26 grawity for what purposes?
10:26 grawity just making an "add this file" patch?
10:26 canton7 minn, isn't that just... look at the file?
10:27 sbasso joined #git
10:27 wget Hi guys. I was wondering if this was possible to clone from gitweb:
10:27 wget https://git.proxmox.com/?p=dab-pve-appliances.git;a=shortlog;h=refs/heads/master
10:28 i7c There’s the obvious way git diff /dev/null /path/to/file
10:28 grawity --no-index
10:28 i7c Optional if file is in a repo
10:28 i7c but yes.
10:29 NeverDie joined #git
10:29 grawity wget: not via gitweb itself, but git://git.proxmox.com/git/dab-pve-appliances.git
10:29 minn roughly yes, grawity. it would fit nicely without a pipeline for scraping some data
10:29 minn i7c - hmm, i tried variations on that syntax (with --no-index) but couldn't figure out how to specify the commit. I will try harder.
10:29 pickfire git diff --color-words from tests seem to work but when I do it manually, it fails.
10:30 i7c Mhm I don’t think you can mix --no-index with a specific commit
10:30 Doginal joined #git
10:30 freimatz joined #git
10:30 i7c Would have to checkout that commit, I suppose.
10:30 IRQ` joined #git
10:31 i7c minn, maybe git show commit:file is what you want?
10:31 i7c Is not in diff/patch syntax tho.
10:31 Doginal joined #git
10:31 pickfire https://transfer.sh/12WbZi/2017-03-27-183020_1366x768_scrot.png
10:31 minn i7c: Yeah, that's what I'm using otherwise; but it doesn't work in that case.
10:32 pickfire Is it supposed to be like that?
10:32 howdoi e: was right, my bad, sorry osse
10:32 howdoi flag to ignore a path during git diff?
10:32 minn Well, StackOverflow is informing me that git diff h commit:file, where h is the hash object for then null tree, works.
10:33 howdoi as in git diff ..v1.0.0 --ingnore=[]
10:33 canton7 ah, that's a good idea
10:33 minn That's seems kind of hackish, but it does work.
10:34 choice Strange, running "git fetch --dry-run" once creates a different output then when running it the second time.
10:34 choice So it did changes?
10:35 choice In fact, it added a bunch of files in .git/objects/
10:35 choice What kind of dry run is that?
10:35 osse howdoi: git diff .... -- . :!notthispath
10:36 finalbeta joined #git
10:37 dcpc007 i7c i know, i work on debian even oldstable is more recent + backports ...
10:37 dcpc007 and on windows i add a babun for users, with git V2
10:37 qt-x joined #git
10:37 dcpc007 i find a little dangerous to stick with V1 and V2 mixed
10:38 osse choice: it doesn't update the refs.
10:38 osse the docs don't make that clear
10:38 osse should've been --just-damp-run-not-dry-but-not-wet-either
10:39 afuentes joined #git
10:39 howdoi osse: wow!
10:39 choice Ok, now I fetched. How do I see what would change if I accepted the changes?
10:40 diogenese joined #git
10:41 osse choice: you can run git diff or git log on the thing that git fetch prints
10:41 osse the abcd123..def6789 thing
10:41 choice What if I fetched yesterday and cannot see that abc123 thing anymore?
10:42 choice Also, what if I fetched multiple times?
10:42 choice And want to see all the changes and decide if I like them?
10:42 osse then do git log X Y where X is where you want to accept changes into, and Y is the thing you fetched (eg. origin/master)
10:42 mazert_ joined #git
10:42 osse if you fetched multiple times: doesn't matter.
10:43 choice osse: like this? git log master /the/other/repo
10:43 osse decide: git won't automatically do it. use merge if you're happy
10:43 choice But how do I see what would be merged?
10:43 osse choice: I forgot the dots.  git log master..origin/master
10:43 choice ah!
10:43 wget grawity: thanks indeed it worked
10:44 choice osse: Awesome! Thanks!
10:45 choice osse: Is it possible to define a repo via path (/my/other/repo/) instead of "origin"?
10:45 bronson joined #git
10:46 osse choice: not really. but you can rename 'origin' to anything you like
10:46 osse ''git remote rename origin taxationistheft''
10:47 choice I don't understand that.
10:47 bremner man gittutorial explains remotes
10:47 gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html
10:48 osse choice: can you ask a question? not sure what you don't understand
10:49 choice Well, I think I understand it now.
10:49 brillenfux joined #git
10:53 NeverDie_ joined #git
10:56 Cabanossi joined #git
11:00 uwgiqq joined #git
11:01 rajat joined #git
11:07 finalbeta joined #git
11:07 johnny56_ joined #git
11:11 ryxxed joined #git
11:12 Gloomy joined #git
11:16 YuGiOhJCJ joined #git
11:18 masuberu joined #git
11:18 kexmex joined #git
11:19 mischat joined #git
11:20 lordjancso joined #git
11:22 mizu_no_oto joined #git
11:22 lowbeat joined #git
11:23 cyberz joined #git
11:23 lowbeat What is the easiest way to keep one file uncommited without getting errors when pulling and pushing all the other content ?
11:25 _ikke_ Easiest way is to not track that file at all
11:27 bariscant joined #git
11:27 lowbeat If I stop tracking that file, it will do the same for all the other members on the git as well, I just want that file to be ignored on my pc
11:32 al-damiri joined #git
11:32 _ikke_ git either ignores a file completely, or not at all
11:34 lowbeat oke, so files that point tot he environments shouldn't be tracked in the git in the first place then ?
11:35 jameser joined #git
11:35 _ikke_ exactly
11:35 muhannad___ joined #git
11:36 nowhere_man joined #git
11:36 lowbeat oke, ty :)
11:37 Silenced joined #git
11:38 sbasso joined #git
11:39 Endarked joined #git
11:40 yarekt joined #git
11:41 yarekt Hi. Is there a plumbing command for `git checkout` to check if HEAD is outdated from upstream?
11:41 dcpc007 when i do a git clone or a git checkout, what are the numbers in "Receiving objects:  14% (31332/219275)"
11:41 Cabanossi joined #git
11:41 yarekt Otherwise i'm having to do this: if [ "$(git rev-parse HEAD)" != "$(git rev-parse $(git rev-parse --abbrev-ref --symbolic-full-name '@{upstream}'))" ]; then
11:42 dcpc007 users ask me why, if git local for a checkout, it's sometimes slow (like 4-8 seconds on a big workstation)
11:42 User458764 joined #git
11:43 User458764 joined #git
11:43 dcpc007 i think their repo can be heavy, i think about 4k files/folders. and the git checkout work on 800 to 2000objects when switching between 2 versions
11:43 osse yarekt: git rev-list --count HEAD..HEAD@{upstream}
11:43 _ikke_ dcpc007: It's the amount of objects the server is sending
11:43 osse yarekt: check if it's > 0
11:43 dcpc007 (wow cloning github/git ... long :) 220k objects)
11:43 yarekt Awesome, osse ! Thanks
11:44 NeverDie joined #git
11:44 dcpc007 objects are blobs ? like if a commit impact 10 files there is 10 objects ?
11:44 _ikke_ object = {commit|tree|tag|blob}
11:44 dcpc007 (not read a lot the backend of git in docs :) )
11:45 tvw joined #git
11:45 dcpc007 ok a checkout to an aloder tab or brnach for 8 secs seems ok  in the case of 800 to 2000 objects "applyed ?"
11:46 robotroll joined #git
11:46 dcpc007 i have not the full repo, but i connect to a user computer and see its repo is 4000 files/folders (including .git) and 380Mo
11:46 dcpc007 Mb
11:47 dcpc007 MB
11:48 osse yarekt: Also awesome: use --left-right and three dots instead of two
11:48 dcpc007 i test on my local computer (the same), on some small repo, opperations are near instant, seems then it's ok with this "slow" work
11:48 rajat joined #git
11:50 yarekt Would the output otherwise be anything but 1 and above otherwise?
11:50 manuelschneid3r joined #git
11:50 osse yarekt: What do you mean?
11:50 ij What is this!? http://sprunge.us/QeSb
11:51 yarekt Like, if someone resets the repo and force pushes, My master might be ahead of theirs now
11:51 Rodya_ joined #git
11:51 aard_ joined #git
11:52 ij [In picture: git for-each output and "ambigous information for ref" error]
11:52 yarekt Actually the rest of this project will break if that happens anyway, so not too big of a problem for now
11:53 yarekt rev-list is very cool though, I keep finding solutions with it :)
11:54 kbeflo joined #git
11:54 dsdeiz joined #git
11:55 ionl joined #git
11:56 GodGinrai joined #git
11:57 Gloomy joined #git
11:58 osse yarekt: My suggested command tells you how many commits upstream has that you don't. That's all. *why* the number is what it is git can't tell you
11:59 drodger joined #git
11:59 yarekt Thats exactly what I was looking for. Something very portable and safe that says "remote has changes"
12:00 choice Do you guys use a new branch for every feature you implement?
12:00 osse yarekt: howchevre, you jsut checked if they're not equal. that's not the same thing.
12:01 osse yarekt: (which is why I hinted at the --left-right thing)
12:03 fakenerd joined #git
12:04 ionl left #git
12:06 Khisanth joined #git
12:07 jnavila_ joined #git
12:07 grumbel_ choice: For me, that very much depends on the project's size, workflow, how much collaboration there is, how big the "feature" will be (is it a 10 minute change or a 6 month project?) etc.
12:07 flaviodesousa joined #git
12:08 acetakwas joined #git
12:09 scottjl joined #git
12:09 acetakwas joined #git
12:10 SilverBe joined #git
12:11 rnsanchez joined #git
12:11 acetakwas joined #git
12:12 MonkOfCity joined #git
12:12 sQVe joined #git
12:12 acetakwas joined #git
12:13 acetakwas joined #git
12:14 mazert_ joined #git
12:14 math-alpha joined #git
12:15 acetakwas joined #git
12:16 ankit01ojha joined #git
12:17 acetakwas joined #git
12:18 bouncy joined #git
12:19 synthroid joined #git
12:19 ProblemChild left #git
12:19 pinkkis joined #git
12:20 altendky joined #git
12:20 sbasso joined #git
12:22 ahrs joined #git
12:22 Silenced joined #git
12:22 kpease joined #git
12:22 Silenced joined #git
12:23 choice grumbel_: Say a 1 hour project.
12:24 rory joined #git
12:24 osse i'm usually well into hour 3 before i run 'git init'
12:25 osse if you mean a 1 hour feature: probably not
12:25 cyberz joined #git
12:25 bariscant joined #git
12:25 a_thakur joined #git
12:26 choice Then how do you push that feature to dev?
12:26 osse i push it to the dev branch
12:26 Cabanossi joined #git
12:29 buffal0 joined #git
12:32 acetakwas joined #git
12:32 kpease joined #git
12:32 choice Does git obey .gitignore files that are in subdirectories?
12:32 osse yes
12:32 choice Is there a switch to make it ignore them?
12:32 osse choice: in which circumstances?
12:33 choice The Laravel framework comes with tons of .gitignore files in its subdirs.
12:33 choice So version control of Laravel would not be possible if git obeys them.
12:34 Brski joined #git
12:34 sbasso joined #git
12:34 osse do those files make git ignore everything?
12:34 choice I don't but I would like to make sure it does not ignore anything.
12:35 BlackMaria left #git
12:35 Raging_Hog joined #git
12:35 osse presumably these .gitignore files are suitable for a framework
12:36 choice Well, it makes it impossible to clone the whole project.
12:36 osse huh?
12:36 eclecticjohny joined #git
12:36 osse ignoring and cloning are completely separate
12:36 choice Ok, but the cloned project would diverge over time.
12:37 bremner in this channel clone means something very specific
12:37 bremner man git clone
12:37 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
12:37 osse choice: yes
12:38 choice The best way would be to disable .gitignore files altogether.
12:38 bremner since that's not happening, what is the next best way?
12:38 choice svn?
12:38 bremner feel free.
12:39 osse choice: Why do those files affect you?
12:39 osse I don't understand the underlying problem
12:39 Doginal joined #git
12:39 choice First question would be how to create a git repo in the project so that it includes all files.
12:39 scoobertron joined #git
12:39 CEnnis91 joined #git
12:40 osse isn't it already a git repo?
12:40 choice Because of the .gitignore files, a "git add *" would not include many files.
12:40 choice osse: In this case yes, but all the ignored files are not in the repo.
12:40 osse to add files that are ignored, use git add -f
12:40 osse to list files that are ignored, use git status --ignored
12:40 choice Like this? git add -f *
12:41 osse also: you can edit or remove .gitignore files
12:41 osse for example, yes.
12:41 osse or git add -f .
12:41 choice osse: If we remove them, the next laravel update might bring them back and we are fucked.
12:42 tsdev joined #git
12:42 qqx choice: Does laravel provide a way to use a specific version?
12:42 osse if you just copy files over, yes.  if you merge, no.
12:42 choice qqx: What do you mean?
12:42 Darcidride joined #git
12:42 qqx Generally frameworks will offer a way to have a single file to specify a precise version to use, and have that checked int.
12:42 qqx s/int/in/
12:42 choice osse: Well, the update would go via "composer update" or something.
12:43 qqx Then the exact files pulled in by the framework are ignored, but you still can have confidence that different checkouts won't diverge.
12:43 osse choice: also, if you add -f a file then .gitignore no longer has effect. gitignore is for ignoring untracked files. once a file is added it's added.
12:43 osse i don't know what composer update does
12:44 eclecticjohny joined #git
12:44 osse if you use the framework from source then I would use their git repo. If you don't use it from source then surely releases and such don't have these files in them?
12:45 _Vi joined #git
12:45 ij Does anyone know why this "git branch feature -tu origin/feature" complains about ambiguous refs? http://sprunge.us/QeSb
12:46 qqx choice: It appears that the answer to my initial question is yes: https://laravel-news.com/understanding-the-composer-lock-file
12:46 qqx So if you commit that file you shouldn't need to commit all of the files that are ignored by default.
12:46 leeN joined #git
12:46 bronson joined #git
12:47 cvcxc_ joined #git
12:47 perlpilot joined #git
12:49 jeffreylevesque joined #git
12:49 rtmins joined #git
12:50 rtmins joined #git
12:51 rtmins joined #git
12:51 User458764 joined #git
12:52 rtmins joined #git
12:52 dsdeiz joined #git
12:52 dsdeiz joined #git
12:52 Rodya_ joined #git
12:52 User458764 joined #git
12:52 rtmins joined #git
12:53 cam27 joined #git
12:53 User458764 joined #git
12:55 m15k joined #git
12:56 bsanford joined #git
12:57 XenophonF joined #git
12:57 metachr0n joined #git
12:57 jeffreylevesque joined #git
12:57 m15k Hi. Is it possible to push a tagged commit with not branch to a remote location? e.g. when I need to define a version number which never should land in master branch.
12:58 rtmins joined #git
12:58 grawity yeah, it's commonly done for pull requests
12:58 publio joined #git
12:59 Skyfinn joined #git
13:00 sbasso joined #git
13:01 fahadash joined #git
13:01 cdg joined #git
13:02 mischat joined #git
13:02 m15k grawity: mh. Thanks for the starting point. I'll check that.
13:02 chardan joined #git
13:03 theoceaniscool joined #git
13:03 cdg joined #git
13:04 Mo joined #git
13:04 Mo Hi, I'm inside a git clone and like to pull new changes:  but git pull says  fatal: No path specified. See 'man git-pull' for valid url syntax
13:04 gitinfo the git-pull manpage is available at http://jk.gs/git-pull.html
13:05 eclecticjohny joined #git
13:05 oskarkv joined #git
13:05 osse Mo: what does 'git status' say ?
13:05 Mo I've done a git reset --hard origin/master before.  I have no local changes I need to keep.
13:06 Mo osse: On branch master  nothing to commit, working tree clean
13:06 osse Mo: try 'git pull origin master'
13:06 chardan joined #git
13:07 medeirosthiiago joined #git
13:08 grawity though, of course, if the *tagged commit* itself is on master, then all tags will follow
13:09 notebox joined #git
13:09 marcogmonteiro joined #git
13:10 m15k grawity: I thought about that the tagged commit is not in any branch.
13:10 warthog9 joined #git
13:11 TomyWork joined #git
13:12 m15k grawity: I think I got it. I just push --tags in a local branch. And only the tags is pushed not the branch itself.
13:13 Mo osse: * branch                master     -> FETCH_HEAD     Already up-to-date.   Do I need that everytime now? git pull still fails.
13:13 osse Mo: no. ''git branch -u origin/master''
13:13 miczac joined #git
13:13 osse after that pull should work
13:14 sarri joined #git
13:14 sarri joined #git
13:15 muhannad___ joined #git
13:17 choice "git add --force" will add absolutely everything in the current directory and all subdirectories?
13:17 tribly joined #git
13:18 kbeflo joined #git
13:18 osse if you add '.' after it, yes
13:19 Gsham joined #git
13:21 CheckDavid joined #git
13:22 Mo osse: How can I see the available branches? I just read and learned a bit on https://git-scm.com/book/de/v1/Git-Branching-Einfaches-Branching-und-Merging
13:22 osse Mo: 'git branch'
13:22 osse with -a or -r as you please
13:23 ispn joined #git
13:25 shinnya joined #git
13:26 chigang joined #git
13:28 kbeflo_ joined #git
13:29 Sound joined #git
13:30 NeverDie_ joined #git
13:33 azerus joined #git
13:34 patarr joined #git
13:37 r00twrh joined #git
13:37 kbs joined #git
13:38 diogenese joined #git
13:39 jagob joined #git
13:40 msonntag joined #git
13:41 dglambert joined #git
13:41 dglambert yo
13:41 armyriad joined #git
13:41 Cabanossi joined #git
13:42 oleo joined #git
13:42 ExoUNX joined #git
13:42 osse feel the flow
13:42 osse que pasa paradox
13:45 dave0x6d joined #git
13:46 kbeflo__ joined #git
13:46 rtmins joined #git
13:48 choice Why can't I "cd a; git push ../b/" but I can do "cd b; git pull ../a/"?
13:48 jameser joined #git
13:48 osse choice: probably because of what the error says
13:48 choice "The push gives me refusing to update checked out branch: refs/heads/master"
13:49 osse yes
13:49 osse !bare
13:49 gitinfo A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
13:49 choice But the pull does the same.
13:50 lacrymology joined #git
13:50 choice Can I force the push.
13:50 choice ?
13:50 lacrymology can someone please explain these errors? they don't seem to cause any trouble, but they're pretty common for me and I don't know what's causing it: http://dpaste.com/0JSZYFA
13:50 rtmins_ joined #git
13:50 skinkitten joined #git
13:50 armyriad joined #git
13:51 osse choice: pull is an active choice by the user. the pushn is meant to push somewhere remote
13:51 osse choice: you can configure the repo you want to push to to allow it
13:52 choice osse: That would be better. How do I allow it?
13:52 osse choice: git config receive.denyCurrentBranch updateInstead
13:53 choice I see
13:53 Rodya_ joined #git
13:53 choice That would change a setting in the current git repo?
13:53 choice Still the same error?
13:54 osse run it in the repo you push to
13:54 choice Oh
13:54 choice fatal: bad numeric config value 'updateInstead' for 'receive.denycurrentbranch' in config: invalid unit
13:54 a_thakur joined #git
13:55 osse uhh
13:55 osse denycurrentbranch isntead of denyCurrentBranch maybe
13:55 choice Now the config is spoiled?
13:56 osse git config --unset receive.denycurrentbranch
13:56 osse or edit it by hand (.git/config)
13:57 choice Awesome, thanks.
13:57 webstrand joined #git
13:58 choice This seems to work: git config receive.denyCurrentBranch ignore
13:58 osse ahh, maybe you have an older git verzione
13:58 Es0teric joined #git
14:00 circ-user-2bgY3 joined #git
14:00 Dougie187 joined #git
14:01 bariscant joined #git
14:03 vatican joined #git
14:04 qqx choice: The "ignore" setting likely doesn't do what you want.
14:05 kbs joined #git
14:07 bariscant joined #git
14:07 cdg_ joined #git
14:07 choice qqx: Yeah, I think I just noticed. I pushed something and it went to a black hole or something.
14:07 choice Is there another solution?
14:08 osse !deploy
14:08 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:08 Dougie187 joined #git
14:09 guampa joined #git
14:10 LeBlaaanc joined #git
14:11 choice Seems like going to the destination and doing a pull is the easiest way.
14:11 qqx choice: There is an alternative with newer versions of git, as was already noted.
14:11 osse updateInstead probably works if you upgrade git
14:12 IRQ` left #git
14:12 qqx And I think that the behaviour with ignore is actually worse than going into a black hole.
14:12 HardlySeen joined #git
14:13 qqx It should cause the branch to be updated without updating the index or working tree, leaving it look like the destination has reverted the changes.
14:13 AaronMT joined #git
14:14 choice I see.
14:14 IRQ` joined #git
14:15 styks1987 left #git
14:17 Raging_Hog joined #git
14:22 Murii joined #git
14:23 kbs joined #git
14:24 choice When always pulling and never pushing, the workflow would be fine?
14:26 kbeflo__ joined #git
14:27 Cabanossi joined #git
14:30 User458764 joined #git
14:31 LeBlaaanc joined #git
14:33 Es0teric joined #git
14:35 blackpajamas joined #git
14:35 Es0teric|Work how do i rollback one commit and stash the changes? this commit i am trying to rollback to also was pushed to origin
14:36 TikityTik joined #git
14:37 tcorneli joined #git
14:38 thebird joined #git
14:39 skalpin Es0teric|Work: was it pushed to a branch that other people are working on?
14:39 Es0teric|Work skalpin yes
14:40 KamiRath joined #git
14:40 jokajak joined #git
14:41 re1 joined #git
14:41 skalpin Es0teric|Work: I would make a commit on top to revert the changes. try 'git revert HEAD'
14:41 DarkPsydeLord joined #git
14:41 sbasso joined #git
14:41 Es0teric|Work git revert HEAD?
14:42 Es0teric|Work i just want to go back one commit
14:42 skalpin ya, that will revert the last commit
14:42 Es0teric|Work but would i keep the changes?
14:42 livingstn joined #git
14:42 Es0teric|Work because i want to stash those changes that i will revert
14:43 eclecticjohny joined #git
14:43 Es0teric|Work skalpin
14:44 jagob joined #git
14:44 skalpin so if you 'git revert HEAD' it will populate your directory with the changes to undo that commit, then you can 'git stash' to stash em, then you could "git stash apply 'stash@{0}'" to apply the changes again, and "git commit -am 'message'" to commit them and finally 'git push' to push them to origin undoing what you previously had done
14:46 skalpin nvm, that would only stash the "undoing" of the changes
14:46 yehowyada joined #git
14:47 bronson joined #git
14:47 Es0teric|Work git commit -am what is the am flag for? skalpin
14:48 skalpin Es0teric|Work: I don't think you should do what I previously said. That wouldn't get you what you want
14:48 mischat joined #git
14:48 Es0teric|Work -_-
14:49 skalpin Es0teric|Work: the '-a' flag stages changes the '-m' flag lets you put in a message
14:49 skalpin ya sorry
14:49 Es0teric|Work shit i already did it
14:49 eikhorst joined #git
14:49 Es0teric|Work i didnt push it though
14:49 Es0teric|Work its still on the local instance
14:49 skalpin okay
14:49 Es0teric|Work how do i undo that
14:49 skalpin undo the commit?
14:49 Es0teric|Work the revert commit yes
14:49 Es0teric|Work that you just said
14:49 skalpin and get back to what is on the origin?
14:49 Es0teric|Work yeah
14:50 skalpin if you're on branch 'master' then 'git reset --hard origin/master' would reset your branch back to where 'origin/master' is
14:51 mischat_ joined #git
14:52 Doginal joined #git
14:52 bronson joined #git
14:52 Es0teric|Work skalpin it was the develop branch
14:52 Es0teric|Work ok so how do i go back one commit but keep the changes to stash
14:53 Es0teric|Work git reset --soft HEAD@{1} should do it right?
14:53 Rodya_ joined #git
14:54 jokajak joined #git
14:54 skalpin 'git reset --soft HEAD' will get you the changes yes
14:54 skalpin and move you back a commit
14:55 skalpin then 'git stash save --keep-index' to save the changes to your stash
14:55 skalpin so now you should be a commit behind origin, and have the changes you want stashed
14:56 Es0teric|Work ok
14:56 Es0teric|Work so then git push -f origin develop to undo
14:56 Es0teric|Work right?
14:56 jameser joined #git
14:56 skalpin so now you have two options, you could either force push, but that will mess up your other developers
14:56 Es0teric|Work no body has pulled from the repo yet
14:56 Es0teric|Work so i am safe there
14:57 tristanp joined #git
14:57 Cabanossi joined #git
14:57 onehrxn joined #git
14:57 skalpin if you are absolutely sure, then 'git push --force-with-lease' will update origin correct
14:57 skalpin or 'git push -f'
14:57 skalpin force-with-lease is "safer"
14:58 skalpin https://developer.atlassian.com/blog/2015/04/force-with-lease/
15:03 mischat joined #git
15:03 tg joined #git
15:03 jameser joined #git
15:03 onehrxn joined #git
15:04 Es0teric|Work skalpin alright i got it, thanks!
15:04 skalpin Es0teric|Work: sorry I messed you up there for a bit :/ but I'm glad everything worked out
15:04 Es0teric|Work its all good man lol
15:04 skalpin :)
15:08 jokajak joined #git
15:08 Gustavo6046 joined #git
15:09 mar77i_ joined #git
15:10 circ-user-2bgY3 joined #git
15:11 jungsubk joined #git
15:12 dsteplight__ joined #git
15:14 zinggggg joined #git
15:16 robattila256 joined #git
15:16 sbasso joined #git
15:16 jameser joined #git
15:20 thebird joined #git
15:21 skinkitten joined #git
15:22 aielima joined #git
15:22 mischat joined #git
15:23 dglambert joined #git
15:23 bariscant joined #git
15:24 jameser joined #git
15:24 dreiss joined #git
15:25 thiago joined #git
15:28 lavalamp joined #git
15:28 lavalamp hey folks
15:28 gitinfo lavalamp: 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.
15:28 lavalamp awesome :)
15:28 lavalamp im looking to implement a rather simple versioning system
15:28 patarr_ joined #git
15:29 lavalamp and want to read up on the internal mechanisms used by git, as well as general theory on best practices for versioning systems
15:29 lavalamp does anyone know of a good place to start??
15:29 grawity !intro and !book, probably
15:29 gitinfo [!IntroToGit] Randal Schwartz has an introduction to git video http://vimeo.com/35778382 and slides http://www.slideshare.net/RandalSchwartz/introduction-to-git-11451326
15:29 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
15:29 Ryanar joined #git
15:30 dendazen joined #git
15:31 andrew710 joined #git
15:32 rvgate joined #git
15:32 karols146 joined #git
15:33 cyberz joined #git
15:34 geoid joined #git
15:35 brent__ joined #git
15:35 lavalamp word - thank you grawity
15:35 brent__ joined #git
15:35 lavalamp trying to gauge just how deep of a dive that i need to take right now
15:36 caliculk joined #git
15:36 lavalamp i really only need to support three types of changes
15:36 lavalamp added, removed, modified
15:37 lavalamp from my understanding, git improved pretty vastly upon svn?? if true, perhaps there is some literature on what those improvements were and the justifications behind making them
15:38 Es0teric joined #git
15:38 ResidentBiscuit joined #git
15:39 maarhart joined #git
15:41 fahadash joined #git
15:41 orbyt_ joined #git
15:42 grawity probably more so upon CVS (see Linus' original youtube talk)
15:42 DarkPsydeLord joined #git
15:42 grawity (in fact I think he mentioned once that one of the main justifications for certain choices was "the opposite of how CVS would have done it")
15:42 grawity or was it actually about SVN?
15:42 zivester joined #git
15:43 Gloomy joined #git
15:43 grawity it's not particularly scientific
15:45 karols146 joined #git
15:45 kbeflo_ joined #git
15:46 MarioBranco joined #git
15:49 tang^ joined #git
15:49 maarhart joined #git
15:51 cam27 joined #git
15:52 dglambert joined #git
15:52 navidr joined #git
15:52 Oatmeal joined #git
15:52 User458764 joined #git
15:53 sagittarian joined #git
15:53 ankit01ojha joined #git
15:53 synthroid joined #git
15:54 sagittarian How bad is it to make a commit with a commit message of 51 characters?
15:54 nedbat sagittarian: not bad
15:54 onehrxn_ joined #git
15:54 sz0 joined #git
15:55 synthroi_ joined #git
15:55 sagittarian I feel a bit guilty every time I do it
15:55 grawity consider that some people literally take their commit messages from http://whatthecommit.com/
15:56 sagittarian My editor nags me, "Are you sure you want to do this nasty, evil, despicable thing? The sentence is life imprisonment without parole if you're caught."
15:56 canton7 some projects have standards such as "include the issue number and component(s) in the commit message subject". Once you've done that, there's no space left to actually write a message unless you go over the limit
15:57 ayogi joined #git
15:57 thm joined #git
15:57 sagittarian canton7: Yeah that's probably a good idea, I don't normally do it though
15:57 puff lavalamp: I have some notes I've been writing up about it, you're welcome to them.
15:57 canton7 nah, my point was that in some cases it's common to go over the limit
15:57 canton7 (not that it's a good idea to put extra stuff in the commit message)
15:58 lavalamp puff: i'd really appreciate that
15:58 JanC_ joined #git
15:58 thm is it possible to limit "git log" to, say, all .h files? Something like git log -- '**/*.h' ?
15:58 maarhart joined #git
15:58 grawity yes
15:59 puff lavalamp: I have two things, one I put up on the web last year, and it's rough but has some useful bits.  Another is more a file of notes but I think it has some key insights that I found very helpful.
15:59 puff lavalamp: http://www.darksleep.com/notablog/articles/The_Seamy_Underside_of_Git
15:59 lavalamp oh wow this looks great puff
16:00 caliculk joined #git
16:00 puff lavalamp: If you message me your email address, I'll send you my notes file.  And I'd be happy for any followup questions or suggestions.
16:00 puff lavalamp: I don't know that much, but I'm trying to learn :-).
16:00 theiostream joined #git
16:00 gunnaro joined #git
16:02 GodGinrai joined #git
16:02 sbasso joined #git
16:02 madewokherd joined #git
16:03 lordjancso joined #git
16:04 fbwnd joined #git
16:05 drodger joined #git
16:06 molgrum joined #git
16:06 molgrum joined #git
16:07 thm grawity: ok ;) I was in a wrong subdirectory when trying it, so it didn't work
16:09 ponyofdeath joined #git
16:12 Jellyg00se joined #git
16:13 re1 joined #git
16:14 peacememories joined #git
16:16 Drupal joined #git
16:16 synthroid joined #git
16:17 jungsubk joined #git
16:20 jottr joined #git
16:21 a_thakur joined #git
16:21 a_thakur joined #git
16:22 IRQ` left #git
16:24 jimklo joined #git
16:25 dave0x6d joined #git
16:25 durham joined #git
16:26 Es0teric joined #git
16:27 ionl joined #git
16:33 Drupal joined #git
16:33 jokajak joined #git
16:34 kfoonamalik joined #git
16:37 atomi joined #git
16:38 nowhere_man joined #git
16:39 serialoverflow joined #git
16:39 acetakwas joined #git
16:40 midnightmagic joined #git
16:43 rivarun joined #git
16:43 Rodya_ joined #git
16:43 eatsfoobars joined #git
16:46 theoceaniscool joined #git
16:47 yehowyada joined #git
16:47 eikhorst joined #git
16:48 raspado joined #git
16:49 govg joined #git
16:50 jokajak joined #git
16:50 jagadeesh joined #git
16:53 serialoverflow joined #git
16:53 mischat joined #git
16:53 svm_invictvs joined #git
16:55 atomi joined #git
16:56 Doginal joined #git
16:57 thomas_oneill left #git
16:58 marcogmonteiro joined #git
17:00 atomi joined #git
17:01 jottr joined #git
17:01 snowalpaca joined #git
17:01 snowalpa_ joined #git
17:03 inflames joined #git
17:03 chipotle joined #git
17:04 phlix joined #git
17:04 cyberz joined #git
17:06 matoro joined #git
17:08 MarioBranco joined #git
17:09 crose joined #git
17:11 oxguy3 joined #git
17:12 NeverDie joined #git
17:14 Gloomy joined #git
17:17 crose joined #git
17:17 gopar joined #git
17:19 regedit joined #git
17:21 Es0teric joined #git
17:22 Vampire0_ joined #git
17:22 Es0teric_ joined #git
17:22 alezandro1 joined #git
17:23 hashtagstrashtag joined #git
17:24 nod joined #git
17:25 Anja joined #git
17:27 Cabanossi joined #git
17:27 alezandro1 left #git
17:27 alezandro1 joined #git
17:28 Cavallari joined #git
17:28 bariscant joined #git
17:28 alezandro joined #git
17:29 danmackay joined #git
17:29 serialoverflow joined #git
17:30 Doginal joined #git
17:30 thiago joined #git
17:31 zer0her0 joined #git
17:32 dreiss joined #git
17:32 zer0her0 Anyone happen to have any knowledge or articles about using adobe products w/ git/git-lfs?
17:33 atrigent joined #git
17:34 atomi joined #git
17:34 atrigent does anyone know what happened with this: http://gitready.com/intermediate/2015/09/30/interactive-rebase-status.html ? it doesn't seem to do that in git 2.12
17:34 ponyofdeath joined #git
17:34 byte512 joined #git
17:36 maarhart joined #git
17:37 LeBlaaanc joined #git
17:39 Noldorin joined #git
17:42 john-soda joined #git
17:44 mischat joined #git
17:45 thebird joined #git
17:45 hahuang61 joined #git
17:46 basy joined #git
17:46 basy left #git
17:46 atomi joined #git
17:48 Es0teric joined #git
17:48 Es0teric_ joined #git
17:49 joshszep joined #git
17:49 muhannad____ joined #git
17:49 cbreak zer0her0: the experiences I've made with git lfs were that it annoyed me
17:50 cbreak it's super slow and at least on windows seems very buggy
17:50 cbreak especially with source tree
17:50 alezandro joined #git
17:50 matoro joined #git
17:50 joshszep joined #git
17:51 Es0teric joined #git
17:51 zer0her0 cbreak: heh, that's unfortunate. I've recently moved into an area of our dept were i have to share designer PSD/PSB and PDFs back and forth, w/ multiple revisions and the current workflow is name it something, drop it on our NAS and email what the current working version is
17:51 atomi joined #git
17:51 joshszep joined #git
17:53 joshszep joined #git
17:53 boombatower joined #git
17:53 AaronMT joined #git
17:54 oxguy3 joined #git
17:55 cbreak git lfs works, usually
17:55 cbreak but it doesn't work nearly as reliably or easily as git itself
17:56 atomi joined #git
17:58 Anja_ joined #git
18:01 Sasazuka joined #git
18:01 Skyfinn joined #git
18:03 kbeflo joined #git
18:06 jstein_ joined #git
18:06 raynold joined #git
18:06 ahrs joined #git
18:09 jim_carry joined #git
18:10 jim_carry My forked repo has 10 branches and upstream repo has 12 branches. How to get them even?
18:10 Rodya_ joined #git
18:10 NeverDie joined #git
18:10 jim_carry How to make them even?
18:10 jim_carry I tried git fetch --al --prune
18:10 jim_carry git pull --all
18:11 _ikke_ jim_carry: How are you comparing htem?
18:11 _ikke_ them
18:11 _ikke_ jim_carry: try git branch -r
18:11 jim_carry yes i'm talking about remote branches, my master is even with upstream
18:11 _ikke_ Did you look at git branch -r?
18:12 jim_carry yes
18:12 ertesx joined #git
18:12 jim_carry they shoould be same for mine and upstream
18:12 _ikke_ git does not automatically create local branches for remote branches
18:13 jim_carry I know, but remote branches should be same right?
18:13 _ikke_ between 2 remotes?
18:13 jim_carry what remote branches upstream has that all branches should be on my repo
18:13 jim_carry yes
18:13 _ikke_ Only if you push them
18:14 _ikke_ git does not automatically synchronize branches between remotes either
18:14 jim_carry how to syonchronise them
18:14 jim_carry synchronise
18:14 eh3 joined #git
18:14 _ikke_ you can try
18:15 _ikke_ git push origin refs/remotes/upstream/* refs/heads/* (assuming your fork is called origin and upstream is called upstream)
18:15 _ikke_ sorry
18:15 _ikke_ git push origin +refs/remotes/upstream/*:refs/heads/*
18:16 _ikke_ This will overwrite your remote branches with the ones from upstream
18:18 lezsakdomi joined #git
18:18 HurricaneHarry joined #git
18:18 Discovery joined #git
18:19 lezsakdomi Hi everybody, who uses git!
18:19 imack joined #git
18:19 _ikke_ *crickets*
18:19 le_melomane joined #git
18:19 kexmex joined #git
18:20 lezsakdomi How can I clone a git repo wich has created with "git init" through ssh?
18:20 grawity lezsakdomi: see the address formats in `man gitrevisions`
18:20 gitinfo lezsakdomi: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
18:20 _ikke_ that's just an empty repo
18:20 Skyfinn joined #git
18:20 lezsakdomi That repo has a lot of commit
18:20 lezsakdomi It says that I haven't permissions or that repo doesnt exists
18:21 grawity then either you're using the wrong address for cloning, or you don't have permissions to clone it
18:21 lezsakdomi What should I set to make it work?
18:21 lezsakdomi I have proper g+r
18:21 jim_carry Thanx _ikke_
18:21 grawity I don't know, that depends on what part is broken
18:21 grawity where is the repo, and what address are you cloning it with?
18:22 jim_carry How to delete unsynchronize remote branches?
18:22 User458764 joined #git
18:22 lezsakdomi Maybe some config?
18:22 jim_carry which are no longer present in upstream
18:22 tyreld joined #git
18:22 lezsakdomi on ledomi.ddns.net at path /var/www/html/magcar
18:22 lezsakdomi So Ive tried:
18:23 sQVe joined #git
18:23 maarhart joined #git
18:23 atomi joined #git
18:23 lezsakdomi git clone {ssh://led@ledomi.ddns.net/,led@ledomi.ddns.net:/}var/www/html/magcar{,.git,/.git}
18:24 lezsakdomi I've no idea what I am doing wrong
18:25 treehug88 joined #git
18:27 rejns joined #git
18:27 muhannad____ joined #git
18:28 CaptainHeavy joined #git
18:29 TomyLobo2 joined #git
18:30 User458764 joined #git
18:32 gopar joined #git
18:32 nd joined #git
18:32 oxguy3 joined #git
18:32 gugah joined #git
18:33 whitby joined #git
18:34 serialoverflow joined #git
18:35 Balliad joined #git
18:36 Zialus joined #git
18:38 paul424 joined #git
18:38 cahoots joined #git
18:39 cahoots hi, when i push to git, it tells me, "fatal: The current branch me-suspend-time has no upstream branch.". how can i get it to always set my upstream to be the matching one on the server?
18:39 grawity lezsakdomi: GIT_TRACE=1 git clone ...
18:39 grawity cahoots: search `man git config` for push.default
18:39 cahoots without any extra work, i just want to run "git push"
18:39 gitinfo cahoots: the git-config manpage is available at http://jk.gs/git-config.html
18:40 grawity cahoots: also, search `man git push` for the -u option
18:40 gitinfo cahoots: the git-push manpage is available at http://jk.gs/git-push.html
18:40 cahoots i'm lazy, i don't want to have to set any options
18:41 cahoots just 8 chars, "git push"
18:41 cahoots and it used to work for me, but then i deleted my dotfiles by accident
18:42 thm left #git
18:42 _ikke_ cahoots: git config --global push.default current
18:44 tvw joined #git
18:44 cahoots _ikke_, thanks!
18:46 Dougie187 joined #git
18:47 rejns joined #git
18:47 raijin joined #git
18:49 peterbecich joined #git
18:51 imrg joined #git
18:51 BSaboia joined #git
18:53 s2013 joined #git
18:55 LionsMane joined #git
18:55 math-alpha joined #git
18:56 geoid joined #git
18:57 lordjancso joined #git
19:00 gopar joined #git
19:00 cahoots_ joined #git
19:02 aidalgol joined #git
19:02 Gustavo6046 joined #git
19:02 bwn joined #git
19:03 Jackneill joined #git
19:04 venmx joined #git
19:04 raijin joined #git
19:04 cagomez joined #git
19:05 Zialus joined #git
19:05 guampa joined #git
19:06 imrg joined #git
19:07 cam27 joined #git
19:08 fahadash joined #git
19:10 aboccia joined #git
19:11 bariscant joined #git
19:11 apotry joined #git
19:11 bgamari left #git
19:11 Cabanossi joined #git
19:13 ThunderChicken joined #git
19:13 ThunderChicken joined #git
19:13 Sasazuka joined #git
19:13 manuelschneid3r joined #git
19:15 Sound joined #git
19:15 Evidlo left #git
19:17 onmeac joined #git
19:19 Dougie187 joined #git
19:19 Oatmeal joined #git
19:21 a_thakur joined #git
19:21 myhau joined #git
19:22 raijin joined #git
19:22 dvaske joined #git
19:23 Lowell joined #git
19:23 kba_ joined #git
19:24 MathNeverEnds joined #git
19:24 drodger joined #git
19:24 chardan joined #git
19:24 MathNeverEnds I need some help
19:24 cagomez joined #git
19:24 MathNeverEnds The master branch was updated quite a bit and I want to merge those changes into my branch
19:25 MathNeverEnds without screwing up the updates ive done on my branch
19:25 MathNeverEnds how do i go about that?
19:26 geoid joined #git
19:27 heftig joined #git
19:30 m0viefreak joined #git
19:30 Murii joined #git
19:30 durham_ joined #git
19:32 _ikke_ very carefully :-)
19:33 _ikke_ instead of merging in master, you can also choose to rebase your branch on master
19:34 fakenerd_ joined #git
19:34 durham joined #git
19:35 dvaske_ joined #git
19:37 spacemud joined #git
19:37 manveru joined #git
19:38 Es0teric joined #git
19:40 matoro joined #git
19:41 codedmart_ joined #git
19:41 M-ou-se_ joined #git
19:42 ekinmur joined #git
19:45 DarkPsydeLord joined #git
19:46 lordjancso joined #git
19:47 tamatar joined #git
19:47 cite joined #git
19:47 lordjancso joined #git
19:48 jstein_ joined #git
19:48 bmahe joined #git
19:49 Balliad joined #git
19:49 bariscant joined #git
19:50 Chinorro joined #git
19:50 AndrewGazelka joined #git
19:51 ggherdov joined #git
19:56 Kobaz joined #git
19:56 Kobaz so, i have this output from git branch
19:56 Kobaz * 2.0                     98feaa0 [ahead 6] Merge branch '2.0' of ssh://ch01/CAP_System into 2.0
19:56 Kobaz and then: git diff origin/2.0..2.0
19:56 Kobaz is nothing
19:56 Kobaz how do i get rid of the fluff merges
19:56 YuGiOhJCJ joined #git
19:56 Cabanossi joined #git
19:57 fission6 joined #git
19:57 cagomez joined #git
19:57 todd_dsm joined #git
19:57 fission6 i am trying to do a merge and got a conflict on two files, i know mine are right and its what i want, how do i merge
19:57 finalbeta joined #git
19:57 Dougie187 Kobaz: You mean get rid of as in remove entirely? or get rid of as in just have them not show up?
19:58 Dougie187 Kobaz: Or do you mean, have them not be created in the future?
19:58 Kobaz yeah, i dont need the merge tracking for stuff that's only local
19:58 Kobaz that too
19:58 Kobaz like there's no file differences between what i'm tracking, and my working copy
19:58 Kobaz so i'd like to 'clean it up'
19:58 Dougie187 My guess is you use `git pull`, right?
19:58 Kobaz yeah
19:58 Dougie187 So, the way to remove them (if you're the only one working on this branch, is to just hard reset to origin/2.0
19:59 Kobaz k
19:59 Dougie187 To prevent them form showing up in the future, you have a few options.
19:59 Dougie187 1) Don't use git pull.
19:59 a3Dman joined #git
19:59 fission6 any ideas?
19:59 Dougie187 2) Change your pull settings to not create merges when there's a fast-forward available.
19:59 Vgr joined #git
19:59 Dougie187 fission6: `git checkout <version> -- file; git add <file>; git commit`
20:00 Kobaz k
20:00 fission6 I am mid merge Dougie187
20:00 cagomez joined #git
20:00 fission6 its asking to resolve conflicts
20:00 Dougie187 fission6: That's fine.
20:00 fission6 i want to just take my files
20:00 Kobaz 2) what's the setting for that?
20:00 Kobaz 1) and what's the alternative method?
20:00 hahuang65 joined #git
20:00 Dougie187 fission6: The files that exist in your working directory? or the files that exist in your branch that you're trying to merge?
20:00 fission6 later
20:01 Dougie187 fission6: Then do what I said before, where <version> is your branch name.
20:01 Dougie187 fission6: Resolving a conflict is changing the code, and `git add`'ing the file.
20:01 finalbeta joined #git
20:01 fission6 what do you mean by <version>
20:02 fission6 BRANCH-NAME
20:02 gopar joined #git
20:02 patarr joined #git
20:02 King_Hual` joined #git
20:02 Dougie187 Kobaz: For (2) you'd want: git config pull.ff only
20:02 Dougie187 fission6: Yes, <version> = branch_name / hash / whatever.
20:03 Dougie187 Kobaz: Alternatives for (1) are. `git fetch remote` and then figuring out what the right next step is.
20:03 fission6 i though tthere was a simple theirs/ours or something
20:03 Dougie187 fission6: there is, but I always forget what it is.
20:03 Dougie187 Maybe it's `git checkout --theirs -- file`
20:03 cdg joined #git
20:03 Dougie187 If you're merging your branch into the other branch
20:03 fission6 i would want --mine
20:03 Dougie187 It's the other way around if you're merginging their branch into yours.
20:03 Dougie187 You could try `git checkout --ours -- file` then
20:04 Dougie187 I never remember it, because functionally it's the same as what I said, except mine is more explicit.
20:04 Dougie187 Kobaz: Available next steps (after `git fetch`) are : (1) rebase, (2) merge, (3) reset
20:05 bgerber joined #git
20:05 Kobaz k thanks
20:06 theoceaniscool joined #git
20:06 cagomez joined #git
20:06 jungsubk joined #git
20:06 finalbeta joined #git
20:07 geoid joined #git
20:08 ExeciN joined #git
20:09 Atm0spher1c joined #git
20:10 durham joined #git
20:11 bariscant joined #git
20:12 scoobertron joined #git
20:12 ToxicFrog joined #git
20:13 chipotle joined #git
20:14 cagomez joined #git
20:17 svm_invictvs joined #git
20:18 thallada joined #git
20:21 cagomez joined #git
20:22 Rodya_ joined #git
20:23 Tobbi joined #git
20:23 cagomez joined #git
20:25 Sasazuka_ joined #git
20:26 Dougie187 joined #git
20:28 Rodya__ joined #git
20:30 john_doe_jr left #git
20:31 ponyofdeath joined #git
20:32 CheckDavid joined #git
20:35 cyberz joined #git
20:35 cahoots joined #git
20:37 octo8 joined #git
20:37 octo8 hello, i have a digital ocean account, been working on it's VPSs, but my question is, what is the difference between heroku and digitalOcean?
20:38 kadoban Not that you can't ask here, but ... that seems like a fairly random question for this channel. There's probably a better place to find comparisons or people who have used both.
20:38 octo8 ok
20:42 brent__ joined #git
20:50 sbasso joined #git
20:52 askb joined #git
20:53 bariscant joined #git
20:53 jjasinski joined #git
20:54 tasteit joined #git
20:54 mischat joined #git
20:55 Sasazuka joined #git
20:56 Cabanossi joined #git
20:57 bgerber joined #git
20:57 roby10 joined #git
20:58 matoro joined #git
20:58 bgerber joined #git
20:59 roby10 joined #git
21:00 scoobertron joined #git
21:05 _Vi joined #git
21:06 thallada joined #git
21:07 Sasazuka_ joined #git
21:08 t0by joined #git
21:10 fission6 joined #git
21:12 _August_ joined #git
21:14 raijin joined #git
21:14 ghoti joined #git
21:14 jost_ joined #git
21:15 orbyt_ joined #git
21:15 _August_ i have a problem, for some reason im able to push and pull from repo's i have access to on my mac but cant do it from my windows pc. It was working before but it just stopped working all together for some reason. Any suggestions on how I can fix this?
21:17 Es0teric joined #git
21:20 dsdeiz joined #git
21:20 dsdeiz joined #git
21:21 a_thakur joined #git
21:21 cyberz joined #git
21:23 atomi joined #git
21:24 kadoban _August_: Well, first step is figuring out what's wrong I guess. What is 'git remote -v', what are the lines for the remote(s) that don't work?
21:24 kadoban Also, what does "stopped working all together" look like, exactly? What happens when you try?
21:25 atomi joined #git
21:25 Dougie187 joined #git
21:25 _August_ it keeps saying repository not found
21:27 _August_ i typed git remote -v and it came back as origin blahblah.git (fetch)
21:27 sz0 joined #git
21:27 _August_ and (push)
21:28 kadoban _August_: Sounds like your remote is just pointing at a local directory then ... also you really could be eliding important information, since blahblah.git seems like an unlikely remote URL to me.
21:28 hahuang65 joined #git
21:28 kadoban _August_: In other words, you have to change the remote URL(s) to actually point to ... wherever the remotes actually are, probably on a different machine?
21:30 Deamon_ left #git
21:30 _August_ well its a repo on gitlab
21:31 cahoots joined #git
21:31 _August_ the full message is origin https://gitlab.swelldevelopment.com/cclark61/hmi-pcpt.git (fetch)
21:31 Tatou I want to use gitlab, but I don't trust them
21:31 kadoban ... yeah, so you elided essentially everything, which is pretty brilliant when you're asking for help, by the way.
21:32 GodGinrai joined #git
21:32 kadoban I don't seem to have access to that place, when you log in and go to that URL, does it exist/work, just in a browser?
21:32 _August_ i didnt think it really mattered since it's working fine on mac
21:33 _August_ yes if i login i have access to the repo
21:33 Fallen0223 joined #git
21:33 _August_ i am able to push pull commit ect when im on my macbook but when im on windows it wont let me
21:33 kadoban I wonder if the credentials git has stored are wrong or something maybe. Does it ask you for credentials when you try to fetch/push?
21:33 davimore__ joined #git
21:33 _August_ no
21:34 cagomez joined #git
21:34 _August_ everything was working fine and then out the blue it just stopped
21:34 kadoban _August_: What if you do something like .... 'GIT_CURL_VERBOSE=1 GIT_TRACE=1 git fetch origin' ? Hopefully that works in whatever shell you're using, IIRC it's bash-ish on the usual windows install
21:34 kadoban It might be pretty long output, but hopefully the answer of what's going wrong is in there somewhere.
21:35 _August_ so just GIT_CURL_VERBOSE=1 GIT_TRACE=1 git fetch origin
21:35 _August_ ?
21:35 kadoban Yep
21:36 kadoban That should just be 'git fetch origin' except with lots of debugging output, including from CURL, which is what usually does the actual HTTP connection stuff for git, for HTTP remotes anyway
21:37 _August_ 'GIT_CURL_VERBOSE' is not recognized as an internal or external command,
21:37 _August_ operable program or batch file.
21:37 kadoban Hmm, I don't know how to set those in the windows shell then. If you know how to set environment variables in your shell for a command you run, that's what that's trying to do.
21:38 kadoban Do you know what shell you're using? Is it ... powershell or something possibly?
21:38 _August_ let me try to find the correct way real quick
21:39 _August_ cmd
21:39 _August_ i can use powershell tho
21:40 kadoban In truth I don't know either well at all, I was planning on looking it up myself. But you might have better luck, you're pretty much guaranteed to know windows shells better than I do.
21:41 kadoban I suspect there's a way with just like a switch to git itself to do these things, but ... I don't know that either.
21:42 afuentes joined #git
21:43 safe joined #git
21:43 _August_ its basically "set GIT_TRACE=1"
21:43 _August_ i set them both to one but still same error
21:43 _August_ 1*
21:44 kadoban Is there any further output with them set? It should have the same behavior, just lots more output
21:45 _August_ nope
21:46 kadoban Well crap ... sorry I don't know how to get it to spam its debug stuff in windows then :-/
21:46 _August_ i wonder if i even set it =/
21:47 kadoban Can you try, uhm ....  echo IT_TRACE%    maybe?
21:47 kadoban Oh wait, my client screwed that up, crap.
21:47 kadoban echo <percent sign>GIT_TRACE<percent-sign>   with <percent-sign> replaced with the actual character
21:48 kadoban That's relying on my pretty bad memory of windows shell syntax though, so ... might not work.
21:48 cagomez joined #git
21:48 _August_ it just output %GIT_TRACE%
21:48 omnigoat joined #git
21:49 kadoban :(
21:50 cagomez_ joined #git
21:54 jeffreylevesque joined #git
21:57 Cabanossi joined #git
21:58 Sasazuka joined #git
21:58 _August_ kadoban, i got it
22:00 kadoban Nice. The debug spam succeed?
22:00 hahuang65 joined #git
22:01 _August_ https://pastebin.com/jgFARYAh
22:03 matoro joined #git
22:05 tribly joined #git
22:05 guampa joined #git
22:06 [Brain] joined #git
22:06 kadoban _August_: Hmmmm. It seems to be authorizing correctly at the end there, if I'm reading that right. Can you tell what users you're authing as? I can't seem to find it in that output. Maybe it's being done as the wrong user, and thus it's getting the 404 response?
22:06 hahuang65 joined #git
22:07 kadoban _August_: Is there a .gitcredentials file or something like that in your current directory? (don't share the contents if there is), but maybe see what username(s) are in there?
22:07 kadoban I don't know a lot about how git's credentials system works, I seem to remember stuff is stored in that file though.
22:07 kadoban (I always access via SSH, which works differently)
22:08 cam27 joined #git
22:09 raijin joined #git
22:10 _August_ where would it be inside the .git folder?
22:10 kadoban Let me look it up
22:10 anuxivm joined #git
22:11 Sound joined #git
22:12 rivarun joined #git
22:12 kadoban _August_: What if you just run 'git credentials-manager get' ? (don't share output just in case, I have no idea if that outputs password(s) or not). Just trying to figure out what user it's authing as
22:14 _August_ some options
22:14 mar77i joined #git
22:14 _August_ --passive --force ect...
22:14 raijin joined #git
22:14 kadoban :-/ I can't tell how the damn thing works
22:14 bwn joined #git
22:17 mikecmpbll joined #git
22:20 cdown joined #git
22:20 g0d355__ joined #git
22:24 lmatteis joined #git
22:24 kadoban I suspect either the credentials it's supplying are wrong and the 404 result in spurious, or more likely it's correctly logging in as the wrong user, and itstead of saying you're not allowed to access someone else's repos, it says it doesn't exist to preserve privacy. The latter seems more likely. But I can't find docs on credentials-manager, it seems to be some addon thing I've never used that sounds like it doesn't even work on my OS, so I'm kind of lost
22:24 Dougie187 left #git
22:24 kadoban there.
22:26 Sasazuka_ joined #git
22:26 _August_ hmm so how can i reset my credentials and relogin?
22:27 dsantiago joined #git
22:27 marianina8 joined #git
22:28 kadoban I think it's 'git credentials-manager delete', but really no promises, I have no idea how this damn thing works. That could screw stuff up.
22:29 _August_ =(
22:29 _August_ ok, ill look into it further, appreciate your help
22:29 navidr joined #git
22:29 kadoban Sorry I couldn't resolve it, good luck. I'm sure there's someone who knows better around, but they probably got scared off by now.
22:31 madewokherd joined #git
22:31 User458764 joined #git
22:33 fission6 joined #git
22:36 Vaelatern joined #git
22:37 Bob8989|2 joined #git
22:37 matoro joined #git
22:38 Jellyg00se joined #git
22:40 theiostream joined #git
22:41 DolphinDream joined #git
22:41 diogenese joined #git
22:46 Es0teric joined #git
22:46 _August_ i figured it out
22:46 _August_ wrong credentials stored in windows cpanel
22:47 kadoban Ah, good. Glad you figured it out
22:48 medeirosthiiago joined #git
22:50 am55 joined #git
22:50 overlord_tm joined #git
22:52 cam27 joined #git
22:57 Cabanossi joined #git
22:57 theoceaniscool joined #git
22:59 Ryanar joined #git
22:59 thebope joined #git
23:01 Sasazuka joined #git
23:04 CaptainHeavy_ joined #git
23:05 gugah joined #git
23:06 onehrxn joined #git
23:07 drodger joined #git
23:09 Ryanar joined #git
23:09 k-man joined #git
23:10 k-man how do i get a previous version of a file into my working directory, just for testing something
23:11 rwp k-man, I don't know how others do it but I 'git whatchanged' to find the hash of the file and then 'git cat-file blob $hashvalue > somefilename' to retrieve it.
23:11 k-man rwp, ok, interesting
23:14 fakenerd joined #git
23:14 venmx joined #git
23:16 kadoban k-man: You can use 'git checkout someref -- somefile' if you're cool with your working tree/index version being overwritten. Otherwise, you can use 'git show someref:somefile > someotherfile'
23:16 octo8 joined #git
23:17 howitdo joined #git
23:17 dsdeiz joined #git
23:17 octo8 how do i make a pull request in another directory directly? so in the parent directory i want to do 'git pull origin master' , what would the command be?
23:19 rewt a pull request is when you ask someone to merge your changes to their repo; it has nothing to do with doing 'git pull' on your repo
23:20 rewt what are you really trying to do?
23:21 octo8 ok, pardon my bad expressions, my question is, i have a shell script in the parent directory, and want it to make a git command in the inner directory, what is the syntax ?
23:21 thiago joined #git
23:22 rewt there's --git-dir to specify the dir of the repo
23:23 rewt so 'git --git-dir innerdir command ...' instead of 'git command ...'
23:24 Shakeel__ joined #git
23:27 re1 joined #git
23:27 kbs joined #git
23:30 bgerber joined #git
23:31 IRCFrEAK joined #git
23:34 gopar joined #git
23:39 rivarun joined #git
23:44 shgysk8zer0 joined #git
23:45 dviola joined #git
23:45 matoro joined #git
23:46 Sasazuka joined #git
23:48 kbs left #git
23:49 fission6 joined #git
23:54 thebope joined #git
23:54 dsdeiz_ joined #git
23:59 Lyqyd joined #git

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