Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-04

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

All times shown according to UTC.

Time Nick Message
00:02 hahuang61 joined #git
00:03 a3Dman joined #git
00:06 Masber_080 joined #git
00:07 Cabanossi joined #git
00:07 raijin joined #git
00:13 masuberu joined #git
00:14 thierryp joined #git
00:20 _28_ria joined #git
00:21 dnukem joined #git
00:22 Tee_Pee Hey guys,  quick question
00:22 a3Dman joined #git
00:22 Tee_Pee I got a Project_Root/FolderA folder
00:23 Tee_Pee In there I got a .gitignore which ignores * so that the folder itself gets ignored
00:23 ncthom91 joined #git
00:23 Tee_Pee I  now have to ignore a file that is someplace else from the root directory.. so ProjectRoot/FolderB/SomeFile
00:24 Tee_Pee I tried ../FolderB/SomeFile but that didn't do anything
00:24 polyrob_ joined #git
00:27 midnightmagic joined #git
00:28 Tee_Pee Just adding FolderB/SomeFile to the exclude file doesn't do anything either...
00:28 polyrob joined #git
00:30 ahf joined #git
00:31 XVar joined #git
00:31 raijin joined #git
00:32 Vampire0 Tee_Pee, a .gitignore can only work on the same directory and subdirectories, you cannot work on siblings like you try
00:32 Vampire0 Tee_Pee, either put a second .gitignore there, or move your other one to the root
00:33 Tee_Pee I can't do either of those unfortunately =/
00:33 midnightmagic joined #git
00:34 Tee_Pee It's a clone of  the Unreal Engine 4 repo, I can't mess  with the root .gitignore or put anything into the engine's folders, otherwise it'll be hell to pay when major version upgrades come along.
00:34 thebope joined #git
00:34 Tee_Pee But in any case... the exclude file in .git/info is the perfect thing for me, but I could never get the damn thing to work
00:38 Tee_Pee The files aren't added, they're untracked files. Even if I just blanket ignore their extensions with *.usf in .git/info/exclude it does nothing.
00:38 ski4x7 joined #git
00:42 Gsham joined #git
00:44 matoro joined #git
00:45 Tee_Pee I don't understand... no matter what I try, it's as if the exclude file simply doesn't exist.
00:49 sunri5e joined #git
00:52 Cabanossi joined #git
00:55 cyphase joined #git
00:55 matoro joined #git
00:58 buffal0 joined #git
00:58 dave0x6d joined #git
00:59 roelmonnens joined #git
01:00 Gsham joined #git
01:00 ResidentBiscuit joined #git
01:05 _Vi joined #git
01:05 sunri5e joined #git
01:06 a3Dman joined #git
01:07 brennz joined #git
01:07 Ryanar joined #git
01:11 JS____ joined #git
01:15 Eugene Tee_Pee - are you trying to !ignore_tracked ?
01:15 gitinfo Tee_Pee: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
01:15 Eugene In particular, what does `git status` say?
01:15 Tee_Pee No
01:15 Tee_Pee I already said it earlier
01:15 Tee_Pee these are untracked files
01:16 Eugene !transcript
01:16 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
01:17 ResidentBiscuit joined #git
01:17 Krenair left #git
01:18 CarlFK joined #git
01:18 orbyt_ joined #git
01:18 Tee_Pee https://gist.github.com/DamirHalilovic/b9c66ca53f911fdda07c3f43c91ad8c4
01:19 cam27 joined #git
01:20 fstd_ joined #git
01:22 _Vi joined #git
01:25 Tee_Pee As I said.. it simply doesn't work with the simplest possible use-case.
01:28 thebope joined #git
01:29 porfiriopaiz joined #git
01:29 midnightmagic joined #git
01:31 Eugene What does `git config core.excludesFile` say
01:34 finalbeta joined #git
01:34 durham_ joined #git
01:34 Eugene Also, what are your line endings on the exclude file
01:35 Eugene Is it currently set to Mac(CR)?
01:35 Tee_Pee excludeFiles only lists a gitignore_global.txt in my Documents folder
01:36 Tee_Pee They ought to be normal windows file endings, notepad opens the file neatly
01:36 Kaisyu joined #git
01:36 pks joined #git
01:37 Cabanossi joined #git
01:37 Eugene Go install a good editor(I like Notepad++) and set them to LF, then try again.
01:38 Tee_Pee Got Notepad++, let's try that
01:38 Eugene Also, man git-check-ignore for a starting point
01:38 gitinfo the git-check-ignore manpage is available at http://jk.gs/git-check-ignore.html
01:38 Tee_Pee EOL conversion has LF greyed out
01:38 Tee_Pee In N++
01:39 Tee_Pee I assume this means it's already LF
01:39 Rodya_ joined #git
01:41 peepsalot joined #git
01:41 Tee_Pee Ok, this is interesting... the root .gitignore file of Unreal Engine has !*.usf
01:44 duderonomy joined #git
01:48 Tee_Pee I assume this overrides my setting
01:49 hahuang61 joined #git
01:49 masuberu joined #git
01:49 a3Dman joined #git
01:50 Emperor_Earth joined #git
01:51 Riviera joined #git
01:51 MarioBranco joined #git
01:52 jamick joined #git
01:53 hvxgr joined #git
01:53 Goplat joined #git
01:55 leonarth joined #git
01:55 elisa87 joined #git
01:56 d^sh joined #git
01:56 elisa87 hey why do I get this error? I am even part of the EpicGames organization https://pastebin.com/RuaQbH8s
01:57 Learath2 wrong password? :) Could try cloning with ssh
01:59 thiago joined #git
01:59 dsdeiz joined #git
02:00 dermoth joined #git
02:02 theiostream joined #git
02:03 _Vi joined #git
02:04 sunri5e joined #git
02:06 oomemusss joined #git
02:12 z8z joined #git
02:15 thierryp joined #git
02:16 lagothrix joined #git
02:18 HoierM joined #git
02:18 Lyqyd joined #git
02:19 hexagoxel joined #git
02:19 Gsham joined #git
02:19 Lynxium joined #git
02:20 Lynxium joined #git
02:21 kfoonamalik joined #git
02:22 thebope joined #git
02:24 bruce_lee joined #git
02:25 LeBlaaanc joined #git
02:27 Nilesh_ joined #git
02:32 dsdeiz joined #git
02:32 _Vi joined #git
02:37 midnightmagic joined #git
02:37 chachasmooth joined #git
02:37 quartarian joined #git
02:40 Rodya_ joined #git
02:44 lb1c joined #git
02:46 masuberu joined #git
02:47 livingstn joined #git
02:47 mizu_no_oto joined #git
02:48 roelmonnens joined #git
02:52 Cabanossi joined #git
02:53 LeBlaaanc joined #git
02:56 dreiss joined #git
02:56 marianina8 joined #git
02:57 Vortex35 joined #git
02:57 d^sh joined #git
02:57 rigid joined #git
02:57 rigid joined #git
02:59 aavrug joined #git
03:01 elsevero joined #git
03:06 ojdo joined #git
03:08 SwiftMatt joined #git
03:09 HoierM joined #git
03:16 karols146 joined #git
03:17 thierryp joined #git
03:21 venmx joined #git
03:22 wxg joined #git
03:26 marianina8 joined #git
03:26 robattila256 joined #git
03:28 rchavik joined #git
03:29 Noodlewitt joined #git
03:30 rchavik joined #git
03:32 rchavik joined #git
03:33 amosbird joined #git
03:35 _Vi joined #git
03:40 hvxgr joined #git
03:41 livingstn joined #git
03:42 b0nn hi all, I'm having trouble with git: I have a branch on bitbucket, but I cannot checkout that branch, and I cannot see why
03:42 z8z joined #git
03:46 madebymarkca joined #git
03:46 aw1 joined #git
03:49 b0nn if I do git checkout feature/foo git tells me that the branch does not exist
03:49 hahuang61 joined #git
03:50 ojacobson b0nn: key concept: each repository, including clones, has its own, independent, set of branches.
03:50 b0nn ok...
03:50 ojacobson you can create a local branch tracking a branch in a remote repository, but git won't treat them as "the same branch"
03:50 b0nn I get that
03:51 b0nn I want to checkout the remote branch though
03:51 ojacobson sometimes git will make this easy: if you run `git checkout branch-name` and branch-name 1) doesn't exist locally and 2) does exist, in exactly one remote, then git will create a new local branch-name branch, tracking the branch in that one remote.
03:51 ojacobson you can't, checking out a remote branch is nonsensical.
03:51 b0nn fair enough
03:51 ojacobson it's not in this repo. It's in some other repo. You can't commit to it.
03:51 ojacobson (You can _push_ to it.)
03:51 Cabanossi joined #git
03:51 b0nn right
03:51 ojacobson but to do that, you need something to push from - generally a local branch
03:52 ojacobson so, having said all of that: can you gist `git branch --all`?
03:52 b0nn unfortunately I cannot
03:53 ojacobson Does the name of the branch you want to check out appear in `git branch --all`, and if so, is it prefixed with the name of a remote and a slash?
03:53 b0nn I can tell you, however, that git branch -a |grep foo returns an empty set
03:53 ojacobson (two questions, both "yes" or "no")
03:53 b0nn no and no
03:53 ojacobson run `git fetch --all` and check again
03:53 b0nn but it does appear on my bitbucket repo
03:53 b0nn yes, have already done that (twice)
03:53 ojacobson git's very conservative about communicating with remote repos, and doesn't do so unless explicitly told to
03:53 ojacobson mm
03:54 ojacobson what's in `git ls-remote that-repo` ?
03:55 b0nn hm, how do I get "that-repo"?
03:55 b0nn as in, how do I get the name of it?
03:55 ojacobson `git remote -v` will list the remotes in your repo and their corresponding URLs
03:56 ojacobson if the bitbucket repo isn't listed, that would, in fact, explain what you're seeing :)
03:57 Noodlewitt joined #git
03:57 a_thakur joined #git
03:57 b0nn empty set
03:57 ojacobson there you go, then
03:58 ojacobson add a remote pointing to your bitbucket repo and fetch i
03:58 b0nn git ls-remote | grep -i foo
03:58 b0nn no.
04:00 b0nn The issue remains, the branch I am looking for is available on bitbucket in my repo, but I cannot 'see' it using git
04:04 dmc joined #git
04:04 quartarian b0nn: Let's backup. You cloned the project right? Then cced into the director you cloned?
04:05 inflames joined #git
04:06 ZyX-I joined #git
04:06 theiostream joined #git
04:08 mehola joined #git
04:09 lavalamp joined #git
04:13 bwn joined #git
04:13 guardian joined #git
04:13 MattMaker joined #git
04:13 mehola joined #git
04:14 mehola joined #git
04:23 mehola joined #git
04:23 dnukem joined #git
04:26 ski7777 joined #git
04:26 learning joined #git
04:27 kbeflo joined #git
04:28 howlinbash joined #git
04:29 HurricaneHarry joined #git
04:30 robertparkerx joined #git
04:30 robertparkerx is it unusual for a initial commit to take awhile? The repo was empty. The commit is 2gb and 21,000 changes.
04:30 robertparkerx I am new to using git, sorry
04:31 ojacobson adding and committing 2.1gb will, together, take as long as it takes to compress and sha1 all of that data, and to write it back out as Git objects
04:32 Rodya_ joined #git
04:33 dsdeiz joined #git
04:35 robertparkerx ojacobson, should it take that long on a i5 6400 16gb ddr4? lol
04:35 robertparkerx Sorry I'm just wondering if it is stuck or not
04:36 mehola joined #git
04:36 Cabanossi joined #git
04:40 dnukem joined #git
04:42 livingstn joined #git
04:43 pks joined #git
04:48 Peetz0r joined #git
04:49 zerow joined #git
04:49 robotroll joined #git
04:50 freimatz joined #git
04:53 _Vi joined #git
04:55 robertparkerx you were right ojacobson, it finished
04:55 robertparkerx :|
04:57 ojacobson A progress bar would be nice
04:58 robertparkerx if I create a branch and pull from master to the branch, then delete the master branch data will i still maintain the data inside of the new branch I created
04:58 robertparkerx kinda as to create a "backup" of what was original
05:00 ojacobson branches are labels for commits and nothing more - deleting a branch deletes _that label_, and nothing else
05:00 ojacobson and since commits are immutable…
05:03 _Vi joined #git
05:03 robertparkerx So I should just create two repo's
05:04 dnukem|2 joined #git
05:04 Isla_de_Muerte joined #git
05:05 alexggor1on joined #git
05:05 evilmquin joined #git
05:06 Teny` joined #git
05:06 dec0n joined #git
05:06 bjoe2k4_ joined #git
05:07 milki_ joined #git
05:07 krainboltgreene_ joined #git
05:07 da5id_ joined #git
05:07 tobie_ joined #git
05:07 daxroc_ joined #git
05:07 Aboba joined #git
05:07 dave0x6d_ joined #git
05:07 LyndsySimon_ joined #git
05:07 rafalcpp_ joined #git
05:07 huhlig_ joined #git
05:07 Anthaas_ joined #git
05:07 thecomedian_ joined #git
05:08 Cabanossi joined #git
05:08 saul joined #git
05:08 CheckDavid_ joined #git
05:08 kadoban joined #git
05:08 ggherdov_ joined #git
05:08 boshhead_ joined #git
05:08 fakenerd_ joined #git
05:08 bjarki joined #git
05:08 bitslip_ joined #git
05:08 eshlox_ joined #git
05:08 wget_ joined #git
05:08 lolmac_ joined #git
05:09 xkr47_ joined #git
05:09 stfn1 joined #git
05:09 madduck_ joined #git
05:09 gkatsev_ joined #git
05:09 ejnahc_ joined #git
05:09 diget_ joined #git
05:10 pelegreno__ joined #git
05:10 thib_ joined #git
05:10 cmosguy_ joined #git
05:10 xall joined #git
05:11 Orphis_ joined #git
05:11 Bock joined #git
05:11 tcsc_ joined #git
05:12 lep2 joined #git
05:12 bl0m1_ joined #git
05:12 ThiefMasterrr joined #git
05:12 snsapiens joined #git
05:12 ghormoon_ joined #git
05:12 arunpyas- joined #git
05:13 c0 joined #git
05:13 n-st- joined #git
05:13 Arguggi_ joined #git
05:13 pepijndevos_ joined #git
05:13 chrisml` joined #git
05:13 sim642_ joined #git
05:13 JrCs_ joined #git
05:13 Gunni^ joined #git
05:13 loglaunc- joined #git
05:13 webstrand joined #git
05:13 forrestv_ joined #git
05:13 simon8162 joined #git
05:13 SirCmpwn_ joined #git
05:14 learning joined #git
05:14 webguynow joined #git
05:14 rory joined #git
05:15 cwre joined #git
05:16 VladGh joined #git
05:17 Pursuit joined #git
05:17 ePirat joined #git
05:18 codedmart joined #git
05:18 karols146 joined #git
05:18 Captain_Beezay joined #git
05:19 NightMonkey joined #git
05:19 thierryp joined #git
05:20 tazle_ joined #git
05:20 Derega_ joined #git
05:20 lukasdboer joined #git
05:20 creppe joined #git
05:20 crater2150 joined #git
05:20 Remram joined #git
05:20 asd5a joined #git
05:20 UncleCJ joined #git
05:20 rcn joined #git
05:20 osse joined #git
05:21 hahuang61 joined #git
05:21 jokester joined #git
05:21 teprrr joined #git
05:21 bsanford joined #git
05:21 batrick joined #git
05:21 Remramm joined #git
05:21 spinningarrow[m] joined #git
05:21 wizardedit joined #git
05:21 wizardedit joined #git
05:21 justanotheruser joined #git
05:22 Aaeriele joined #git
05:22 howitdo joined #git
05:22 saintaquinas[m] joined #git
05:22 alcohol joined #git
05:22 bouncy joined #git
05:22 unclechu joined #git
05:23 k-man joined #git
05:23 ash_workz joined #git
05:23 SebastianFlyte joined #git
05:26 Brski joined #git
05:29 cyphase joined #git
05:30 waveclaw joined #git
05:30 inflames joined #git
05:30 ojdo joined #git
05:31 Andrew_K joined #git
05:31 pks joined #git
05:32 pdgwien joined #git
05:33 peterbecich joined #git
05:34 madgoat joined #git
05:34 dreiss joined #git
05:34 sea-gull joined #git
05:34 madgoat left #git
05:36 imack joined #git
05:38 diget_ left #git
05:38 diget joined #git
05:41 manuelschneid3r joined #git
05:42 dersand joined #git
05:42 gtristan joined #git
05:44 pbrewczynski joined #git
05:47 qt-x joined #git
05:48 Raging_Hog joined #git
05:48 ThomasLocke joined #git
05:56 cyphase joined #git
05:56 thierryp joined #git
05:56 Levex joined #git
05:57 kbeflo_ joined #git
05:57 xall_ joined #git
06:00 mmh joined #git
06:00 austin987 joined #git
06:01 _Vi joined #git
06:04 Grievre joined #git
06:06 rscata joined #git
06:06 Cabanossi joined #git
06:07 xall_ joined #git
06:08 xall joined #git
06:10 xall i want to exlude *.lock files from git log --patch output. is it possible to add exclude from git log --patch?
06:10 xall doh. looks simple enough
06:11 ankeetshk joined #git
06:12 ankeetshk what is reflect in git
06:12 _Vi joined #git
06:13 roelmonnens joined #git
06:14 chele joined #git
06:15 xall looks like i want git log --stat -p -- . ':(exclude)*.lock*'
06:15 _28_ria joined #git
06:16 sarri joined #git
06:16 sarri joined #git
06:17 ResidentBiscuit joined #git
06:19 _Vi joined #git
06:20 freimatz joined #git
06:21 acetakwas joined #git
06:23 Levex joined #git
06:25 diogenese joined #git
06:26 PaulePanter joined #git
06:26 _ikke_ ankeetshk: reflect?
06:27 ankeetshk yes
06:27 ankeetshk reflect directory
06:27 JeroenT joined #git
06:27 zeroed joined #git
06:27 zeroed joined #git
06:27 _ikke_ That's not git related
06:27 ankeetshk i have heard someone discussing about reflect
06:28 ankeetshk are you sure
06:28 _ikke_ I'm pretty sure
06:28 ankeetshk what is staging area
06:28 ankeetshk in git
06:28 _ikke_ !staging
06:28 gitinfo [!index] The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
06:29 _ikke_ Git allows you to select exactly what you want to commit, but first adding it to a 'staging area'.
06:33 alexandre9099_ joined #git
06:35 zxd joined #git
06:37 jokajak joined #git
06:39 zxd didn't quite understand the difference between "Documentation/*.html"  and "/Documentation/*.html"  in .gitignore
06:39 Silmarilion joined #git
06:41 _ikke_ The latter only ignores html files in the top Documentation directory
06:41 rokups joined #git
06:41 _ikke_ the former ignores html files in any Dcoumentation directory
06:46 Murii joined #git
06:49 jokajak joined #git
06:49 dtrott joined #git
06:49 robertparkerx my gitignore is not working for wpengine
06:49 robertparkerx it keeps trying to upload files that are located in directorys i have put in gitignore and files
06:50 _ikke_ !ignore_tracked
06:50 gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
06:51 levex_ joined #git
06:52 chachasmooth joined #git
06:52 MineCoins joined #git
06:54 JeroenT_ joined #git
06:54 robertparkerx sorry im new and now it makes sense lol
06:58 jokajak joined #git
06:58 Rodya_ joined #git
07:01 zxd _ikke_: what does top directory means? example ?
07:01 zxd does it mean absolute path?
07:01 zxd from git root?
07:02 zxd or starting from the path where .gitignore is located
07:03 _Vi joined #git
07:03 schleppel joined #git
07:04 miczac joined #git
07:05 MineCoins joined #git
07:06 Levex joined #git
07:06 jast zxd: you can put .gitignore in any directory inside a Git repo. a pattern without the leading slash it applies in that directory and any subdirectories; with the slash it applies only to the directory in which the .gitignore file lives (the one containing the pattern)
07:06 jast so, for example, if you put a .gitignore at the top level of the repo, Documentation/*.html will match Documentation/foo.html but also bazinga/Documentation/foo.html
07:07 exotime joined #git
07:07 Raging_Hog joined #git
07:08 onmeac joined #git
07:08 theoceaniscool joined #git
07:08 thierryp joined #git
07:09 overlord_tm joined #git
07:09 venmx joined #git
07:10 Gloomy joined #git
07:10 drodger joined #git
07:11 sea-gull joined #git
07:11 TomyWork joined #git
07:14 jameser joined #git
07:15 rominronin joined #git
07:15 elect__ joined #git
07:16 wizonesolutions joined #git
07:18 zefferno joined #git
07:18 twisted` joined #git
07:19 zeroed joined #git
07:23 Silenced joined #git
07:23 _Vi joined #git
07:24 sbulage joined #git
07:24 _ng joined #git
07:26 JeroenT joined #git
07:26 mattcen Hi folks. I have a file 'foo' with private info in it. Mostly this file is edited in its own commit, but sometimes its commit is combined with edits to other files. I want to (a) split such commits in two: other files, and 'foo' edits; then (b) reorder commits so all commits to 'foo' are at the top of history.
07:27 mattcen I assume git-filter-branch is what I need here, but I'm struggling to work out the best way to invoke it (I don't use it often so it's black magic). Anybody able to help, please?
07:32 JeroenT joined #git
07:34 zxd thanks
07:34 Seveas mattcen: git rebase -i is what I'd use
07:34 Seveas it can split commits and reorder them
07:34 JeroenT joined #git
07:39 Introoter joined #git
07:39 zxd in what cases could git author name and committer become different?
07:41 vuoto joined #git
07:41 aidalgol joined #git
07:41 cicppi joined #git
07:42 osse zxd: I create a patch with git format-patch, send it to you, and you apply it with git am.
07:42 Raging_Hog joined #git
07:43 troyt joined #git
07:45 MrMojit0 joined #git
07:49 buzzLightBeer joined #git
07:50 _ikke_ zxd: rebase, commit amending
07:51 King_Hual joined #git
07:58 aax joined #git
08:01 zeroed joined #git
08:02 thierryp joined #git
08:02 kurkale6ka joined #git
08:04 senaps joined #git
08:04 clmsy joined #git
08:06 dvaske joined #git
08:08 dsdeiz joined #git
08:08 dsdeiz joined #git
08:11 dglambert joined #git
08:11 dglambert yo
08:12 redeemed joined #git
08:15 gtristan joined #git
08:16 no_gravity joined #git
08:16 robertparkerx joined #git
08:16 robertparkerx joined #git
08:16 bipolar joined #git
08:16 no_gravity Looks like "git diff --color-words=." does not colorize changed whitespace. Can that be fixed?
08:18 marcogmonteiro joined #git
08:20 drodger joined #git
08:21 svm_invictvs joined #git
08:23 tlaxkit joined #git
08:26 dglambert Hey if I want to diff two commits using my default diff tool, how do I do that
08:27 _ikke_ dglambert: man git difftool
08:27 gitinfo dglambert: the git-difftool manpage is available at http://jk.gs/git-difftool.html
08:29 kbeflo joined #git
08:29 dglambert so what is the point of path
08:29 dglambert I thought I had a guess when calling it with just git diff
08:30 dglambert nvm, I found it in these docs
08:31 kbeflo joined #git
08:33 m0rdonez joined #git
08:33 concerti joined #git
08:35 boz_v1 joined #git
08:36 flaviodesousa joined #git
08:39 fbwnd joined #git
08:41 notebox joined #git
08:41 Dookie12 joined #git
08:42 Ice_Strike joined #git
08:42 no_gravity I use "git status -v" to show me the changes of staged files. How can I make it paginate those?
08:45 zulutango joined #git
08:48 borkr joined #git
08:48 dorian_ left #git
08:48 canoon joined #git
08:50 no_gravity Looks like "git diff --cached" works for that purpose.
08:52 Cabanossi joined #git
08:54 Raging_Hog joined #git
08:59 t-mart joined #git
08:59 fstd joined #git
08:59 aboccia joined #git
09:00 achadwick joined #git
09:01 MarioJC joined #git
09:01 lofkhs joined #git
09:03 robotroll joined #git
09:03 Gloomy joined #git
09:04 hetleq joined #git
09:06 Ardethian\work joined #git
09:07 catphish joined #git
09:09 afuentes joined #git
09:10 ahf joined #git
09:12 a_thakur joined #git
09:12 t-mart joined #git
09:13 a_thakur joined #git
09:16 howitdo joined #git
09:16 howitdo joined #git
09:16 catphish does git support socks proxies in any way? or does this come down to the underlying transport?
09:17 catphish for example if i wanted to clone a git repository via ssh or https via a proxy
09:17 Endarked joined #git
09:18 osse catphish: gi is just an "end user" of ssh. for https git uses git-receive-pack which in turn lets you do whatever libcurl lets you do, afaik
09:19 osse I mean git-http-fetch
09:19 catphish osse: i thought that might be the case, looks like ssh can be pursuaded to use a proxy though, as can curl, so hopefully i can get something working
09:19 catphish thank you
09:20 osse catphish: i'd search for "proxy" in man git-config.
09:20 gitinfo catphish: the git-config manpage is available at http://jk.gs/git-config.html
09:21 osse catphish: maybe you can make sense of it :p
09:21 catphish appears non-trivial :)
09:23 tvw joined #git
09:23 dnukem|2 joined #git
09:27 bariscant joined #git
09:28 nowhere_man joined #git
09:32 p4trix joined #git
09:33 cschneid joined #git
09:35 jnavila joined #git
09:36 Cabanossi joined #git
09:37 Superpanda joined #git
09:37 zoologist joined #git
09:38 Superpanda left #git
09:40 nicechap joined #git
09:40 mischat joined #git
09:43 PasiFist joined #git
09:43 drodger joined #git
09:46 Brando753-o_O_o joined #git
09:47 acetakwas joined #git
09:47 de-vri-es joined #git
09:47 nicechap joined #git
09:48 Blkt joined #git
09:48 thierryp joined #git
09:48 nicechap joined #git
09:49 rt joined #git
09:50 YuGiOhJCJ joined #git
09:50 IRQ` joined #git
09:52 kjsaihs joined #git
09:53 m0rdonez joined #git
09:59 vuoto joined #git
10:00 jnavila joined #git
10:02 thierryp joined #git
10:03 vuoto joined #git
10:04 p4trick joined #git
10:04 theoceaniscool joined #git
10:05 pietv joined #git
10:05 Darcidride joined #git
10:07 b100s joined #git
10:07 b100s hi2all; why i have in .git/config and in .gitmodules same string about my submodule?
10:09 s17 i use proxychains
10:09 mattcen Seveas: Thanks, that was going to be my first choice, actually, before I realised I have a few dozen commits and filter-branch might be easier to automate. It sounds like I can automate rebase -i though, too, so I'll go back to that and try some more stuff, perhaps. Thanks!
10:09 s17 'proxychains git push dev' works fine for me
10:09 Forlorn joined #git
10:11 kexmex joined #git
10:13 GT joined #git
10:14 sunri5e joined #git
10:15 rchavik joined #git
10:18 ResidentBiscuit joined #git
10:19 Silenced joined #git
10:19 aard_ joined #git
10:24 voker57 joined #git
10:28 * ssarah hallo
10:34 jast b100s: .gitmodules is the place where the submodules are defined (and shared with other people who use the repo). when you initialize submodules in your local repo, all the settings are copied to the config file and used from there, allowing you to customize the settings locally if you need to
10:35 b100s jast, when i update .gitmodules i'm going to use old one cos .git/config keeps it?
10:36 Cabanossi joined #git
10:36 andrew710 joined #git
10:40 Murii joined #git
10:41 RWAG joined #git
10:42 bomb-on joined #git
10:43 reactormonk[m] joined #git
10:49 vuoto joined #git
10:54 Tobbi joined #git
10:54 mattcen Seveas: That rebase did the job, even if it did involve some button-mashing to repeat the operations I needed at each commit (not worth investigating how to automate). Thanks again!
10:54 courrier joined #git
10:55 reactormonk[m] How would you split a commit? Is there a way to create a new commit form the diff of two different ones, so I can apply some changes (A -> B), then create a new commit to get from B to C?
10:55 ShapeShifter499 joined #git
10:55 byte512 joined #git
10:55 grawity !interactive_rebase, !postproduction
10:55 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
10:55 gitinfo So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
10:56 chipotle joined #git
10:58 SantaClauze joined #git
10:58 sotoz joined #git
11:00 Ryanar joined #git
11:01 dsdeiz joined #git
11:03 SilverBe joined #git
11:04 ppf joined #git
11:04 ppf hi
11:04 Acerific joined #git
11:04 Acerific joined #git
11:04 ppf is there a way to look at a staged file?
11:05 grawity git show :foo.c
11:05 ppf i.e., not the diff, but cat the whole staged blob?
11:05 ppf ha, that was easyt
11:06 ppf thanks!
11:06 ppf where's that documented?
11:07 ppf in gitrevisions(7)
11:07 ppf excellent :)
11:07 grawity it's a shorthand for :0:foo
11:08 roelmonn_ joined #git
11:11 kbeflo_ joined #git
11:13 xall joined #git
11:13 kbeflo_ joined #git
11:14 xissburg joined #git
11:14 andrew710 joined #git
11:15 msm joined #git
11:19 Lauven joined #git
11:25 ppf left #git
11:25 trouble_man joined #git
11:26 irqq joined #git
11:29 flegent joined #git
11:29 thib joined #git
11:29 trouble_man Hi, I want to 'undo' my rebase. I'm not an expert in git i don't want screw up something. Here is screenshot http://imgur.com/a/824A5
11:29 govg joined #git
11:30 scoobertron joined #git
11:30 trouble_man Anyone cope with this task?
11:32 moritz trouble_man: generally the way to undo a rebase is to use the reflog ('git reflog', 'git log -g') to find the old hash that your branched pointed at before the rebase
11:32 grawity that looks like a2c7232 HEAD@{38} was the commit
11:32 moritz trouble_man: and then use git reset --hard <that hash> to reset your branch to that commit
11:33 trouble_man so in my case is a2c7232?
11:33 grawity yes
11:33 catphish left #git
11:34 grawity well, `git log` it and see if that looks right
11:35 ronskisika joined #git
11:36 nd joined #git
11:36 Levex joined #git
11:38 acetakwas joined #git
11:40 acetakwas joined #git
11:40 armyriad joined #git
11:42 acetakwas joined #git
11:42 maks_ joined #git
11:44 ZyX-I joined #git
11:48 trouble_man That looks prety nice now, but it doesnt affect on repository; or maybe when I do rebase now from registration_login branch to master it will resolve that situation?
11:48 trouble_man http://imgur.com/a/4KkPo
11:48 trouble_man pretty*
11:48 grawity doesn't affect *which* repository?
11:49 jast b100s: yes
11:49 trouble_man remote (on a visualstudio github)
11:50 grawity it sounds like you have rebased, then pushed the rebase?
11:50 trouble_man that should be done like you said, but im afraid it didnt
11:51 trouble_man now i have everthing good on local
11:51 trouble_man and I want that repository looks same
11:52 ronator joined #git
11:52 IternetPerson joined #git
11:53 trouble_man as You can see I have a queue of incoming commits
11:56 dsdeiz joined #git
11:57 xall joined #git
11:59 leeN joined #git
12:00 elsevero joined #git
12:02 a_thakur joined #git
12:03 aw1 joined #git
12:04 synthroid joined #git
12:04 devin- joined #git
12:04 devin- yo
12:05 MineCoins joined #git
12:07 xall joined #git
12:08 gunnaro joined #git
12:09 jnavila_ joined #git
12:11 marianina8 joined #git
12:11 no_gravity joined #git
12:11 scottjl joined #git
12:12 no_gravity When I have no uncommited changes and just did "fetch /some/repo/" - does it make any difference if I run "git merge" or "git rebase"?
12:14 RichiH no_gravity: it sounds as if both would be no-op
12:14 RichiH so no, no difference
12:14 no_gravity no-op?
12:14 no_gravity The would merge the commits from /some/repo/.
12:15 no_gravity *I* have made no changes to my repo/working-tree. But there are new commits in /some/repo/.
12:16 synthroi_ joined #git
12:16 RichiH no_gravity: so you are planning to fast-forward repo/working-tree to the state in /some/repo/?
12:17 no_gravity I think you could say so, yes.
12:17 RichiH merge might produce a commit message depending on your settings
12:17 no_gravity It won't.
12:18 no_gravity We avoid commit messages at all costs. There is not a single one in our history.
12:18 no_gravity Also since there is nothing changed in my repo, git would not request a commit message if I did "git merge".
12:19 no_gravity That's why I wonder if there is a difference between "merge" and "rebase" in this case.
12:19 no_gravity If I had local changes, there would be a difference of course.
12:19 RichiH 14:18:07 < no_gravity> We avoid commit messages at all costs. There is not a single one in our history.
12:19 RichiH wat?
12:19 no_gravity "merge messages"
12:20 no_gravity s/commit messages/merge messages :)
12:20 no_gravity "merge commits" to be exact.
12:20 no_gravity We don't have merge commits.
12:20 no_gravity Only fast forward commits.
12:21 no_gravity merges.
12:21 no_gravity Jesus.
12:21 no_gravity Only fast forward merges. I think that is the correct terminology.
12:23 theoceaniscool joined #git
12:24 HoierM joined #git
12:25 elsevero joined #git
12:26 elsevero joined #git
12:34 venmx joined #git
12:36 gugah joined #git
12:36 canoon joined #git
12:36 buffal0 joined #git
12:39 CountryNerd joined #git
12:41 scottjl joined #git
12:41 nowhere_man joined #git
12:41 jnavila_ joined #git
12:41 RichiH no_gravity: "linear history" is what you're looking for
12:43 bomb-on joined #git
12:43 Silenced joined #git
12:43 Nilesh_ joined #git
12:44 bomb-on hi all! i have some strange git-flow state in my repo, i think git kraken did some dirty stuff behind the scenes...
12:44 bomb-on essentially, i cannot start new release...
12:44 bomb-on i get an error "There is an existing release branch (release-0.2.0 release/release-0.2.2 release/release-0.2.3 release/release-0.2.4 release/release-1.0.0-alpha). Finish that one first."
12:45 bomb-on the thing is that i did "finish" them in git kraken, but it seems my other git clients are not aware of it :/
12:45 TheWild joined #git
12:45 TheWild hello
12:45 bomb-on so... is there a way to tell to git-flow to mark all releases as finished or something like that?
12:45 TheWild which means machine-readable: porcelain or plumbing?
12:46 dglambert joined #git
12:47 _ikke_ plumbing
12:48 _ikke_ (note that some command have an option called --porcelain, which mains that it's output built to create porcelain from)
12:48 TheWild https://git-scm.com/docs/git-push
12:48 wandering_vagran joined #git
12:48 xall joined #git
12:49 TheWild good point. I found --porcelain quite confusing.
12:49 TheWild git push --porcelain: Produce machine-readable output.
12:50 IRCFrEAK joined #git
12:52 IRCFrEAK left #git
12:52 maks_ joined #git
12:55 jeffreylevesque joined #git
12:57 elsevero joined #git
12:58 Hz joined #git
13:00 dan2k3k4 joined #git
13:01 grift joined #git
13:01 mda1 joined #git
13:02 livingstn joined #git
13:02 Sound joined #git
13:05 Sound_ joined #git
13:05 Gsham joined #git
13:06 Ricaz joined #git
13:06 ankit01ojha joined #git
13:06 Cavallari joined #git
13:09 Ricaz If I accidentally added some files, modified .gitignore to exclude them, how do I apply the .gitignore changes before committing?
13:09 rafalcpp joined #git
13:09 _Vi joined #git
13:10 grawity `git rm --cached` them
13:10 dan2k3k4 joined #git
13:10 theoceaniscool joined #git
13:11 Ricaz grawity: thanks, --cached just means they will stay on filesystem and be ignored by git?
13:12 marianina8 joined #git
13:13 grawity --cached means you are removing them from the staging area / the index
13:13 marianina8 joined #git
13:13 grawity (which back then was also called the cache)
13:14 Derega_ left #git
13:15 cdg joined #git
13:15 chitopunk joined #git
13:17 Ryanar joined #git
13:17 ResidentBiscuit joined #git
13:18 orbyt_ joined #git
13:18 bsanford joined #git
13:19 thebope joined #git
13:22 djb-irc joined #git
13:25 a_thakur joined #git
13:26 Sound_ joined #git
13:28 berndj halp, on switching branches git says i'm ahead by 3 commits, but 'git push' does nothing
13:29 bremner what about "git push the-remote the-branch"
13:29 bremner where the-remote is probably
13:29 bremner "origin"
13:30 * RichiH licks the bremner
13:30 RichiH tasty
13:30 Eryn_1983_FL joined #git
13:31 Zimoo joined #git
13:32 theiostream joined #git
13:34 berndj bremner, yeah, git push REMOTE BRANCH got the changes up, but i've never needed to do this before. plain 'git push' has always worked just fine
13:34 DarkPsydeLord joined #git
13:35 berndj might my cow orkers have done a forced push?
13:35 _ikke_ No, that has nothing to do with that
13:35 rwb joined #git
13:36 marianina8 joined #git
13:36 roelmonnens joined #git
13:36 davidosomething joined #git
13:36 berndj hmm, the git server i'm pushing to has a system time that's a bit over 10 minutes ahead. is that an issue?
13:37 berndj nothing makes sense anymore
13:37 canton7 berndj, after trying to push, does 'git status' still say you're 3 commits ahead?
13:38 berndj canton7, sorry, i didn't think to get a git status before bullying git into taking my changes (i reset hard and then merged my changes slightly differently, and that got sent up)
13:39 oleo joined #git
13:39 berndj 3 commits ahead was correct according to git log BRANCH vs git log REMOTE/BRANCH
13:43 berndj for reference: https://pastebin.com/RkTnXpVt
13:43 plexigras joined #git
13:44 plexigras how can i get a list of files that are diffrent from the master branch?
13:44 _ikke_ compared to the current branch?
13:45 plexigras jup. how do i do that?
13:45 dAnjou joined #git
13:47 _ikke_ git diff --name-only master
13:47 qqx git diff --name-only master HEAD
13:47 qqx _ikke_: That would compare the working tree, not the current branch.
13:47 Dougie187 joined #git
13:47 qqx If there are uncommitted changes.
13:47 elsevero joined #git
13:48 plexigras thanks guys
13:49 alexandre9099 joined #git
13:49 dAnjou hi, as far as I understand if you push and there is no upstream branch it aborts and suggests a command that would create it and push. Is it possible that I get a prompt which asks me whether I want to create it and push?
13:50 arooni joined #git
13:50 jast dAnjou: Git doesn't implement any such prompt
13:51 roby10 joined #git
13:54 rchavik joined #git
13:54 Dougie187 jast: but you could write a bash script that does that, and then alias it to `git push` right?
13:55 Dougie187 Or alias it to something else rather.
13:55 mda1 joined #git
13:56 bannakaffalatta joined #git
13:56 Es0teric_ joined #git
13:57 Cavallari1 joined #git
13:57 marianina8 joined #git
13:58 MineCoins joined #git
13:58 YuGiOhJCJ joined #git
14:00 dAnjou jast: thanks. I guess push.default=upstream could work for me.
14:00 ahrs joined #git
14:00 dAnjou no, it doesn't
14:01 raijin joined #git
14:01 shinnya joined #git
14:02 AaronMT joined #git
14:03 buffffal00 joined #git
14:04 g105b joined #git
14:05 unbalancedparen joined #git
14:05 exotime joined #git
14:05 xall joined #git
14:05 kpease joined #git
14:06 Endarked joined #git
14:06 unbalancedparen left #git
14:07 dAnjou current does
14:08 caper joined #git
14:08 caper What syntax does the .gitconfig use?
14:09 lavalamp joined #git
14:09 bremner ini-ish
14:09 seni joined #git
14:10 dserodi_ joined #git
14:10 seni if I want to change the local git account settings, what else do I need to change other than email and username?
14:10 seni (ive done that and am still blocked)
14:10 bremner blocked how?
14:11 al-damiri joined #git
14:11 seni computer had a different user that has left. im using it now, after changing user and email I still get "Your account has been blocked."
14:12 canton7 *what* tells you "Your account has been blocked"?
14:12 trouble_man joined #git
14:12 seni lol
14:12 seni git
14:12 canton7 what command?
14:12 seni when I do git fetch
14:12 seni or git pull
14:12 LeBlaaanc joined #git
14:12 canton7 what is it fetching / pulling from? a remote on github? bitbucket?
14:12 seni gitlab
14:13 canton7 is it an ssh url, or a http one?
14:13 canton7 (`git remote -v` to print the url)
14:13 seni ssh
14:13 kbs joined #git
14:13 Noldorin joined #git
14:14 Dougie187 ssh keys then.
14:14 canton7 seni, then gitlab uses your ssh public key to figure out who you are
14:14 seni ah ofc
14:14 seni ye thanks
14:14 publio joined #git
14:14 canton7 (the email/user configured in .gitconfig is just to control the details that are added to each commit - they aren't used for authentication)
14:14 Dougie187 You can use `ssh -vT` with the first part of the url (e.g. if it's git@gitlab.com:.../..., then `ssh -vT git@gitlab.com`
14:15 Dougie187 That'll tell you who it's trying to authenticate you as.
14:15 adac joined #git
14:15 adac Is it possible to overwrite an existing branch?
14:15 Dougie187 adac: yes
14:15 adac via git checkout -b
14:15 adac Dougie187, how can I do that?
14:15 Dougie187 adac: Not with `git checkout -b`, but you can use `git branch -f <branch_name> <branch_point>`
14:16 Dougie187 Maybe if you do `git checkout -f -b` but I don't know if it works like that.
14:16 adac Dougie187, I can try, thanks!
14:16 Es0teric_ joined #git
14:16 adac what is <branch_point> if I may ask?
14:17 dglambert joined #git
14:17 adac Dougie187, no with checkout it is not possible
14:17 Rodya_ joined #git
14:17 Dougie187 branch_point is where you want the branch to be at.
14:17 Dougie187 It's a commitish. Like another branch name, or a hash, or a tag, or HEAD.
14:18 Dougie187 etc.
14:18 adac kk, thanks!
14:18 dvaske joined #git
14:19 MarioJC joined #git
14:21 LionsMane joined #git
14:22 notebox joined #git
14:23 seni do I have to have ssh keys or can I authenticate with a pw? if I can then how do I set it up so when I do git fetch it asks for the pw of <user>@gitlab... instead of git@gitlab
14:24 bannakaf_ joined #git
14:24 jast password authentication works only via https:// links, not ssh-style links
14:24 jast on gitlab's side, that is
14:25 jast Git doesn't care, but the way gitlab magicks multiple users into one system account (git@) via SSH *requires* SSH keys
14:25 ResidentBiscuit joined #git
14:25 oleo ja but
14:25 seni I see. thank you
14:25 oleo how do i store something on my account via ssh links then ?
14:26 oleo i have enabled ssh but still use the https links.....
14:26 jast if you've got an existing local repository you have to update the URL in its config
14:26 jast e.g. git remote set-url origin https://gitlab.com/myname/myrepo.git
14:26 jast actually you wanted the other way around :)
14:27 oleo ya
14:27 oleo ah ok
14:27 jast git remote set-url origin git@gitlab.com:myname/myrepo
14:27 jast same basic idea, though
14:27 oleo ok, now i get it
14:28 oleo thank you :)
14:32 sz0 joined #git
14:35 madewokherd joined #git
14:36 Cabanossi joined #git
14:36 bsanford joined #git
14:37 masuberu joined #git
14:41 lb1c joined #git
14:42 Emperor_Earth_ joined #git
14:42 mischat_ joined #git
14:44 theoceaniscool joined #git
14:45 mischat_ joined #git
14:45 Sleepy63 joined #git
14:45 Es0teric joined #git
14:50 guampa joined #git
14:52 f3r70rr36f joined #git
14:54 Ricaz joined #git
14:56 dp joined #git
14:56 Levex joined #git
14:58 robotroll joined #git
15:00 govg joined #git
15:01 Random832 joined #git
15:04 leprechau joined #git
15:06 Vaelatern joined #git
15:09 mmh joined #git
15:11 roelmonnens joined #git
15:12 choki joined #git
15:12 plos joined #git
15:15 elsevero joined #git
15:18 delboy1978uk joined #git
15:19 delboy1978uk I have a git working repo, but no bare repo. How do I clone this to a bare one?
15:20 Dougie187 delboy1978uk: `git clone <repo> -- bare`
15:20 TomyLobo joined #git
15:20 Dougie187 err --bare.. not space.
15:20 JanC_ joined #git
15:20 elsevero joined #git
15:21 delboy1978uk ah that's it? lol, thanks Dougie187
15:21 Dougie187 Yup
15:24 nowhere_man joined #git
15:24 rominronin joined #git
15:24 ResidentBiscuit joined #git
15:24 mischat joined #git
15:25 Murii joined #git
15:27 eqy joined #git
15:27 scottchiefbaker joined #git
15:30 jagob joined #git
15:30 Gustavo6046 joined #git
15:32 p4trick joined #git
15:32 aielima joined #git
15:34 Gloomy joined #git
15:35 Es0teric_ joined #git
15:36 test joined #git
15:36 dreiss joined #git
15:36 Cabanossi joined #git
15:37 imack joined #git
15:37 digidog joined #git
15:39 oomemusss joined #git
15:39 admin__ joined #git
15:44 NeverDie joined #git
15:45 rigid left #git
15:45 matsaman joined #git
15:45 fakenerd joined #git
15:47 MattMaker joined #git
15:50 synthroid joined #git
15:50 plexigras how can i merge a branch so that all commits of the branch im merging are on top of the branch im merging in to?
15:51 tyreld joined #git
15:51 mmlb joined #git
15:52 nixjdm joined #git
15:54 tristanp joined #git
15:58 crose joined #git
15:59 theoceaniscool joined #git
16:01 JCaesar joined #git
16:01 dreiss joined #git
16:01 macivy joined #git
16:01 JCaesar Hm, can I somehow add a (global) hook that warns/asks me if I use commit -a when I have changes staged for commit?
16:01 Dookie12 joined #git
16:01 mischat joined #git
16:03 drodger joined #git
16:05 durham joined #git
16:07 permalac joined #git
16:07 chachasmooth joined #git
16:10 permalac joined #git
16:12 svm_invictvs joined #git
16:13 manuelschneid3r joined #git
16:14 midnightmagic joined #git
16:14 xissburg_ joined #git
16:15 cagomez joined #git
16:15 Ryanar joined #git
16:15 dendazen joined #git
16:17 glyfrp joined #git
16:20 guampa joined #git
16:20 synthroid joined #git
16:21 i7c I wouldn’t know how, but my knowledge might be limited.
16:21 i7c JCaesar, it’s probably better to discipline yourself not tu use commit -a ;)
16:24 cagomez joined #git
16:25 nitric joined #git
16:25 i7c My workflow goes something like: status; add -p; status; commit; log
16:28 IRQ` left #git
16:28 tang^ joined #git
16:30 thiago joined #git
16:31 mischat_ joined #git
16:31 tsp joined #git
16:32 synthroid joined #git
16:33 roby10 joined #git
16:34 dp joined #git
16:34 tsp left #git
16:35 hahuang65 joined #git
16:36 sfix left #git
16:37 synthroi_ joined #git
16:43 Dookie12 joined #git
16:43 MineCoins joined #git
16:43 Tobbi joined #git
16:44 nod joined #git
16:45 TikityTik joined #git
16:51 sunrunner20 Subtree question. Do I still need to separate commits for sub trees from commits to the main project, or is git now intelligent enough to figure out part of the commit is for a subtree(s)
16:53 mischat joined #git
16:54 achadwick joined #git
16:54 mischat joined #git
16:56 ethali joined #git
16:56 nowhere_man joined #git
16:59 Ryanar joined #git
17:01 abh joined #git
17:01 pbrewczynski joined #git
17:01 MasterNayru joined #git
17:01 Es0teric joined #git
17:03 SamSagaZ__ joined #git
17:04 nicechap joined #git
17:04 inovas joined #git
17:04 digidog joined #git
17:04 LionsMane joined #git
17:06 nicechap left #git
17:10 ssarah joined #git
17:12 MattMaker joined #git
17:12 thebope joined #git
17:13 kiltzman joined #git
17:14 mda1 joined #git
17:14 MineCoins joined #git
17:16 kiltzman joined #git
17:20 gopar joined #git
17:22 Arkaniad joined #git
17:23 Random832 joined #git
17:23 chris3492 joined #git
17:25 ankit01ojha joined #git
17:26 dtrott joined #git
17:27 Levex joined #git
17:27 nowhere_man joined #git
17:27 miczac joined #git
17:28 ajaXHorseman joined #git
17:28 MattMake_ joined #git
17:30 Dookie14 joined #git
17:31 peterbecich joined #git
17:32 elatllat joined #git
17:33 elatllat why is diff3 conflicting on non-overlapping changes? https://pastebin.com/VKrAQUkX
17:34 zxd joined #git
17:34 zxd what's the difference between ref and refspec?
17:35 ojacobson elatllat: each change overlaps with the other's context
17:35 MineCoins joined #git
17:35 livingstn joined #git
17:36 elatllat ojacobson: depending on how one might define that, is there any documentation or do you know why that context was chosen?
17:36 ojacobson the context is N lines directly adjacent to the actual change, for some configurable value N (usually 3 by default, or as many as are available if the file isn't long enough for there to be N lines before the start/end of the file is reached)
17:37 freimatz joined #git
17:37 jesst_ joined #git
17:38 TbobbyZ joined #git
17:39 vuoto joined #git
17:39 elatllat ojacobson: display context is 3 lines by default but that is unrelated to merge which is 1 line....
17:39 qqx zxd: A ref is just a single item, a refspec is a mapping between local and remote ref names often using a pattern.
17:40 elatllat zxd: https://git-scm.com/book/en/v2/Git-Internals-Git-References https://www.git-scm.com/book/tr/v2/Git-Internals-The-Refspec
17:40 timetrex joined #git
17:40 BrianBlaze left #git
17:41 duderonomy joined #git
17:43 Endarked joined #git
17:43 Cavallari joined #git
17:45 sbulage joined #git
17:45 zxd qqx: refspec's are used only for fetch/pull no other keys like  merge =    , ?
17:46 Es0teric joined #git
17:46 qqx zxd: They're used for fetch/push. (pull uses merge in the background). I don't understand your question about other keys.
17:48 elatllat zxd: fetch/pull and push only (you can't merge a non local thing so you need to fetch it first).
17:50 zxd yes was just wondering about          merge = refs/heads/master  under [branch "master]
17:51 ojacobson it's a single ref
17:51 relipse joined #git
17:51 relipse i did a git merge and I noticed a file with differences that did'nt seem to come from the branch that i merged.. how do I see those differences (instead of just the + signs to the left)
17:51 Cabanossi joined #git
17:52 manuelschneid3r joined #git
17:52 cbreak git show -m
17:52 cbreak also look at --cc and co
17:54 relipse thanks cbreak
17:56 amrits joined #git
17:58 zxd joined #git
17:58 notebox joined #git
17:59 elatllat relipse: git merge dry run noff is a nice option to check before commit, also git mergetool -t vimdiff will show you the 4 versions of a file.
18:01 ajaXHorseman joined #git
18:01 zxd git config --global user.name  isn't the same as GIT_AUTHOR_NAME environment variable ?
18:02 vuoto joined #git
18:03 SteffanW joined #git
18:03 zxd what's the environment variable for setting user.name ?
18:03 zxd I don't want to use the config file
18:03 elatllat even the not global config?
18:04 Sasazuka joined #git
18:04 elatllat GIT_AUTHOR_NAME and GIT_COMMITTER_NAME
18:04 elatllat https://git-scm.com/docs/git-config
18:08 atomi joined #git
18:08 svm_invictvs joined #git
18:09 zxd yes I set those
18:10 livingst_ joined #git
18:10 zxd but git still complains about missing email and user.name
18:10 zxd when commiting
18:11 Gustavo6046 joined #git
18:11 zxd wait now it's quiet
18:12 zxd after setting email variable
18:12 bremner well, at some point you have to pick your battles
18:12 Cavallari joined #git
18:12 thierryp joined #git
18:13 HoierM joined #git
18:13 thierryp joined #git
18:16 t0by joined #git
18:18 s17 i have a git repo hosted at bitbucket, on my local machine, i have a branch with modifications, on bitbucket the branch is empty.  i try to push origin branchname, but nothing gets pushed .. it just says "everything up to date"
18:18 s17 what can i do to get the modifications pushed? :|
18:20 diogenese joined #git
18:21 plasticle joined #git
18:22 ajaXHorseman joined #git
18:22 SamSagaZ__ joined #git
18:22 Es0teric joined #git
18:22 dzho s17: is the remote branch really empty, now? is the remote origin really set to the right bitbucket path?
18:22 dzho is it a private repo on bitbucket?
18:22 elsevero joined #git
18:23 kadoban joined #git
18:24 ethali joined #git
18:26 s17 well, sorry, it's not empty.  it's saying that it does not have any changes.  last changes are from 30-Jan
18:26 peepsalot joined #git
18:27 dvaske joined #git
18:27 Gustavo6046 joined #git
18:27 dzho and what does git log say is the last date of the changes in the local branch?
18:27 s17 january 30 :(
18:27 s17 but I've even done git add and git commit
18:27 s17 today
18:28 dzho it would seem not to the right branch
18:28 s17 hm
18:28 wintrytbs joined #git
18:28 dzho how many branches do you have?
18:28 s17 2, master and production
18:28 dreiss joined #git
18:28 s17 i'm trying to push production
18:29 s17 git status shows that i'm on production
18:29 matsaman joined #git
18:29 s17 do I have to do a git pull and would that overwrite anything that I've done today?
18:30 NeverDie joined #git
18:30 kexmex joined #git
18:30 acetakwas joined #git
18:30 dzho does git status show you as having a clean directory?
18:30 dvaske_ joined #git
18:30 ssarah joined #git
18:31 dzho are you ignoring any of the files you've been working on with .gitignore?
18:31 dzho are all the files you've been working on in the git-controlled folder or one of its subfolders?
18:31 Levex joined #git
18:32 s17 status is showing the branch is up to date with origin and changes are staged to be committed
18:32 dsteplight__ joined #git
18:32 irqq joined #git
18:32 dzho oh, well, staged is not committed
18:32 dzho then you need to commit
18:32 s17 but I've done commit
18:32 s17 let me try again
18:32 dzho uh
18:33 s17 i do commit -m "message", it shows me some differences
18:33 stoqn4o_pm joined #git
18:34 testme joined #git
18:34 s17 i do git push -u origin production, it says up to date :(
18:34 dzho so git status is clean, and git log shows your last commit as today?
18:34 leeN joined #git
18:34 peterbecich joined #git
18:34 s17 nope, still showing january 30,
18:34 s17 status still showing the files modified to be committed
18:35 dzho man I don't even know what you are doing
18:35 Igor_ joined #git
18:35 dzho but they're staged?
18:35 venmx joined #git
18:35 dzho do you have conflicts, then?
18:35 s17 yeah
18:35 s17 it doesn't show any conflicts
18:35 dzho what OS are you using?
18:36 s17 would it be safe to remove the remote branch and then try pushing?
18:36 s17 there are 40 files modified today
18:36 dzho what would you push?
18:36 s17 i just don't want to lose those changes
18:36 dzho if your local branch has nothing new I'm not sure that's what helps
18:37 * dzho doesn't use -u so not sure how that comes into play here
18:37 s17 hm
18:39 Igor_ joined #git
18:40 s17 amazing what I can forget in just over 2 months time
18:41 s17 i just did git stash and then status shows working directory clean
18:41 govg joined #git
18:41 WeiJunLi joined #git
18:41 JrWebDev joined #git
18:41 JrWebDev how do i find out the local repo  i forgot what i used instead of origin - git push origin master
18:42 Acerific joined #git
18:42 moritz git remote -v
18:42 JrWebDev im using local
18:42 JrWebDev i put git remote -v but got no result
18:44 mda1 joined #git
18:45 Igor_ Hey there, could you help me with migration from SVN to Git? I am using 'git-svn', and I am getting errors constantly.
18:45 zerow joined #git
18:45 testme Igor_ what error code are you getting
18:46 Igor_ @testme, it's always the same thing at different occasions:
18:46 Igor_ error: bad index file sha1 signature fatal: index file corrupt write-tree: command returned error: 128
18:46 eroux joined #git
18:47 drodger joined #git
18:47 Igor_ testme
18:47 nickel_dime_look joined #git
18:48 testme Did you try to clean the git index?
18:48 Igor_ there's not index yet, testme
18:48 Cassiopaya joined #git
18:49 testme Igor_, my breadth of knowledge ends here
18:52 MattMaker joined #git
18:54 prg3 joined #git
18:57 mischat joined #git
18:57 gopar joined #git
18:57 learning joined #git
18:58 ajaXHorseman_ joined #git
19:02 jstimm joined #git
19:02 ajaXHorseman joined #git
19:03 dvaske_ joined #git
19:06 apotry joined #git
19:07 MattMaker joined #git
19:07 venmx joined #git
19:08 snits joined #git
19:09 JrWebDev joined #git
19:09 JrWebDev after i git commit -m "my commit".  would i still need to push it somewhere if im only going to use it locally?
19:10 rwp JrWebDev, If you are only using it locally then there is no requirement that you push it anywhere else.
19:10 JrWebDev how would i checkout or revert to an previous commit?
19:11 JrWebDev thanks rwp
19:11 nedbat JrWebDev: git checkout a1b2c3d4     or:     git checkout branch_name
19:11 NeverDie_ joined #git
19:12 skalpin it depends on how you want to reference the commit
19:12 JrWebDev thanks nedbat
19:12 rorro joined #git
19:12 sandroqz joined #git
19:12 acetakwas joined #git
19:12 JrWebDev git checkout branch_name will show you the latest commit within the specified branch correct skalpin ?
19:13 skalpin JrWebDev: it will checkout the branch and replace the files in your working directory with that branch
19:14 Cassiopaya joined #git
19:14 plasticle joined #git
19:14 JrWebDev cool but even though your "checking out" and it replaces the files.  as long as all commits and branches are intact you can swap around without deleting any data right?
19:14 rwp If you are wanting to browse read-only then checking out a previous commit works well as a "detached head" but if you want to fork at that point and make changes forward from there then it is best to create a new branch (git checkout -b newbranch) to checkout that commit and make further changes.
19:15 robertparkerx joined #git
19:15 JrWebDev i see.  it easy to get lost if you did this that way.  is there like a visual diagram one can use to see all the forks and branches?
19:15 JrWebDev within a linux environment
19:15 robertparkerx is it possible to push to multiple remote you have defined and the same bracket
19:15 rwp I don't quite understand your question about swapping around and deleting files.
19:16 robertparkerx like - git push origin, other1, other2 master
19:16 rwp If you are wanting a visual tool the usual graphical tool is gitk.
19:16 JrWebDev rwp cool
19:16 shgysk8zer0 joined #git
19:16 rwp But try this "git log --oneline --graph --decorate --color" and see if that does what you want from the command line.
19:16 JrWebDev rwp, i mean checking out different commits.  you wont lose data
19:16 cagomez joined #git
19:17 rwp You won't lose data. Git tries very hard never to lose data.
19:17 JrWebDev let me check it out
19:17 zerow joined #git
19:17 JrWebDev rwp tahts awesome!
19:17 rwp But some operations intrinsically are about losing data.
19:17 j416 !backup
19:17 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
19:17 robertparkerx is it possible to push to multiple remote you have defined and the same bracket
19:17 robertparkerx like - git push origin, other1, other2 master
19:18 j416 man git-push
19:18 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
19:18 j416 robertparkerx: <repository> is listed once
19:18 kbeflo__ joined #git
19:19 JrWebDev wow this git is serious. im new to it
19:19 kadoban robertparkerx: You can add multiple push URLs to a single remote, if that solves your problem.
19:19 JrWebDev thanks guys for your help
19:19 robertparkerx kadoban thanks!
19:20 kadoban (look at 'git remote set-url --add'
19:20 kadoban )
19:20 j416 kadoban++
19:20 rwp JrWebDev, The rule is see one, do one, teach one. You will be answering other people's questions at some point. :-)
19:20 _Vi joined #git
19:20 Es0teric joined #git
19:20 j416 rule o_O
19:21 drodger joined #git
19:21 JrWebDev i hope so rwp, i hope to get that experienced some day.
19:22 JrWebDev rwp ur awesome thanks
19:22 phos1 joined #git
19:23 phos1 I have a git process running in the backgroud, I accidentally had a 3GB file in the repo that it was trying to add. how do I stop it?
19:23 ojacobson kill git
19:23 ojacobson either foreground and ^C, or use kill(1) or your platform equivalent to interrupt it
19:24 ojacobson git's repo access is filesystem-safe; git dying mid-update generally won't mangle the repo (and if it does, it's a bug you should report)
19:24 phos1 It’s saying we need the job ID when I run kill GIT
19:26 phos1 I killed process from WHM. How do I get that file that’s half in OUT?
19:26 Emperor_Earth joined #git
19:27 drodger joined #git
19:27 kadoban There's not really such a thing as half-in, AFAIK. What does 'git status' report?
19:28 phos1 Well GIT add is taking a long time, the file is gone so I’m not sure why else it would be so slow
19:28 phos1 It’s usually instant
19:29 midnightmagic joined #git
19:33 skalpin phos1: did it finish or is it stuck?
19:33 phos1 still stuck
19:34 phos1 and still running
19:34 s17 hurray, I got past my problem by checking out the repo is a new directory and then diffmerge'ing the previous directories work :D
19:34 skalpin I bet it can't get to some file it needs, maybe something in the configuration?
19:34 s17 s/is/in/
19:35 phos1 skalpin: Any way to tell? Up until this massive file eevryhting was good
19:35 finalbeta joined #git
19:36 skalpin phos1: I'm searching but I don't know off the top of my head. I'm willing to be it will never finish though.
19:36 drodger joined #git
19:37 b100s joined #git
19:40 skalpin phos1: are you on osx?
19:40 phos1 Ubuntu. However I just found i have 15 files that are 200MB each that it’s trying to add
19:40 phos1 Trying to figure out what they are
19:41 matsaman joined #git
19:41 zivester joined #git
19:42 Es0teric joined #git
19:43 raijin joined #git
19:43 stoqn4o_pm joined #git
19:43 blunaxela joined #git
19:45 hhee joined #git
19:47 phos1 skalpin: So I removed those files, and killed all processes. It now says another process is running even though it nots
19:50 guardian hello, when using ident filter, $Id$ is replaced by $Id: sha1$
19:50 guardian how is sha1 computed?
19:50 guardian it's sha1 of what?
19:52 phos1 skalpin: Fixed, just deleted index.lock, and those large files and that sorted everythign
19:52 liamonade joined #git
19:53 digidog joined #git
19:53 rudi_s guardian: Of the blob, so more or less uselss in git.
19:54 xperia joined #git
19:55 rudi_s guardian: man gitattributes | less -p '   ident'
19:55 gitinfo guardian: the gitattributes manpage is available at http://jk.gs/gitattributes.html
19:55 digidog joined #git
19:56 guardian is there any way to replace $Id$ by the commit sha1 the file belongs to? I guess not
19:58 rudi_s No.
19:58 rudi_s guardian: ^
19:58 guardian k
19:58 guardian thanks
19:58 qqx guardian: Doing that would require that git rewrite every file where that is done every time the commit you're using changes. So git doesn't support that.
19:58 rudi_s np
19:59 adac joined #git
19:59 Es0teric joined #git
20:00 raijin joined #git
20:00 acetakwas joined #git
20:00 m0viefreak joined #git
20:01 ajpiano joined #git
20:03 xperia hi all i have two github repos of which this one https://github.com/allwinner-zh/bootloader/tree/master/u-boot-2011.09 cloned localy and now need to find the differences compared to this original github repo here https://github.com/allwinner-zh/bootloader/tree/master/u-boot-2011.09 so i am able to patch the differences to the newest u-boot repo on github here https://github.com/u-boot/u-boot
20:03 xperia Can somebody tell me how to get all the differences between a local cloned repo and a another remote repo using git so i am able to create a patch to be used later on a newer updated repo? thanks in advance for any help and tips.
20:03 lmatteis joined #git
20:04 xperia oops sorry the cloned one is this here https://github.com/LinuXperia/Cubietruck_Plus-u-boot/tree/master/u-boot-2011.09 and the remote one to compare this one https://github.com/allwinner-zh/bootloader/tree/master/u-boot-2011.09
20:06 Cabanossi joined #git
20:07 luke_nukem joined #git
20:07 b100s joined #git
20:09 Tobbi joined #git
20:09 Guest29350 joined #git
20:09 cjohnson do they have a shared history?
20:09 cjohnson namely is one a fork?
20:10 cjohnson or did you just copy the contents
20:12 netj joined #git
20:14 cdg joined #git
20:14 midnightmagic joined #git
20:15 cwre joined #git
20:16 xperia cjohnson: hmm not sure i am totaly new to this. i just cloned the second onw now too and tryed to sue git diff. this looks like it could worked but i am getting this error message here => set your diff.renameLimit variable to at least 775 and retry
20:17 stoqn4o__ joined #git
20:19 Forlorn joined #git
20:19 ajaXHorseman joined #git
20:20 cagomez joined #git
20:21 elsevero joined #git
20:21 raijin joined #git
20:23 albel727 joined #git
20:26 cagomez joined #git
20:31 albel727 joined #git
20:32 ResidentBiscuit joined #git
20:34 aidalgol joined #git
20:37 Es0teric joined #git
20:41 prg3 joined #git
20:41 raijin joined #git
20:46 ok91 joined #git
20:47 Atm0spher1c joined #git
20:48 atrus- is there a way to gc a particular orphan ref? i have one that got pushed into a repo inadvertedly, and i'd like it to be gone before somebody fetches it, but i don't neccesarily want to gc *everything* at the moment.
20:50 atrus- (it seems like the ref gets tx'd for filesystem fetches, even though nothing refers to it)
20:50 ojacobson just delete the ref
20:51 ojacobson gc doesn't apply to single refs, it applies to the whole object store
20:51 Dookie12 joined #git
20:51 Dookie14 joined #git
20:51 atrus- ojacobson: how would i delete a ref?
20:51 ojacobson git push --delete <remote> <ref name or pattern>
20:51 ojacobson or, on the remote, git update-ref -d <ref name>
20:52 ojacobson (git-branch and git-tag build on top of git update-ref)
20:52 exotime joined #git
20:53 atrus- so, by ref a guess i mean sha
20:54 atrus- 'git update-ref -d 970d512e4d471ab32d8d0ae40d9c310508711e17' doesn't prevent 'git show 970d512e4d471ab32d8d0ae40d9c310508711e17' from working
20:55 rudi_s atrus-: Remove the object from the object store in .git/objects/ on the remote host.
20:55 Orphis joined #git
20:55 Es0teric joined #git
20:55 atrus- rudi_s: is that safe?
20:55 ojacobson You can't remove single objects safelty.
20:56 rudi_s ojacobson: ?
20:56 rudi_s atrus-: I don't see why not. It's a single commit object, so removing it should be fine.
20:56 ojacobson rudi_s: you can delete the file or pack, but you're taking the risk that you leave holes in the git object graph by doing that.
20:56 phos1 left #git
20:56 ojacobson if the commit has incoming references from other objects, those other objects will break
20:56 ojacobson If it is paramount that that object disappear, prune the reflog and repack the repo
20:56 rudi_s Well, if it's a single commit/ref that should be removed (and nobody fetched it), then that should work fine.
20:56 urda joined #git
20:57 ojacobson or replace the repo with a fresh clone of itself and transplant the config and hooks
20:57 atrus- i guess that's why i was hoping there'd be a git-gc approach that would work.
20:58 atrus- ideally i do want this to be in the context of a pre-receive hook to prevent it from happening again
20:58 ojacobson git's object model isn't really amenable to anything other than full gc :)
20:58 rudi_s atrus-: There's also git prune which might help, if the commits are not reachably anymore and not packed.
20:58 atrus- backing up a bit: i'm trying to make sure that people stop accidentally pushing one of our large repos into one of our other unrelated large repos (which seems to happen every few months)
20:58 ojacobson (by the time pre-receive runs, it's too late to block an object: it's already in the repo so that the hook can inspect it.)
21:00 courrier joined #git
21:01 ojacobson possible plan B: use a common object store for both repos ;)
21:01 ojacobson you'd still have them intermixed on disk, but you wouldn't have to worry about either repo abruptly bloating, because you'd already have paid for all the bloat
21:01 atrus- so i could throw a 'git gc --prune=all --aggressive' in the pre-receive hook.
21:02 orbyt_ joined #git
21:02 alexandre9099 joined #git
21:02 atrus- ojacobson: some people really like to clone over nfs every time they pick up a new story :/
21:02 ojacobson augh don't use --aggressive without a solid understanding of what it does, it's a badly-designed option with an attractive-looking name
21:03 atrus- :)
21:03 atrus- good to know.
21:03 ojacobson if you really need to aggressively gc, _repack_ - it's what git-gc does anyways, but you can get much better results that way
21:04 ojacobson `git repack -A <depth and window options if needed for tuning> && git prune` will delete all unreachable objects and produce a new, single, giant packfile of all existing objects
21:04 russruss joined #git
21:04 ojacobson existing && reachable, rather
21:05 ojacobson It may not be practical to do that in a hook, I'm not sure what locks are required
21:05 russruss hey all; way back git add -i then p let you choose which files to see hunks from before asking you to patch hunks.  Is there any way to restore this older behavior?
21:05 atrus- right. which sucks performance-wise for our nfs users, but at least doesn't cost them a bunch of disk space.
21:05 atrus- (plus i dont really care about our nfs users... :p )
21:06 Cabanossi joined #git
21:12 kexmex joined #git
21:13 raijin joined #git
21:15 jost__ joined #git
21:24 yetitwo joined #git
21:24 dsdeiz joined #git
21:25 yetitwo something I run into every now and then is forgetting to switch to master before I `git checkout -b` a new feature branch. is there a way to switch the base branch of a branch?
21:26 boombatower joined #git
21:26 urda joined #git
21:28 albel727 joined #git
21:30 askb joined #git
21:30 russruss joined #git
21:30 Dougie187 left #git
21:31 pks joined #git
21:31 rwb joined #git
21:31 yetitwo figured it out: https://makandracards.com/makandra/10173-git-how-to-rebase-your-feature-branch-from-one-branch-to-another
21:31 yetitwo left #git
21:33 buffal0 joined #git
21:37 urda left #git
21:38 digidog joined #git
21:44 thebope joined #git
21:45 dvaske joined #git
21:49 Dookie12 joined #git
21:52 Darren_ joined #git
21:53 cagomez joined #git
21:55 Gkhu joined #git
21:55 aax joined #git
21:56 warthog9 joined #git
21:59 venmx joined #git
22:00 acetakwas joined #git
22:01 dsdeiz joined #git
22:02 theiostream joined #git
22:13 jeffreylevesque joined #git
22:14 mmlb joined #git
22:15 Rodya_ joined #git
22:16 Guest29350 joined #git
22:21 a3Dman joined #git
22:21 a3Dman joined #git
22:22 crose joined #git
22:23 Stutters joined #git
22:24 mizu_no_oto joined #git
22:25 ash_workz joined #git
22:25 Stutters hello there :) I'm struggling to reset a commit to a previous version. right now it looks like this: http://i.imgur.com/93k6Agr.png
22:26 Stutters what I want is to get rid of those merges if that's possible :/
22:26 Stutters (I usually rebase master onto my branch but I guess I forgot to checkout the right branch when pushing :/)
22:27 voker57 reset commit to previous version? you mean reset a branch?
22:27 atomi joined #git
22:28 voker57 in that case, git checkout <branch> && git reset --hard <commit before merges>
22:29 Stutters voker57: I guess my vocabulary isn't quite correct, but what I want to get is my origin/master to be set BEFORE the merge happened.. then I can rebase it onto some other branch (I guess?)
22:31 caper joined #git
22:31 Stutters voker57: now I got this: http://i.imgur.com/93k6Agr.png (which is basically my local branch being set correctly)
22:31 Stutters voker57: can I somehow set origin/master to that commit too?
22:33 TomyLobo joined #git
22:35 mchelen2 left #git
22:36 bannakaffalatta joined #git
22:38 cwre joined #git
22:38 thebope joined #git
22:39 voker57 Stutters: git push -f origin <local branch>
22:39 voker57 just be sure not to remove anything important with forced push
22:42 Dazzyp joined #git
22:42 manuelschneid3r joined #git
22:47 Stutters voker57: didn't seem to have changed anything. I guess I will just stick with merging and not doing that very same mistake again then :)
22:47 Stutters voker57: thank you! :)
22:47 a3Dman joined #git
22:50 menip joined #git
22:50 dviola joined #git
22:51 ertes joined #git
22:51 venmx joined #git
22:52 ash_workz joined #git
22:53 atomi joined #git
23:06 plasticle joined #git
23:07 plasticle joined #git
23:10 miczac joined #git
23:10 hagridaaron joined #git
23:13 MuffinMedic joined #git
23:13 tmg joined #git
23:15 fakenerd_ joined #git
23:15 m1dnight_ joined #git
23:16 foreal joined #git
23:17 liamonade joined #git
23:22 voiceme joined #git
23:24 digidog joined #git
23:25 raijin joined #git
23:25 alexandre9099 joined #git
23:26 a3Dman joined #git
23:26 venmx joined #git
23:29 cagomez joined #git
23:29 Gustavo6046 joined #git
23:32 thebope joined #git
23:33 drodger joined #git
23:33 Rodya_ so i'd like to temporarily revert my file structure to a previous state so i can try something out, then come back to my current state. will running git stash, git reset -hard HEAD~, then git stash pop achieve this for me
23:36 ojacobson Rodya_: probably better to commit what you've got (on a scratch branch if necessary) unless you're already comfortable with stash
23:37 ojacobson probably also better to use git-checkout instead of git-reset to "go back" to a prior state - create a temporary branch, or check out the commit directly, rather than needlessly resetting an existing branch
23:37 ojacobson it'd work though
23:38 Rodya_ that makes sense, thank you
23:40 Noodlewitt joined #git
23:40 drodger joined #git
23:42 TbobbyZ_ joined #git
23:42 fstd_ joined #git
23:42 TbobbyZ_ joined #git
23:43 raijin joined #git
23:47 irqq_ joined #git
23:49 Gala joined #git
23:50 theiostream joined #git
23:51 raspado joined #git
23:51 matoro joined #git
23:56 Kaisyu joined #git

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