Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-04

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

All times shown according to UTC.

Time Nick Message
00:01 mischat joined #git
00:03 Cassiopaya joined #git
00:04 chardan So... I'm trying to rebase to squash some commits, but one of them is a merge. When I try "git rebase -i HEAD~2", it picks up the merge and I get dozens of other commits. What's the way around this?
00:04 cbreak Vasistha: status will not give you the same output in different git versions
00:04 Vasistha lungaro: see man gitrevisions
00:04 gitinfo lungaro: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
00:04 cbreak diff will always give the correct output
00:04 lungaro thanks
00:04 umpc joined #git
00:05 Vasistha cbreak: well.. that's a compelling reason to go with git diff, thanks for making the point. However I still have no idea how to make git diff display what I want, which is: names of files that are staged to be committed.
00:06 cbreak git diff --name-only
00:06 cbreak with --cached
00:07 Vasistha [15:16] <Vasistha> I am working on a pre-commit hook. Right now I am running: 'git diff --name-only HEAD' to find out what files have changed. However what I really want is only a list of files that are staged for commit;
00:07 Vasistha ah --cached ... oka I'll try adding that
00:07 chipotle_ joined #git
00:10 Vasistha super - thanks very much for your persistence cbreak !
00:12 guest2319079315 joined #git
00:13 LeBlaaanc joined #git
00:13 justanotheruser joined #git
00:14 guest2319079315 hey all, i have a quick and silly question.  Working with git for the first time, and I am working on someone else's project
00:14 guest2319079315 I just got code merged into the maintaner's branc
00:14 guest2319079315 but my branch now says " This branch is 1 commit behind"
00:14 guest2319079315 is that normal?
00:14 guest2319079315 any help would be appreciated
00:15 ozmage joined #git
00:16 mizu_no_oto joined #git
00:19 solenodic joined #git
00:20 red82 joined #git
00:21 aartist joined #git
00:22 peacememories joined #git
00:22 Sasazuka joined #git
00:23 btree left #git
00:24 phroa guest2319079315: it means that the remote branch which your local branch is "tracking" has 1 commit you don't.  it's likely the merge commit.  I'd recommend either 'man git-pull' if you want to continue your branch, or check out the current "most recent" commit in your remote and start a new feature branch
00:24 gitinfo guest2319079315: the git-pull manpage is available at http://jk.gs/git-pull.html
00:24 phroa I'm a little surprised it knew you're behind, though.  normally you don't know you're behind unless you do a manual fetch or something like a rebase.
00:25 guest2319079315 so this person only has a master branch
00:25 guest2319079315 and i am working directly on master as well
00:26 rmbeer joined #git
00:26 rmbeer hello
00:26 guest2319079315 phroa: https://github.com/stacydubleu/OBET is the one I'm "tracking", https://github.com/tr33sa/OBET is my branch
00:26 rmbeer i cant use 'stash' for add a untracked directory?
00:26 guest2319079315 and i'm one commit behind, which I THINK is the merge commit, because it shows no conflicts, but i have no idea how to fix this... :(
00:26 Aleric rmbeer: no
00:27 rmbeer Aleric, then how to move a files/directory untracked to other branch?
00:27 rmbeer untracked+modify
00:27 Aleric If you switch branches then untracked files/dirs are not touched.
00:28 druonysus_ joined #git
00:28 Aleric They are not part of a branch, but they will be available in your working tree as long as they don't get deleted by you, or a script ;).  git won't touch them.
00:29 griffindy joined #git
00:30 dskull joined #git
00:30 Asara joined #git
00:30 umpc joined #git
00:31 rmbeer Aleric, thank
00:34 daynaskully joined #git
00:35 guyz joined #git
00:39 solenodic joined #git
00:43 Sasazuka_ joined #git
00:43 daynaskully joined #git
00:46 amagawdd joined #git
00:53 matoro joined #git
00:57 redhedded1 joined #git
00:58 alburaq joined #git
00:59 ozmage joined #git
00:59 msonntag joined #git
01:01 amagawdd joined #git
01:06 Darren__ joined #git
01:06 pur3eval joined #git
01:07 qpdb joined #git
01:07 Sasazuka joined #git
01:09 gugah joined #git
01:10 dsdeiz joined #git
01:10 dsdeiz joined #git
01:17 druonysus_ joined #git
01:17 xaviergmail_ joined #git
01:18 msonntag joined #git
01:19 harry1 joined #git
01:19 nckpz joined #git
01:19 a_thakur joined #git
01:20 a_thakur joined #git
01:21 ljc joined #git
01:23 pur3eval joined #git
01:26 BackEndCoder joined #git
01:28 MistahKurtz joined #git
01:29 anuxivm joined #git
01:30 SwiftMatt joined #git
01:30 drodger joined #git
01:34 ecuanaso joined #git
01:38 Sasazuka joined #git
01:40 crundar joined #git
01:41 crundar How can I check the progress of a git revert?
01:41 crundar I'm reverting a preeeeeetty large commit, but it's been at it a good long while now.
01:41 Asara left #git
01:41 crundar I don't know how to tell if my terminal session is dead, or if something else has gone awry, or what's going on.
01:48 matoro joined #git
01:48 Oatmeal joined #git
01:49 Ryanar joined #git
01:52 WaReZ joined #git
01:54 nckpz joined #git
01:55 lyhr joined #git
01:59 lyhr left #git
01:59 ecuanaso joined #git
02:01 seni joined #git
02:02 pur3eval joined #git
02:06 d^sh joined #git
02:07 pks joined #git
02:09 Naan joined #git
02:09 solenodic joined #git
02:09 johnmilton joined #git
02:11 jameser joined #git
02:13 howdoi joined #git
02:15 martin290 joined #git
02:15 madewokherd joined #git
02:16 raijin joined #git
02:17 martin290 how can i undo a commit i made on a branch, but keep my changes?
02:17 martin290 keep my changes locally, that is
02:18 ozmage joined #git
02:20 PtxDK joined #git
02:20 b3gott3n1 joined #git
02:22 b3gott3n1 Hi I have this weird problem with generating a key http://pastebin.com/g9wGay6Q
02:23 ecuanaso joined #git
02:26 cagmz_ joined #git
02:27 hvxgr joined #git
02:28 shinnya joined #git
02:30 martin290 how can i undo a commit i made on a branch, but keep my changes?
02:32 finalbeta joined #git
02:35 MattMaker joined #git
02:36 nedbat martin290: you want "git reset @^"  I think.
02:37 Goplat joined #git
02:37 cagedwisdom joined #git
02:38 martin290 nedbat: looks like that didn't work: fatal: ambiguous argument 'g': unknown revision or path not in the working tree.
02:38 matoro joined #git
02:39 nedbat martin290: i don't know where g came from.
02:39 nedbat martin290: can you pastebin your terminal session?
02:39 martin290 sure
02:39 jagobdue joined #git
02:39 tyvm joined #git
02:39 martin290 where should i paste it to?
02:40 martin290 https://thepasteb.in/p/lOhO084Jx2MCB
02:40 martin290 that good?
02:40 ecuanaso joined #git
02:41 nedbat martin290: sure
02:41 Vampire0_ joined #git
02:42 nedbat martin290: your second reset command looks like it worked? What does git status show now?
02:42 martin290 nedbat: C:\wamp\www\Blog [master ↓1 +1 ~3 -0 | +2 ~5 -0 !]>
02:46 nedbat martin290: btw, that prompt is kind of nuts :)
02:46 Oatmeal joined #git
02:46 martin290 essentially, i want to undo the latest commit i did to the master branch
02:46 martin290 and then merge a branch
02:46 martin290 so, how do i undo the last commit i did?
02:46 nedbat martin290: yes, i know. I think your reset probably did it.  You didn't show the output of git status.
02:46 martin290 oh
02:46 martin290 1 sec
02:46 martin290 https://thepasteb.in/p/Y6hkEqByOgRT7
02:46 martin290 there you go
02:46 nedbat martin290: are those your changes?
02:46 martin290 they very old changes i don't care about
02:46 martin290 so i wanted to back one commit from the master branch, and merge another branch into master
02:46 martin290 that way i'll have my latest changes (my latest changes are in another branch)
02:48 crundar Alright, so I just killed it because I couldn't stand the limbo.
02:49 crundar Now that I have the opportunity to run a new git revert command, how do I have it issue occasional progress reports?
02:51 ozmage joined #git
02:52 msonntag joined #git
02:52 ecuanaso joined #git
02:56 solenodic joined #git
03:00 matoro joined #git
03:02 ozmage joined #git
03:04 d^sh joined #git
03:04 BenderRodriguez joined #git
03:04 raijin joined #git
03:05 seni joined #git
03:05 Emperor_Earth joined #git
03:06 fstd_ joined #git
03:08 harry1 joined #git
03:09 bruce_lee joined #git
03:13 dreiss joined #git
03:16 duderonomy joined #git
03:18 Vortex34 joined #git
03:20 aidalgol joined #git
03:20 sunri5e joined #git
03:23 xall joined #git
03:28 Limes joined #git
03:29 arescorpio joined #git
03:29 dsdeiz joined #git
03:32 solenodic joined #git
03:36 jeffreylevesque joined #git
03:38 svm_invictvs joined #git
03:40 govg joined #git
03:46 ecuanaso joined #git
03:48 red82 joined #git
03:48 ertes joined #git
03:49 aw1 joined #git
03:49 chachasmooth joined #git
03:52 Phenix joined #git
03:52 solenodic joined #git
03:54 hexagoxel joined #git
03:59 mmlb joined #git
04:01 jameser_ joined #git
04:02 mischat joined #git
04:07 lyxus joined #git
04:09 plugwash joined #git
04:09 plugwash does rebasing always result in a linear history?
04:10 pijiu joined #git
04:15 PerlJam plugwash: if you always and only rebase.
04:15 solenodic joined #git
04:16 PerlJam well ... lineat along a single branch anyway
04:16 PerlJam er, linear
04:18 plugwash let me try to be more specific. if i'm on branch foo and do "git rebase bar" will the resulting sequence of commits from bar to the rebased foo always be linear
04:19 sagerdearia joined #git
04:20 SwiftMatt joined #git
04:20 amagawdd joined #git
04:27 jost_ joined #git
04:28 basiclaser joined #git
04:30 kyan joined #git
04:31 seni joined #git
04:32 rivarun joined #git
04:37 holodoc joined #git
04:37 dodobrain joined #git
04:37 seni joined #git
04:41 llamapixel mind42.com makes a good tool for mindmapping and demonstrating your git layout.
04:43 a_thakur joined #git
04:43 wilbert joined #git
04:43 a_thakur joined #git
04:44 tinanoo joined #git
04:45 ecuanaso joined #git
04:48 kasual joined #git
04:49 EricPoe joined #git
04:49 hahuang65 joined #git
04:50 ayogi joined #git
04:52 netj joined #git
04:53 seni joined #git
04:54 gitnoob joined #git
04:55 Cabanoss- joined #git
04:56 JanC_ joined #git
04:57 harry1 joined #git
04:59 svm_invictvs joined #git
05:00 mischat joined #git
05:01 hue joined #git
05:02 dermoth joined #git
05:07 seni joined #git
05:08 nckpz joined #git
05:09 njbair joined #git
05:11 llamapixel git log --oneline --decorate --all —graph  or git tig might help in case you don’t know the branch structure between the rebase /merges plugwash
05:12 plugwash oh I know how it turned out in one particular case, but I am trying to script stuff which means I want to know what the general behaviour is
05:13 llamapixel sorry the last bit -graph should be —graph
05:13 llamapixel ah ok
05:21 xall joined #git
05:21 solenodic joined #git
05:24 solenodic joined #git
05:29 dreiss joined #git
05:32 seni joined #git
05:35 matoro joined #git
05:36 sbulage joined #git
05:39 seni joined #git
05:41 mehola joined #git
05:44 johnny56_ joined #git
05:44 solenodic joined #git
05:51 dreiss joined #git
05:51 ozmage joined #git
05:55 lektrik joined #git
05:55 SwiftMatt joined #git
06:04 solenodic joined #git
06:06 ryxxed joined #git
06:07 VladGh joined #git
06:11 lindenle joined #git
06:13 pks joined #git
06:14 solenodic joined #git
06:15 xall joined #git
06:17 pijiu joined #git
06:17 xall_ joined #git
06:18 pijiu joined #git
06:20 shgysk8zer0_ joined #git
06:22 nckpz joined #git
06:23 codelike joined #git
06:24 menip joined #git
06:31 solenodic joined #git
06:38 pks joined #git
06:40 flavius joined #git
06:46 harry1 joined #git
06:48 coco joined #git
06:49 acetakwas joined #git
06:52 dreiss joined #git
06:59 acetakwas joined #git
06:59 [0xAA] joined #git
07:00 finalbeta joined #git
07:06 lucasem llamapixel: I have the same thing aliased to git lol, but I also have --color
07:06 llamapixel I use git lg which is basically similar
07:06 llamapixel https://coderwall.com/p/euwpig/a-better-git-log
07:10 llamapixel Do you use git cig as well lucasem ?
07:10 llamapixel https://github.com/stevenjack/cig
07:11 llamapixel I don’t smoke, but every morning and afternoon I have a cig ;P
07:17 MrMojit0 joined #git
07:21 SteffanW joined #git
07:31 mohabaks joined #git
07:31 shgysk8zer0_ joined #git
07:32 Jackneill joined #git
07:33 acetakwas joined #git
07:36 ngm joined #git
07:36 ngm joined #git
07:37 ngm joined #git
07:38 bernardio joined #git
07:39 King_Hual joined #git
07:42 bernardio joined #git
07:42 iamtakingiteasy joined #git
07:46 Jackneill joined #git
07:48 ejnahc joined #git
07:51 matsaman joined #git
07:57 safe joined #git
07:58 rmbeer_ joined #git
08:03 diogenese joined #git
08:03 Murii joined #git
08:04 Salim joined #git
08:08 jjido joined #git
08:09 jjido What was the git command to revert a specific file to last commit (changes not committed)?
08:10 _ikke_ git checkout HEAD <file>
08:11 jjido _ikke_ thanks perfect!
08:16 shinnya joined #git
08:24 bernardio joined #git
08:30 jjido Mmh I committed two files when I wanted to commit only one
08:31 matsaman have that same problem with teh ladies
08:31 jjido matsaman: be a good boy
08:32 matsaman =)
08:33 hahuang65 joined #git
08:33 brent__ joined #git
08:34 solenodic joined #git
08:34 harry1 joined #git
08:35 blackwind_123 joined #git
08:37 denisMone joined #git
08:38 Murii joined #git
08:40 jjido I am in git rebase -i HEAD~1
08:40 jjido I need to drop one of the added files
08:43 jjido huh git rm does not do that
08:45 jjido help!
08:46 aavrug joined #git
08:48 jjido how to undo git rm
08:51 lucasem jjido: it depends on what your current situation is
08:52 lucasem if the rm is just staged, you can git reset <file>. If it's been committed, just git checkout HEAD~ <file> (replaced HEAD~ with whatever ref has the file as you want it)
08:53 MineCoins joined #git
08:53 lucasem jjido: if you wanted to drop an added file you could've checked out before the commit, then make a new commit like you would have wanted it to be. Reset you branch to point to the new commit you just made
08:53 jjido fatal: ambiguous argument 'com/bredelet/mistigri/Engine.java': unknown revision or path not in the working tree.
08:54 lucasem jjido: you wanna tell me what you typed that gave you that error..?
08:55 jjido git reset <file>
08:55 lucasem jjido: do you have the hash of the commit where you added the two files?
08:57 jjido [master d0c8c86]
08:58 lucasem Have you done anything since then that you care about? If not, then I can guide you through how to make master point to a commit where you only added one file, not both.
08:58 lucasem (otherwise it'd take more effort..)
09:01 jjido lucasem: the files are still open in the editor so I can overwrite anytime
09:02 jjido lucasem: so I can recover them
09:02 lucasem jjido: oh great. In that case, just git checkout <hash> (where <hash> is the hash of the commit you want to work off of (to add a new commit with a file))
09:03 lucasem make your changes and commit the one file.
09:03 cdown joined #git
09:05 jjido lucasem: before that, how do I come out of the interactive rebase?
09:05 solenodic joined #git
09:06 lucasem delete the contents of the rebase file that opened up, and save&quit
09:08 jjido lucasem: but "git rebase --continue" opens the commit editor, not the rebase editor
09:09 lucasem I though you were in the middle of `git rebase -i HEAD~1`..
09:09 lucasem you can just make the commit, it doesn't matter.
09:09 lucasem You'll be going back to an older commit anyway
09:09 jjido ok
09:11 jjido I am in 'detached HEAD' state
09:12 lucasem jjido: on which commit?
09:12 jjido lucasem: the one I want to start from
09:12 rivarun joined #git
09:13 lucasem great. Now commit your changes for the one file (i.e. make the commit you wanted to make in the first place)
09:14 lucasem After you make that commit, `git branch -f master HEAD` will point the master branch to you current HEAD. Then you should be where you want to be.
09:18 robattila256 joined #git
09:19 pur3eval joined #git
09:21 jjido lucasem: thanks for the help
09:22 lucasem jjido: glad to help
09:23 cs_shadow joined #git
09:24 manuelschneid3r joined #git
09:24 pks joined #git
09:25 flavius joined #git
09:26 basiclaser joined #git
09:26 systemovich joined #git
09:27 dodobrain joined #git
09:29 robotroll joined #git
09:35 aavrug joined #git
09:40 a-l-e joined #git
09:42 kyan joined #git
09:43 King_Hual` joined #git
09:47 jjido joined #git
09:49 jjido lucasem: I am still on a detached HEAD after git branch -f master HEAD
09:49 jjido lucasem: gives an error on git push
09:49 Vgr_ joined #git
09:49 Vgr_ joined #git
09:52 Jackneill joined #git
09:55 jjido https://gist.github.com/jido/ef35b926c87061ea8a2880f3a78754ad
09:58 jjido ok found the solution. I was missing git checkout master
09:58 systemovich joined #git
09:59 freimatz joined #git
09:59 Jackneill joined #git
10:01 MineCoins joined #git
10:02 lindenle joined #git
10:08 kloeri joined #git
10:09 dersand joined #git
10:14 nostrora joined #git
10:14 solenodic joined #git
10:20 vrederv joined #git
10:23 harry1 joined #git
10:24 vrederv Hey folks. Why doesn't git pull update the repo directory last modified time?
10:24 nidr0x joined #git
10:25 matsaman vrederv: the what now?
10:26 vrederv matsaman, what?
10:26 matsaman I asked first
10:26 vrederv This is IRC how am I supposed to know what you asked before I joined?
10:27 daynaskully joined #git
10:27 matsaman interesting
10:27 cyphase_eviltwin joined #git
10:29 deepy joined #git
10:29 vrederv Considering that there are 1171 users in this channel it's dead silent. All those lurkers ...
10:29 matsaman well, they're probably sleeping
10:29 matsaman lurking is something else =P
10:29 bannakaf_ joined #git
10:29 matsaman what command are you using to check modified time
10:30 vrederv you can use ls -l
10:30 matsaman _I_ can use any number of things
10:31 janx joined #git
10:34 cdown joined #git
10:34 brent__ joined #git
10:34 hahuang65 joined #git
10:39 PHPanos joined #git
10:39 ayogi joined #git
10:40 overlord_tm joined #git
10:40 vrederv left #git
10:42 muldover joined #git
10:43 peacememories joined #git
10:49 pur3eval joined #git
10:53 m4sk1n joined #git
10:53 [0xAA] joined #git
10:57 mischat joined #git
10:57 brent__ joined #git
10:58 navidr joined #git
10:58 Nilesh_ joined #git
11:01 msonntag joined #git
11:02 ych joined #git
11:04 ocbtec joined #git
11:05 Jackneill joined #git
11:06 satifant joined #git
11:10 tobiasvl he left
11:10 tobiasvl why would he expect a pull to modify the repo directory?
11:11 theoceaniscool joined #git
11:12 matsaman I think he was expecting new files within a dir to reflect on that dir's modify time
11:12 [0xAA] joined #git
11:12 Anuj_ joined #git
11:12 matsaman but who knows how he was checking or what he really meant
11:12 Jackneill joined #git
11:20 iveqy joined #git
11:21 theoceaniscool_ joined #git
11:22 Tobbi joined #git
11:25 p4trix joined #git
11:28 nickabbey joined #git
11:29 YuGiOhJCJ joined #git
11:30 blackwind_123 joined #git
11:31 jost__ joined #git
11:31 leeN joined #git
11:35 msonntag joined #git
11:46 BackEndCoder joined #git
11:47 shriek joined #git
11:50 sarri joined #git
11:50 sarri joined #git
11:51 ych joined #git
11:51 _ADN_ joined #git
11:52 adamru joined #git
11:52 aw1 joined #git
11:52 _W_ joined #git
11:54 ertesx joined #git
11:57 dreiss joined #git
11:58 overlord_tm joined #git
12:00 Tobbi joined #git
12:04 lindenle joined #git
12:06 Jackneill joined #git
12:08 cyphase joined #git
12:10 ki0 joined #git
12:10 rainervonvielen joined #git
12:12 harry1 joined #git
12:15 mehola joined #git
12:17 ych joined #git
12:20 raijin joined #git
12:21 cyphase joined #git
12:25 mischat joined #git
12:30 nowhereman joined #git
12:34 dviola joined #git
12:34 nidr0x joined #git
12:35 EricPoe joined #git
12:36 DieguezZ joined #git
12:36 jameser joined #git
12:38 pur3eval joined #git
12:38 rorro joined #git
12:40 spacelord_ joined #git
12:40 joki joined #git
12:44 Glooomy joined #git
12:45 govg joined #git
12:46 sunri5e joined #git
12:48 jameser joined #git
12:48 mischat joined #git
12:53 jameser joined #git
12:54 mohabaks joined #git
12:57 irqq joined #git
12:58 zerorax joined #git
12:58 zerorax must I always have ssh-agent running to use github with ssh key auth?
12:58 zerorax or only when I set it up?
12:59 jameser joined #git
13:01 _ikke_ Everytime you push or fetch
13:02 cyphase joined #git
13:03 Jackneill joined #git
13:03 CheckDavid joined #git
13:03 zerorax i see
13:05 iLembus joined #git
13:05 zerorax that's kind of annoying
13:05 zerorax is there an easy way to see if it's running from a script?
13:08 _ikke_ pidof ssh-agent
13:08 _ikke_ if that returns nothing, there is no agent running
13:08 archheretic 19
13:08 _ikke_ 20
13:09 archheretic ment to shift two shift to window 19 in irssi ;)
13:09 _ikke_ :)
13:11 rivarun joined #git
13:11 ecuanaso joined #git
13:13 rmbeer_ left #git
13:19 jameser joined #git
13:23 jameser joined #git
13:25 zeroed joined #git
13:26 Jackneill joined #git
13:27 jameser joined #git
13:29 cyphase joined #git
13:30 miczac joined #git
13:30 ayogi joined #git
13:33 jameser joined #git
13:33 solenodic joined #git
13:39 peacememories joined #git
13:43 zeroed joined #git
13:43 zeroed joined #git
13:46 doener joined #git
13:47 jnavila_ joined #git
13:47 spacelord_ joined #git
13:53 jameser joined #git
13:55 solenodic joined #git
13:56 jameser joined #git
13:58 crundar joined #git
13:59 crundar Is git revert working over the network, or is it just local? If I want to see if there's progress, should I be monitoring CPU usage, network traffic? Disk usage?
14:00 solenodic joined #git
14:01 jetpack_joe joined #git
14:01 harry1 joined #git
14:02 m0viefreak joined #git
14:11 peacememories joined #git
14:15 jameser joined #git
14:18 jameser joined #git
14:20 canton7 crundar, it's all local
14:20 canton7 it shouldn't take long either, unless you're reverting a *very* large commit
14:21 canton7 ... in which case my guess would be that it's IO-bound, but that is a guess
14:21 byte512 joined #git
14:27 pur3eval joined #git
14:27 jameser joined #git
14:27 raijin joined #git
14:29 shinnya joined #git
14:31 Rodya_ joined #git
14:34 cdown joined #git
14:38 gigq joined #git
14:40 nidr0x joined #git
14:42 irqq joined #git
14:42 spacelord_ joined #git
14:42 tmk joined #git
14:52 pioiytr joined #git
14:54 ki0_ joined #git
14:54 mohabaks joined #git
14:56 crundar canton7: It's been going on for several hours now.
14:56 canton7 that seems highly suspicious
14:57 crundar I deleted a whole lot of *really* large files. Files that were too large to fit into github. I'm reverting that commit.
14:57 _ikke_ reverting is not enough
14:57 netj joined #git
14:57 _ikke_ reverting does not remove the files itself
14:57 PLAnt joined #git
14:57 _ikke_ the commit introducing the file is still there
14:57 crundar _ikke_: Indeed. I _want_ them there.
14:57 crundar I'm reverting the delete, I mean.
14:58 crundar I was going to use this lfs-convert tool I found to make everything ready to go to real-github (I've been hosting this repo on a private, enterprise github)
14:59 crundar I deleted the files thinking that that would do something, then realized _ikke_ 's point: that that's woefully inadequate.
14:59 crundar So I'm reverting the delete, and then I'll go through my conversion, and then everything should be copacetic when I add realgithub as a remote.
15:00 crundar but it's taking bloody forever, and I'd love to have some metric of progress so that I know I'm not just waiting for Godot.
15:01 Singmyr joined #git
15:01 EricPoe joined #git
15:02 solenodic joined #git
15:02 Ryanar joined #git
15:02 bremner if it's not pushed, reset seems better than revert
15:04 jay_east joined #git
15:05 crundar bremner: I pushed :(
15:06 bremner crundar: you probably need to force push anyway, if you have large objects (files) on the server
15:07 crundar bremner: how do you mean? the commit seemed to go through to my enterprise github, and I see the commit in my log and the commit history on the site.
15:07 jameser joined #git
15:08 crundar Is that not sufficient to tell that the my erroneous delete-commit "took"?
15:12 zivester joined #git
15:15 sylario joined #git
15:16 bremner crundar: my point is if your history is essentially throwaway, you can use reset (which is instant) to create a new repo (or force push over the old one)
15:17 jameser joined #git
15:17 crundar bremner: Alright, I don't know how to do that, but let me go read and see if I can figure it out. I wanna get this precisely right. Thanks.
15:19 theoceaniscool_ joined #git
15:20 joki joined #git
15:24 Junior joined #git
15:24 re1 joined #git
15:28 pur3eval joined #git
15:28 jnavila_ joined #git
15:29 EricPoe joined #git
15:29 a_thakur joined #git
15:31 Samual joined #git
15:32 dreiss joined #git
15:35 drm joined #git
15:36 treia joined #git
15:38 denisMone joined #git
15:39 jameser joined #git
15:43 solenodic joined #git
15:43 drm *correction, to add that repo, so that when i run 'git push -u origin master' it will push to that repo
15:45 solenodic joined #git
15:46 marcoslater joined #git
15:47 dsdeiz joined #git
15:48 xall_ joined #git
15:49 mischat joined #git
15:50 harry1 joined #git
15:50 acetakwas joined #git
15:51 solenodic joined #git
15:59 Ranmaru joined #git
16:00 m4sk1n joined #git
16:00 lindenle joined #git
16:00 tmk joined #git
16:03 MineCoins joined #git
16:04 re1 joined #git
16:04 ocbtec joined #git
16:06 pks joined #git
16:07 YuGiOhJCJ joined #git
16:07 mizu_no_oto joined #git
16:09 bernardio joined #git
16:10 xaviergmail_ joined #git
16:12 govg joined #git
16:14 crundar bremner: this stack overflow thread talking about doing that (http://bit.ly/2jLhkvg) suggests that something bad happens if I rewrite history like that, because the commits are pushed.
16:14 xall_ joined #git
16:14 crundar Supposing I reset (and do I want --hard ?) then do I just push like normal?
16:15 bremner you will not be able to push like normal after the reset.
16:16 svm_invictvs joined #git
16:17 crundar So, as I understand it, after a reset my remote will be several commits ahead of my local.
16:17 crundar If I could prevent those commits from having happened on remote, then I'd be all set.
16:18 bremner yes, well, time travel and force pushing are your options.
16:19 bremner or push to a new repo if that makes you more comfortable.
16:20 crundar Oh, I think that would work just fine for me. That's what I was about to do.
16:20 crundar Excellent.
16:21 EricPoe joined #git
16:24 freimatz3 joined #git
16:27 chandu20 joined #git
16:28 pur3eval joined #git
16:29 p4trix joined #git
16:30 ayogi joined #git
16:32 solenodic joined #git
16:32 mgedmin_ joined #git
16:37 DolpheenDream joined #git
16:41 ThiefMaster rewriting history is bad only if there are people who already pulled that history and based work on it
16:41 martin290 joined #git
16:41 ThiefMaster but even then - if you tell these people about it (e.g. because they are your coworkers or collaborators) it's not too bad in some caes
16:41 ThiefMaster *cases
16:42 ThiefMaster of course it's rarely a good idea to rewrite ancient history - but for recent history it's rarely an issue
16:42 martin290 what's the difference between pull and fetch??
16:44 tango_ martin290: pull is a fetch followed by a merge with whatever was fetched
16:45 jbitdrop joined #git
16:46 codeone joined #git
16:47 martin290 i guess i'm lost when it comes to all the terms git has -- I come from Team Foundation Server
16:48 martin290 I just started using GitKaren, is that a good IDE?
16:50 osse martin290: do you mean gitkraken?
16:50 martin290 yeah, sorry
16:50 pbrewczynski joined #git
16:52 PHPanos joined #git
16:54 digidog joined #git
16:55 martin290 so it looks like my remote repo on github is correct, but my local one isn't. how can i get the current state of the remote repo from github?
16:55 martin290 i just merged two branches together, but it looks like it didn't merge it locally, if that makes sense
16:56 martin290 oh wait, it did!
16:58 publio joined #git
17:07 plushy1 joined #git
17:08 madewokherd joined #git
17:10 menip joined #git
17:13 nowhereman joined #git
17:13 a0x10c joined #git
17:14 fatalhalt joined #git
17:16 deepy joined #git
17:17 xall_ joined #git
17:24 pur3eval joined #git
17:24 chandu20 joined #git
17:25 _raynold_ joined #git
17:25 hvxgr joined #git
17:28 synthmeat joined #git
17:28 flavius joined #git
17:31 brent__ joined #git
17:31 MrLawrence joined #git
17:32 CheckDavid joined #git
17:35 a_thakur joined #git
17:38 wiesel joined #git
17:38 Noldorin joined #git
17:39 harry2 joined #git
17:40 mischat joined #git
17:41 dviola joined #git
17:46 anarcat joined #git
17:46 Guest24692 left #git
17:46 anarcat is there a place to report security issues with git?
17:47 _ikke_ anarcat: There is a security mailing list
17:47 anarcat _ikke_: url please?
17:47 _ikke_ anarcat: Hold on
17:48 anarcat thanks
17:48 solenodic joined #git
17:49 _ikke_ git-security@googlegroups.com
17:49 ShalokShalom joined #git
17:49 _ikke_ Send an e-mail to that address
17:49 _ikke_ https://public-inbox.org/git/xmqqinr6dlo5.fsf@gitster.mtv.corp.google.com/
17:49 _ikke_ This is from the regular mailings from the maintainer
17:50 gugah joined #git
17:51 doebi joined #git
17:51 rivarun joined #git
17:51 doebi why does git annex suggest to do "git config receive.denyNonFastForwards false"
17:52 _ikke_ doebi: Not sure
17:52 bremner doebi: you may want to ask on #git-annex on oftc
17:52 doebi does it matter much?
17:53 doebi my oftc-bridge is bugging out. <.<
17:54 bremner well, you can always just point your client at chat.oftc.net
17:59 peacememories joined #git
18:01 solenodic joined #git
18:01 jast does anyone have an idea how a filesystem can suddenly have major corruption (with many, many files containing only 0x01 sequences, most of these files and their containing dirs not modified for years)? I've basically given up on everything not backed up, but I wonder what could possibly have happened
18:01 mda1 joined #git
18:02 jast I'm guessing the freelist got corrupted or a few critical nodes were allocated twice or something
18:03 Oatmeal joined #git
18:07 jagob joined #git
18:07 _ikke_ Hmm odd, no idea
18:07 _ikke_ Bad dd?
18:07 _ikke_ or something similar
18:07 xaviergmail_ joined #git
18:08 jast nothing unusual whatsoever happened before
18:08 jast I know because it's a single-user system :)
18:09 _ikke_ hehe
18:10 pandeiro joined #git
18:11 kasual joined #git
18:11 cdown joined #git
18:12 Tobbi joined #git
18:13 mgedmin joined #git
18:14 cdown_ joined #git
18:16 rivarun joined #git
18:16 zeroed joined #git
18:16 zeroed joined #git
18:16 zeroed joined #git
18:16 zeroed joined #git
18:17 chardan joined #git
18:17 govg joined #git
18:19 shriek joined #git
18:21 cdg joined #git
18:22 cbreak joined #git
18:24 msonntag joined #git
18:25 peacememories joined #git
18:26 Derperperd joined #git
18:28 matoro joined #git
18:29 pks joined #git
18:32 mohabaks joined #git
18:32 mizu_no_oto joined #git
18:35 diego1 joined #git
18:36 Atm0spher1c joined #git
18:38 cdown_ joined #git
18:38 Oatmeal joined #git
18:41 irqq joined #git
18:42 cdown_ joined #git
18:42 mischat joined #git
18:42 codeone joined #git
18:44 wiesel joined #git
18:46 fatalhalt joined #git
18:48 nowhereman joined #git
18:51 spacelord_ joined #git
18:51 shgysk8zer0_ joined #git
18:52 plushy1 left #git
18:57 johnny56_ joined #git
18:58 dsdeiz joined #git
18:58 dsdeiz joined #git
19:01 mizu_no_oto joined #git
19:03 lindenle joined #git
19:04 manuelschneid3r joined #git
19:06 prg3 joined #git
19:09 Testingaeiou joined #git
19:09 Oatmeal joined #git
19:10 matoro joined #git
19:10 safe joined #git
19:11 Ryanar joined #git
19:15 wilbert joined #git
19:17 pur3eval joined #git
19:17 diogenese joined #git
19:19 dviola joined #git
19:19 fuzzmz_ joined #git
19:20 spacelord_ joined #git
19:21 rivarun joined #git
19:22 RainMan28 joined #git
19:24 RainMan28 Hello I have two repos in my GitHub account, repo A and repo B. repo B is a copy of repo A but had some files changed on it. I would like to somehow take the changes from repo B and have them applied to repo A but I am not sure how to do this. I am new to using github and would appreciate any help, thank you.
19:25 HedgeMage #github is your friend
19:26 RainMan28 HedgeMage: hi thank you, they actually told me i need to come in here because the two repos have “unrelated history”
19:28 harry2 joined #git
19:28 _ikke_ You can add repo B as a remote to repo A
19:29 solenodic joined #git
19:29 RainMan28 _ikke_: hi, thank you, do you know how I can do this?
19:30 _ikke_ Do you have both repositories locally?
19:30 RainMan28 they are currently both on my github account but i do have the github client installed on my mac and i can clone them both locally
19:30 _ikke_ note that git != github
19:30 _ikke_ Do you have github for mac installed?
19:31 RainMan28 yes
19:31 aard_ joined #git
19:31 _ikke_ I don't know how to do it with that client (it's rather limited)
19:31 _ikke_ It specialized towards working with github
19:31 Cabanoss- joined #git
19:32 RainMan28 In the graphical app I can clone both repos locally and then should I ask in #github on how to add repo B as a remote to repo A?
19:32 _ikke_ I'm not sure if they even support that
19:33 _ikke_ I would recommand at least installing git itself
19:33 _ikke_ recommend*
19:33 RainMan28 _ikke_: can git work with my github account?
19:34 robotroll joined #git
19:35 _ikke_ sure
19:35 _ikke_ github is a company hosting your git repositories for you
19:35 RainMan28 _ikke_: oh i see that makes sense
19:35 _ikke_ (and providing a web interface to interact with them)
19:36 tobiasvl hey, RainMan28 originally asked in #github and I told them to ask here :P
19:36 mizu_no_oto joined #git
19:37 tobiasvl RainMan28 is pretty new at git. relevant information: repo A and B do not share history.
19:37 tobiasvl repo B was created as a new repo based on the file structure from repo A, as I understood it...
19:38 tobiasvl I suggested just making a patch from repo B and applying it in repo A
19:38 tobiasvl but as they didn't have git installed I ended up saying their problem had nothing to do with github and that this channel was a better fit
19:39 _ikke_ right
19:41 done joined #git
19:41 cagedwisdom joined #git
19:41 HedgeMage RainMan28: Apologies, I skimmed as far as "GitHub account" and stopped reading because we get so much github-specific BS in here.  That was my mistake.
19:41 fuzzmz joined #git
19:41 Oatmeal joined #git
19:42 RainMan28 HedgeMage: no problem! thank you for helping!
19:43 mischat joined #git
19:44 _ikke_ HedgeMage: We still want to be friendly to everyone
19:45 RainMan28 does this channel offer support on getting git working on OSX?
19:45 RainMan28 oh I got git working now actually nevermind
19:46 RainMan28 so _ikke_ i do have git on my mac now installed, what should I do now?
19:47 _ikke_ So do you want to 'overwrite' files in A from B, or do you want to copy changes to files from B to A?
19:48 LeBlaaanc joined #git
19:49 Salim joined #git
19:49 RainMan28 _ikke_: I would ideally like the ability to have the changes from repo B because the default code in repo A but still leave me the ability to somehow go for the older version of files if I ever need them
19:50 tobiasvl git always allows you to go back to the older version of files
19:50 RainMan28 oh ok
19:52 RainMan28 _ikke_: then I guess I am ok overwriting from B to A
19:52 _ikke_ Can't you then just copy the files in the filesystem
19:52 _ikke_ ?
19:53 phenix joined #git
19:53 RainMan28 _ikke_: ok so clone both repos locally, then copy the files from repo B to repo A in my file explorer, then sync it again?
19:54 jimi_ joined #git
19:54 systemovich joined #git
19:54 RainMan28 how do I “tag” the existing A as a certain version number so I can go back to that version as a package?
19:55 xlegoman joined #git
19:55 boubou joined #git
19:56 _ikke_ man git tag
19:56 gitinfo the git-tag manpage is available at http://jk.gs/git-tag.html
19:56 _ikke_ (git tag <version_name>
19:56 _ikke_ )
19:58 RainMan28 _ikke_: thank you so much
19:58 RainMan28 do I want to clone first through github then or through git though?
19:58 RainMan28 I have git installed now on the command line
19:59 RainMan28 just not sure what the commands I need to run are to get started. Do I git clone my github repo from the git command line? How do I determine where it will save it to locally? I know how to do it with the github graphical app
20:00 SimonPeterGruber joined #git
20:01 _ikke_ git clone will clone it in the current directory
20:01 SimonPeterGruber left #git
20:01 _ikke_ might be that the directories you have from the github app are already valid git repositories
20:02 Zamyatin joined #git
20:03 fahadash joined #git
20:03 RainMan28 Oh ok I will try this
20:08 pur3eval joined #git
20:10 RainMan28 _ikke_: ok so I have repo A and repo B cloned locally. Do I go into repo A and tag it first before copying files over from repo B?
20:11 johnny56_ joined #git
20:12 govg joined #git
20:12 Bizkit joined #git
20:14 matoro joined #git
20:15 mizu_no_oto joined #git
20:15 berndj joined #git
20:16 tobiasvl RainMan28: you can tag it whenever
20:17 _ikke_ RainMan28: git tag tags the current commit, so as long as you don't commit, it doesn't matter
20:17 RainMan28 oh that makes sense
20:17 AciD` joined #git
20:20 overlord_tm joined #git
20:24 mehola joined #git
20:25 jimi_ joined #git
20:25 jimi_ joined #git
20:28 ShapeShifter499 joined #git
20:29 Domhack joined #git
20:29 xaviergmail_ joined #git
20:31 RainMan28 I copied the files over, then did git tag v1.0
20:31 RainMan28 now how do I push the new files back up to github from the command line? git commit?
20:32 _ikke_ first git add the changes, so that they become staged
20:32 _ikke_ then commit, with a commit message
20:32 _ikke_ then you can push
20:32 freimatz joined #git
20:34 RainMan28 git add help
20:34 RainMan28 oh sorry thought it would show me a link to a page on how to do thhat
20:34 _ikke_ haha
20:34 _ikke_ man git add
20:34 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
20:34 _ikke_ :-)
20:35 RainMan28 thank you :)
20:35 RainMan28 thank you for your patience with me _ikke_ and tobiasvl
20:36 RainMan28 ok I did: git add .  (while inside the repo’s directory)
20:36 dave0x6d joined #git
20:37 RainMan28 now i would just do: git commit This is version 2   ?
20:37 RainMan28 and if i were to make any more edits to any files contents, do I need to do git add . again before I do commit?
20:38 _ikke_ git commit -m ".."
20:38 s17 git status will tell you if you need to add ;)
20:38 RainMan28 oh ok
20:39 texasmynsted joined #git
20:39 leah2 joined #git
20:40 kn-928 joined #git
20:41 zezba joined #git
20:41 _ikke_ Note that it's good practice to verify what you are comitting
20:44 mischat joined #git
20:45 johnny56_ joined #git
20:45 solenodic joined #git
20:46 texasmynsted joined #git
20:48 kn-928 joined #git
20:48 RainMan28 _ikke_: great thank you, I did git status and it showed me that i had edited one file after doing git add and so i ran git add again and then ran git status and it shows everything is good
20:49 kadoban joined #git
20:50 BackEndCoder joined #git
20:52 _raynold_ joined #git
20:52 brent__ joined #git
20:53 RainMan28 _ikke_: after git commit -m “My message”, I can now do git tag with the new version number and then do git push ?
20:57 _ikke_ yes
20:58 robotroll joined #git
20:59 Eugene joined #git
21:02 MineCoins joined #git
21:02 jstein_ joined #git
21:04 lyxus joined #git
21:05 RainMan28 _ikke_: I think I made a mistake somehow. It seems that the repo I ended up pushing is Repo B now, instead of A, even though I was in the Repo A directory
21:05 RainMan28 is it because i copied over a certain file over from Repo B into Repo A that made it think its now repo B?
21:05 staafl joined #git
21:05 tang^ joined #git
21:06 _ikke_ no
21:09 _ikke_ git remote -v should show what repository it pushes to
21:09 Sumit joined #git
21:11 sagerdearia joined #git
21:17 harry2 joined #git
21:17 RainMan28 _ikke_: ah ok how can i change which one it pushes to? Thank you
21:17 _ikke_ git remote set-url <name> <new_url>
21:17 RainMan28 it is pushing to Repo B, maybe because I cloned that one second
21:17 RainMan28 oh ok
21:19 Sumit left #git
21:20 tmk joined #git
21:20 RainMan28 _ikke_: thanks so much for bearing with me…I am trying: git remote set-url reponame https://github.com/account/my_repo.git
21:20 RainMan28 it tells me fatal: no such remote
21:20 canton7 then you don't have a remote called 'reponame'
21:21 mehola joined #git
21:21 _ikke_ RainMan28: default name is origin
21:21 RainMan28 oh i see
21:23 courrier joined #git
21:24 RainMan28 ok i got it to work but I don’t see my tag now on github, how can i verify that i have the tags working properly, as in this version is v1.1 and the old one is v1.0
21:24 mizu_no_oto joined #git
21:24 _ikke_ RainMan28: You have to explicitly push tags
21:25 _ikke_ git push --follow-tags
21:25 RainMan28 _ikke_: ah I’m sorry, ok thank you, I am writing down these notes so I don’t keep asking again and again
21:26 RainMan28 git push --follow-tags
21:26 RainMan28 Everything up-to-date
21:26 RainMan28 git tag v1.1
21:26 RainMan28 fatal: tag 'v1.1' already exists
21:29 RainMan28 ah this did the trick: git push origin --tags
21:29 _ikke_ right
21:29 _ikke_ --follow-tags only works when you actually are pushing something new
21:30 RainMan28 _ikke_: thank you so much. last question, now how do I fetch the newly updated repo’s changes to a different ubuntu server where I have previously cloned it?
21:32 finalbeta joined #git
21:33 jimi_ joined #git
21:37 a3Dman joined #git
21:39 Pieplay joined #git
21:40 Cabanossi joined #git
21:45 mischat joined #git
21:47 wcpan joined #git
21:49 ryxxed joined #git
21:50 myme joined #git
21:51 _ikke_ RainMan28: easiest (but not always correct): git pull
21:52 dreiss joined #git
21:53 YuGiOhJCJ joined #git
21:54 Bombe joined #git
21:56 robotroll joined #git
21:59 qsx (the qsx way: git pull; git oh crap what have i done; git reset; git checkout; git update-ref; gitk; gitk --all; git why did my x crash; git log --all --graph; git update-ref; git checkout -f)
22:03 martinklepsch joined #git
22:03 canton7 people actually use update-ref on day-to-day usage? :P
22:03 spacelord_ joined #git
22:03 * Bombe has never used update-ref in > 8 years.
22:03 tabakhase joined #git
22:03 WebDawg joined #git
22:04 ghostbsd_1ccf joined #git
22:04 canton7 I've only ever used it to update HEAD on a bare repo, I think
22:04 _ikke_ I hardly use it either
22:04 _ikke_ git symbolic-ref is better for that
22:05 canton7 ah, no, you're right: that was symbolic-red
22:05 _ikke_ sometimes in combination with git for-each-ref
22:08 Caelum joined #git
22:10 spacelord_ joined #git
22:13 RainMan28 _ikke_: if I want to pull the newest changes down from the repo and don’t want any of my local changes to get in the way and I’m happy to discard them, what is the best way to go about doing that?
22:14 spacelord_ joined #git
22:15 aw1 joined #git
22:16 _ikke_ Do you want to compoletely ignore them, or just ignore the changes that would conflict?
22:16 RainMan28 completely ignore them
22:18 _ikke_ git fetch && git reset --keep <remote>/<branchname>
22:20 Lyqyd joined #git
22:21 RainMan28 ok the remote name is default origin right?
22:21 RainMan28 and branch name would be master?
22:21 _ikke_ correct
22:22 RainMan28 git fetch && git reset —keep origin/master
22:22 _ikke_ right
22:22 RainMan28 I was googling too and found this: git fetch origin && git reset --hard origin/master
22:23 RainMan28 is that similar, or the same thing?
22:23 _ikke_ right, --hard is a bit more dangerous
22:23 RainMan28 oh ok
22:23 _ikke_ if you have uncomitted changes, they will be removed without a way to get them back
22:23 RainMan28 i will go with the safer method
22:23 Vinnie_win joined #git
22:23 _ikke_ --keep will abort in that case
22:25 RainMan28 _ikke_: good to know. also is there a way to include my username and password in this command so that I’m not prompted for both?
22:26 boombatower joined #git
22:31 _ikke_ git has credential helpers
22:31 _ikke_ man git credentialhelpers
22:31 gitinfo the git manpage is available at http://jk.gs/git.html
22:32 _ikke_ man git credentials
22:32 gitinfo the git manpage is available at http://jk.gs/git.html
22:32 _ikke_ d'oh
22:32 _ikke_ man gitcredentials
22:32 gitinfo the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
22:32 nowhereman joined #git
22:35 thierryp joined #git
22:36 jimi_ joined #git
22:38 msonntag joined #git
22:44 jnewt joined #git
22:45 rorro joined #git
22:45 endiruna joined #git
22:46 mischat joined #git
22:46 spacelord_ joined #git
22:46 lindenle joined #git
22:47 gugah joined #git
22:50 tristanp joined #git
22:50 tristanp joined #git
22:51 Derperperd joined #git
22:55 SwiftMatt joined #git
22:59 cdown joined #git
23:01 fmeerkoetter joined #git
23:01 nostrora joined #git
23:01 endiruna joined #git
23:01 pks joined #git
23:01 cdown joined #git
23:02 msonntag joined #git
23:04 timvisher joined #git
23:05 harry2 joined #git
23:06 ghoti joined #git
23:06 rkazak joined #git
23:06 cdown_ joined #git
23:07 daithioc joined #git
23:07 GodEater` joined #git
23:08 ShalokShalom joined #git
23:10 peeps[lappy] joined #git
23:11 spacelord_ joined #git
23:14 bernardio joined #git
23:15 bipolar joined #git
23:16 bcc joined #git
23:16 bcc joined #git
23:17 boz_v1 joined #git
23:22 austin987 joined #git
23:24 jagob joined #git
23:27 NeverDie joined #git
23:27 daithioc joined #git
23:29 simonides joined #git
23:30 ghoti joined #git
23:30 spacelord_ joined #git
23:31 shriek joined #git
23:32 xlegoman joined #git
23:35 blunaxela joined #git
23:35 xaviergmail_ joined #git
23:37 sarri joined #git
23:37 sarri joined #git
23:38 umpc joined #git
23:39 spacelord_ joined #git
23:40 netj joined #git
23:46 mischat joined #git
23:47 overlord_tm joined #git
23:48 tristanp joined #git
23:49 nikivi joined #git
23:49 seanrdev joined #git
23:50 justanotheruser joined #git
23:50 ajpiano joined #git
23:50 cliluw joined #git
23:50 seanrdev Do I create a new branch with every edit?
23:50 hvxgr joined #git
23:50 bremner not unless you want to.
23:51 crundar joined #git
23:51 seanrdev bremner: I assumed there was a "right" way to use git and a wrong way.
23:51 ugjka joined #git
23:51 seanrdev thats why I ask
23:52 peacememories joined #git
23:52 Eugene seanrdev - it depends upon the preferred workflow of the project you're contriburing to. A very common pattern is branch-per-Issue/Feature/Whatever
23:53 Eugene !flow
23:53 gitinfo [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references
23:53 hoang joined #git
23:53 dave0x6d joined #git
23:53 Eugene This meshes well with Github's Pull Requests system. You create a PR to merge a feature/fix/etc branch from your repo back into the parent repo's master(or dev or poptart) branch
23:54 Eugene And since all new branches are started from that "main" branch, everything just works
23:54 bremner sure. depdends what an "edit" means to you I guess.
23:54 BenderRodriguez joined #git
23:54 brent__ joined #git
23:55 Eugene once-per-`vim` would be a bit silly
23:55 hoang left #git
23:55 hoang joined #git
23:57 bremner yup, sounds very "enterprise".

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