Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-23

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

All times shown according to UTC.

Time Nick Message
00:01 aspellip_ joined #git
00:01 Saturn812 joined #git
00:01 dilfridge joined #git
00:02 fmcgeough joined #git
00:02 skylite joined #git
00:02 rgrinberg joined #git
00:03 eletuchy joined #git
00:06 refried_ joined #git
00:06 sesquipedalian joined #git
00:08 fuchstronaut joined #git
00:10 qpdb joined #git
00:11 rkazak joined #git
00:12 johnflux joined #git
00:12 johnflux joined #git
00:13 ki0_ joined #git
00:14 rbern joined #git
00:14 taylorm joined #git
00:16 eletuchy_ joined #git
00:18 eletuch__ joined #git
00:18 tesuji_ joined #git
00:20 eletuchy joined #git
00:21 ZenWalker joined #git
00:21 ZenWalker hello, I create a file, git add file, now git diff doesnt show the file, why?
00:22 eletuchy_ joined #git
00:22 Sonderblade because it's staged. git diff --staged though
00:23 inflames joined #git
00:24 eletuch__ joined #git
00:25 ZenWalker Sonderblade: thanks a lot, --staged = --cached ?
00:26 eletuchy joined #git
00:27 Sonderblade ZeDestructor: no, the staging area is the commit you are working on but haven't comitted finished yet
00:27 fahadash joined #git
00:27 eletuchy_ joined #git
00:28 ZenWalker Sonderblade: thanks :)
00:29 lolmac joined #git
00:29 SlizardWizard joined #git
00:29 eletuch__ joined #git
00:31 taylorm joined #git
00:31 zhiwliu joined #git
00:32 eletuchy joined #git
00:33 eletuchy_ joined #git
00:35 SlizardWizard I think i have my account set up wrongly on my machine, every time i commit to a branch it doesn't come up with my profile picture and i can't click on the name to view the profile
00:35 ki0 joined #git
00:35 eletuch__ joined #git
00:35 ki0 joined #git
00:36 ki0 joined #git
00:36 HedgeMage !github
00:36 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
00:37 zumba_addict joined #git
00:37 eletuchy joined #git
00:37 HedgeMage SlizardWizard: I assume you mean on github, since most people who don't know/specify are using github, but please let us know specifically what interface you're talking about so we don't waste a bunch of time walking you down the wrong path.
00:37 ZenWalker left #git
00:37 zhiwliu left #git
00:38 HedgeMage SlizardWizard: Can you confirm that's the case?
00:38 SlizardWizard HedgeMage: yeah sorry github,
00:38 HedgeMage thanks :)
00:38 HedgeMage SlizardWizard: Typically, this happens when you haven't set your user config on your local git instance up with the same email in use on your github account.
00:39 eletuchy_ joined #git
00:40 SlizardWizard HedgeMage: hmm, if i do git config --global user.email it comes up with the same email i use in github
00:41 aax joined #git
00:41 eletuch__ joined #git
00:41 HedgeMage SlizardWizard: Do you use a gui, or do you use CLI directly?  Some guis override your user config.
00:42 HedgeMage SlizardWizard: If you are willing to share with me your github ID, the associated email address, and a public repo you have committed to that has the problem, I could look at the log and maybe come up with a clue...assuming my 'net connection is up to it.
00:43 * HedgeMage is actually no a very charming train right now.
00:43 eletuchy joined #git
00:44 SlizardWizard HedgeMage: I CLI for everything, i also have't used a public repo on this account yet
00:45 eletuchy_ joined #git
00:45 a_thakur joined #git
00:46 SlizardWizard herpa derp
00:46 SlizardWizard spelt my email wrong
00:47 eletuch__ joined #git
00:47 HedgeMage lol
00:47 HedgeMage np, shit happens.
00:48 SlizardWizard thanks for the hekp
00:49 eletuchy joined #git
00:50 HedgeMage np
00:52 raven-au_ joined #git
00:53 eletuchy_ joined #git
00:54 ochorocho__ joined #git
00:54 fstd_ joined #git
00:55 eletuchy joined #git
00:57 Rikairchy joined #git
00:57 cyphase joined #git
00:57 eletuch__ joined #git
00:58 nick123 joined #git
00:59 eletuchy_ joined #git
00:59 Neico joined #git
00:59 devster31 joined #git
00:59 Virox joined #git
01:01 eletuchy joined #git
01:01 mingrammer_ joined #git
01:02 CustosLimen joined #git
01:02 martinklepsch joined #git
01:02 Bilge joined #git
01:02 opal joined #git
01:03 BlessJah joined #git
01:03 eletuch__ joined #git
01:03 orcus joined #git
01:03 chrysa joined #git
01:04 Jeroen joined #git
01:05 eletuchy_ joined #git
01:05 tgy joined #git
01:05 dminca joined #git
01:05 _rgn joined #git
01:05 _rgn joined #git
01:06 valagalen joined #git
01:07 foo Is there a way to view a git diff history of all previous commits of 1 file?
01:07 foo eg. I want to see all diff's, from now and previously, of a file. Something broke somewhere and I'm not sure where it was
01:07 eletuchy joined #git
01:09 dopesong joined #git
01:09 cyphase joined #git
01:09 GandalfTheWizard joined #git
01:09 eletuch__ joined #git
01:09 ignoramus joined #git
01:09 dreiss joined #git
01:11 eletuchy_ joined #git
01:12 xall joined #git
01:13 eletuchy joined #git
01:14 CEnnis91 joined #git
01:14 jhass foo: git log -p foo/bar
01:15 eletuch__ joined #git
01:17 MrOshimaida joined #git
01:17 eletuchy_ joined #git
01:19 sarbs joined #git
01:19 justanotheruser joined #git
01:19 ash_workz joined #git
01:20 eletuchy joined #git
01:21 infinite joined #git
01:21 xaviergmail joined #git
01:22 eletuch__ joined #git
01:22 david007 joined #git
01:23 livingstn joined #git
01:24 DolphinDream joined #git
01:24 eletuchy_ joined #git
01:26 eletuchy joined #git
01:27 dopesong joined #git
01:29 eletuchy_ joined #git
01:29 thiago joined #git
01:29 cqi joined #git
01:30 EvilPenguin joined #git
01:30 ignoramus joined #git
01:30 drbean joined #git
01:31 eletuchy joined #git
01:33 eletuch__ joined #git
01:34 texinwien joined #git
01:34 FuzzySockets joined #git
01:36 eletuchy joined #git
01:37 SlizardWizard left #git
01:38 eletuchy_ joined #git
01:40 jaguarmagenta joined #git
01:41 eletuch__ joined #git
01:46 eletuchy joined #git
01:46 Dougie187 joined #git
01:46 tjone270__ joined #git
01:46 eletuchy_ joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:49 foo jhass: thank you
01:50 eletuchy_ joined #git
01:51 shaggycat joined #git
01:53 eletuch__ joined #git
01:54 pks joined #git
01:55 rkazak joined #git
01:56 eletuchy joined #git
01:57 wagle is there a way to get "git grep" to search inside pdf files?
01:58 eletuchy_ joined #git
01:59 NotTheFBI joined #git
02:00 eletuch__ joined #git
02:00 mofai joined #git
02:02 xaa joined #git
02:02 eletuchy joined #git
02:02 Dro joined #git
02:03 a_thakur joined #git
02:04 eletuchy_ joined #git
02:07 eletuchy joined #git
02:09 McNozes joined #git
02:10 eletuchy_ joined #git
02:12 eletuch__ joined #git
02:13 chachasmooth joined #git
02:14 dopesong joined #git
02:15 b1tchcakes joined #git
02:15 eletuchy joined #git
02:18 eletuchy_ joined #git
02:19 samson I've deleted a local branch and doesn't seem to exist locally now but it's showing up in github desktop
02:19 User458764 joined #git
02:19 watabou joined #git
02:20 infinite joined #git
02:20 eletuch__ joined #git
02:24 xall joined #git
02:26 samson okay weird... it's actually saying its deleted in the shell... and doesn't list it. and then if I restart it shows back up
02:27 a_thakur joined #git
02:29 felipe joined #git
02:29 milki wagle: no, pdfs look like binaries
02:30 wagle milki: reputedly, pdfgrep command does the job
02:30 milki wagle: that doesnt sound like git grep
02:31 wagle well, a solution might be to have git grep detect pdf files, and use a pdf grepper to grep it
02:32 milki i know diff can be configurable. dunno about grep
02:32 wagle didnt see one, but ...
02:33 dopesong joined #git
02:34 ahr3n joined #git
02:35 rueben joined #git
02:39 fscala joined #git
02:43 eletuchy joined #git
02:43 hexagoxel joined #git
02:45 rnsanchez joined #git
02:46 sangy joined #git
02:48 arooni joined #git
02:50 dopesong joined #git
02:54 david007 joined #git
02:54 ochorocho__ joined #git
02:55 xall joined #git
02:59 nick123 joined #git
02:59 rnsanchez_ joined #git
03:00 hhee joined #git
03:04 carell joined #git
03:04 arescorpio joined #git
03:04 cqi joined #git
03:05 wuseman joined #git
03:06 aavrug joined #git
03:09 Dougie187 left #git
03:09 Goplat joined #git
03:11 m1dnight1 joined #git
03:12 drodger joined #git
03:14 robotroll joined #git
03:15 eletuchy joined #git
03:21 k3rn31 joined #git
03:22 axiom_1 joined #git
03:22 diogenese joined #git
03:23 sauvin joined #git
03:25 ki0 joined #git
03:26 skylite joined #git
03:28 sauvin joined #git
03:33 mehola joined #git
03:33 ImJune joined #git
03:40 jaguarmagenta joined #git
03:40 pwnz0r joined #git
03:42 lindenle joined #git
03:43 chid joined #git
03:46 User458764 joined #git
03:48 muthu joined #git
03:49 infinite joined #git
03:50 infinite_ joined #git
03:51 Raging_Hog joined #git
03:53 dreiss joined #git
03:53 akushner joined #git
03:55 jaguarmagenta joined #git
03:59 sdothum joined #git
04:01 rubyonrailed joined #git
04:02 eletuchy joined #git
04:02 nilg joined #git
04:03 phanimahesh joined #git
04:03 akushner joined #git
04:06 m1dnight1 joined #git
04:07 blackwind_123 joined #git
04:08 arthoo joined #git
04:09 arthoo hi, I have a stupid question.  I have a file that's in my git repo and I made modifications to but I want to discard those edits and go back to the last committed version.  How would I do that?
04:09 FuzzySockets joined #git
04:10 fuchstronaut joined #git
04:10 opal 👌  it's only stupid if you preface it saying it's a stupid question  😂
04:10 eletuchy_ joined #git
04:10 phanimahesh arthoo: git reset HEAD -- <filename>
04:10 xao joined #git
04:11 opal 👌  is there a difference between that and git checkout filename?  😂
04:11 phanimahesh opal: Good question, and I'm not sure about the answer. Just a min, checking.
04:12 opal 👌  ok thanks  😂
04:12 opal 👌  i've used git checkout before  😂
04:12 opal 👌  to revert uncommitted files  😂
04:12 k3rn31 joined #git
04:12 arthoo phanimahesh: I get 'Unstaged changes after reset' but it doesn't look like that actually reverts the file?
04:12 phanimahesh Okay,git checkout can pick any file from any commit, so it can be used to revert.
04:13 opal 👌  cool  😂
04:13 opal 👌  arthoo i know `git checkout` will revert a file to specified commit (default HEAD) state  😂
04:13 blr joined #git
04:13 opal 👌  ive used it before to restore files that were deleted  😂
04:14 arthoo that did the trick -- thanks, guys!  I really appreciate it!
04:14 opal 👌  np  😂
04:14 arthoo left #git
04:15 phanimahesh arthoo: Sorry, I mixed up. git reset operates on index by default, so the effect will be to unstage files
04:15 opal 👌  i'll pm him  😂
04:15 rscata joined #git
04:16 phanimahesh You can discard all edits by doing a git reset --hard, but docs say it can not be used to reset just a few files.
04:16 phanimahesh opal: Why are all your messages surrounded with unicode emoji?
04:16 eletuchy joined #git
04:16 opal 👌  hearts were getting boring  😂
04:16 xaviergmail joined #git
04:17 phanimahesh If it's a client side setting, consider disaabling it, people may not like it on irc.
04:17 opal 👌  im in 250 channels and youre likely the hundredth person to make a comment on it  😂
04:17 ctcrnitv joined #git
04:19 ahr3n_ joined #git
04:19 phanimahesh Well, alright then. I personally don't like it too, my screen is now full of emoji. :P
04:19 opal 👌  emoji are disgusting and thats why im using them ironically :^)  😂
04:22 phanimahesh Ironically, how?
04:22 opal 👌  i chose the two most overused emoji  😂
04:23 phanimahesh I don't know if they are overused but they now definitely are. They fill my screen.
04:24 opal 👌  lol  😂
04:24 opal 👌  youve never used twitter?  😂
04:24 opal 👌  i thankfully dont anymore but ya  😂
04:26 infinite_ joined #git
04:26 aidalgol joined #git
04:28 phanimahesh Twitter happens to be the only social network I'm active on, but I guess I use twitter mostly as a personal army of curators for content.
04:28 opal 👌  ah  😂
04:29 opal 👌  i have a twitter account i rarely use  😂
04:30 hahuang61 joined #git
04:32 maestrojed joined #git
04:34 Limes joined #git
04:39 taylorm joined #git
04:40 eletuchy_ joined #git
04:40 a3Dman joined #git
04:43 a_thakur joined #git
04:45 boombatower joined #git
04:46 howdoi joined #git
04:49 thiago_ joined #git
04:52 rollo joined #git
04:53 hahuang61 I've got a strange problem where if I move a file out of the git repo, it's detected, but if I change it's contents, it doesn't think that the repo was modified... any ideas why this might happen?
04:56 ResidentBiscuit joined #git
04:56 ochorocho__ joined #git
04:58 cyan__ joined #git
05:00 nick123 joined #git
05:01 Cabanossi joined #git
05:01 rkazak joined #git
05:02 pwnz0r joined #git
05:03 eletuchy joined #git
05:04 jstimm joined #git
05:04 feignix joined #git
05:04 nnyk_ joined #git
05:05 subhojit777 joined #git
05:06 cyphase joined #git
05:08 feignix joined #git
05:16 dmto joined #git
05:18 infinite_ joined #git
05:20 david007 joined #git
05:21 emPi joined #git
05:25 infinite_ joined #git
05:31 Andrew_K joined #git
05:34 haasn` left #git
05:34 vuoto joined #git
05:35 FuzzySockets joined #git
05:38 infinite_ joined #git
05:38 romerocesar joined #git
05:38 _ng joined #git
05:40 fracting joined #git
05:40 zumba_addict joined #git
05:40 nilg` joined #git
05:41 zumba_addict hey folks, I couldn't remember the variable i used when I ran git commit. I'm wondering why my git commit is sitting forever again. I remember that env variable i used helped me figure out why it was hanging
05:41 DolphinDream joined #git
05:43 opal 👌  bash history  😂
05:43 opal 👌  :v  😂
05:43 jceb joined #git
05:43 zumba_addict lol, i used it few months ago
05:44 opal 👌  oh  😂
05:44 zumba_addict it's not in the history anymore
05:44 opal 👌  longer bash history :^)  😂
05:44 ThomasLocke_ joined #git
05:44 zumba_addict hahhaa
05:44 zumba_addict on other repos, git commit works fine
05:44 opal 👌  idk which environment var would help you  😂
05:44 zumba_addict it's a git variable
05:44 opal 👌  run git commit -v  😂
05:44 opal 👌  for verbose  😂
05:44 opal 👌  see what its hung up on  😂
05:45 zumba_addict ok
05:45 User458764 joined #git
05:45 zumba_addict should I still add -m 'message'?
05:45 opal 👌  ya  😂
05:45 zumba_addict k
05:46 opal 👌  wait  😂
05:46 opal 👌  you're specifying files or the -a flag, right?  😂
05:46 remitamine left #git
05:46 zumba_addict still hanging
05:46 zumba_addict i just always use git commit -m 'message'
05:46 opal 👌  specify the files you wanaa commit, or -a for all  😂
05:47 zumba_addict i already git add .
05:47 * opal 👌  shrugs  😂
05:47 opal 👌  i never had an issue and i used git commit with file arguments, but idk  😂
05:47 opal 👌  i could be talking out of my ass again  😂
05:47 zumba_addict :)
05:48 zumba_addict i'll rm -rf the whole project and reclone
05:48 psprint Git commit oppens $EDITOR. Seems impossible to catch final after-enterring commit-message. But maybe there is some --log option, to point to a file where Git would store its output, without terminal output of $EDITOR ?
05:49 jason237 joined #git
05:50 Sucks joined #git
05:53 cqi joined #git
05:55 t0by joined #git
05:55 a_thakur joined #git
05:55 a_thakur joined #git
05:57 feignix joined #git
05:57 FrontPsych joined #git
05:57 romerocesar_ joined #git
05:58 zumba_addict I was able to successfully commit now
05:58 opal 👌  nice  😂
05:58 eletuchy joined #git
05:59 stonerfish joined #git
05:59 jyjon joined #git
05:59 zumba_addict so something is f up in my old repo directory
06:00 feignix joined #git
06:02 sostenuto joined #git
06:03 Repox joined #git
06:05 feignix joined #git
06:06 alex1a joined #git
06:11 taylorm joined #git
06:14 mingrammer_ joined #git
06:16 Phylock joined #git
06:17 qt-x joined #git
06:17 fracting joined #git
06:17 fujinuma joined #git
06:18 cinderhaze joined #git
06:19 fujinuma how to change a committed change to remote?
06:19 cinderhaze Hi everyone... I have a question... what are the steps needed to 'carve off' a chunk of a repository into it's own repo, but keep only the history associated with the files in the repo?  It was created 'copy paste' style, and looking back in the previous repo for history is painful
06:20 User458764 joined #git
06:20 cinderhaze fujinuma:  Are you asking how to change/revert a commit that you have already pushed to a remote?
06:20 freimatz joined #git
06:20 eletuchy joined #git
06:20 fujinuma cinderhaze: yeah
06:21 cinderhaze For that, you need to change the value in your local repo, and force push it to the remote repo.  If you don't need to rewrite history, you can use git revert to 'undo' your change, but leave it in the history
06:22 fujinuma I need to rewrite the history.
06:22 cinderhaze fujinuma: http://christoph.ruegg.name/blog/git-howto-revert-a-commit-already-pushed-to-a-remote-reposit.html
06:22 cinderhaze I think you want 'case 1' in that link
06:24 dminca left #git
06:25 MrMojito2 joined #git
06:26 romerocesar joined #git
06:26 dminca joined #git
06:29 valerd joined #git
06:31 eletuchy joined #git
06:32 eletuchy joined #git
06:33 User458764 joined #git
06:33 retropikzel joined #git
06:34 cyphase joined #git
06:36 Repox joined #git
06:36 eletuchy_ joined #git
06:36 _28_ria joined #git
06:37 infinite_ joined #git
06:37 sauvin joined #git
06:38 Sceorem joined #git
06:38 eletuch__ joined #git
06:39 zeroed joined #git
06:39 feignix joined #git
06:40 mischat joined #git
06:40 eletuchy joined #git
06:42 eletuchy_ joined #git
06:43 d0nn1e joined #git
06:44 eletuch__ joined #git
06:45 Fijit joined #git
06:46 sangy joined #git
06:47 fees joined #git
06:47 eletuchy joined #git
06:49 eletuchy_ joined #git
06:51 eletuch__ joined #git
06:51 fscala joined #git
06:57 ochorocho__ joined #git
06:57 infinite_ joined #git
06:58 mirazi_heket joined #git
06:58 Goffra joined #git
06:59 mirazi_heket hello, im trying to add files to newly created git repo on server (new to git)
06:59 mirazi_heket git add /home/(...)/* gives me
06:59 mirazi_heket fatal: This operation must be run in a work tree
06:59 eletuchy joined #git
06:59 mithenks joined #git
06:59 osse have you run 'git init' yet?
06:59 mirazi_heket git init --bare
07:00 grawity you cannot add a files into a bare repo, and you cannot generally add files that are outside the 'working tree'
07:00 grawity that is, it's not made to track whatever random files you list
07:00 mirazi_heket i have no idea how i should approach
07:00 osse mirazi_heket: add them to a normal repo then push to the bare one
07:00 grawity but rather, files in a specific directory
07:00 mirazi_heket osse: git init is meant to be run from ~ ?
07:01 grawity it's meant to be run from the directory you want to track.
07:01 eletuchy_ joined #git
07:01 nick123 joined #git
07:01 osse mirazi_heket: no, from the outermost level of the dir structure you want to track
07:01 grawity do you want to track your entire $HOME, or what?
07:01 mirazi_heket nope
07:02 infinite_ joined #git
07:02 nnyk_ joined #git
07:02 [Brain] joined #git
07:02 eletuch__ joined #git
07:03 mirazi_heket so i have to copy files to some git subdirectory, then add them?
07:03 osse usually you git init directly where they are
07:03 _ng joined #git
07:03 osse cd ~/mycoolproject/; git init
07:04 ToBeCloud joined #git
07:04 elastix joined #git
07:04 eletuchy joined #git
07:06 dan2k3k4 joined #git
07:06 jceb joined #git
07:06 zeroed joined #git
07:06 aavrug joined #git
07:06 eletuchy_ joined #git
07:07 jknetl joined #git
07:07 mirazi_heket i wanted to copy files there (cannot work on them directly since later will configure autodeploy) but in these files there is folder named 'config' and i cannot copy it
07:08 eletuch__ joined #git
07:09 encod3 joined #git
07:09 ki0 joined #git
07:09 Pulp joined #git
07:09 mirazi_heket (git repo files has config file)
07:10 User458764 joined #git
07:11 Juri_Agarin joined #git
07:12 codeliger joined #git
07:12 Goffra joined #git
07:15 newlifer_ joined #git
07:16 t0by joined #git
07:16 eletuchy joined #git
07:18 mirazi_heket files i'd like add to git have folder named 'config' same as config file of git's repo, any clue how to solve that?
07:19 cbreak mirazi_heket: makes no sense
07:19 cbreak git doesn't treat things called "config" specially
07:19 grawity maybe their autodeploy tool is picking up .git/config for some reason
07:19 baraba joined #git
07:19 Softeisbieger joined #git
07:19 mirazi_heket more precisely, there was error while copying (cp -pr)
07:19 cbreak sounds like a stupid script
07:20 reim joined #git
07:21 Internet13 joined #git
07:22 osse in any case you don't put a git repo where you deploy things
07:23 mirazi_heket i didnt
07:23 osse you can put a git repo *from where* you deploy things
07:23 Hounddog joined #git
07:23 mirazi_heket of course, thats separate directory
07:23 rollo left #git
07:24 binaryplease1 joined #git
07:25 rchavik joined #git
07:25 cdown joined #git
07:26 _August_ joined #git
07:26 grawity I guess if the .git directory is actually a problem then you need a smarter !deploy tool than `cp -a`
07:26 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
07:27 romerocesar joined #git
07:27 Balliad joined #git
07:29 kedare joined #git
07:30 dminca left #git
07:31 ImJune joined #git
07:31 dminca joined #git
07:33 Arban joined #git
07:35 DieguezZ joined #git
07:35 dreiss joined #git
07:36 imjacobclark joined #git
07:37 XVar joined #git
07:37 eletuchy joined #git
07:40 PaulCape_ joined #git
07:41 _ng joined #git
07:42 fwdit joined #git
07:42 ferr1 joined #git
07:42 _ngz_ngzz joined #git
07:44 nnyk_ joined #git
07:46 stuivi joined #git
07:47 User458764 joined #git
07:47 multi_io joined #git
07:47 troulouliou_div2 joined #git
07:48 XVar joined #git
07:49 jceb joined #git
07:49 pungi-man joined #git
07:50 duderonomy joined #git
07:53 watabou joined #git
07:54 sagerdearia joined #git
07:55 DolphinDreamm joined #git
07:56 pratima joined #git
07:56 lolmac joined #git
07:56 mariuscc joined #git
07:57 slayerjain joined #git
07:57 pratima hi there
07:57 selckin !hi
07:57 gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
07:58 djb-irc joined #git
07:58 pratima need small help in git
07:58 fwdit joined #git
07:59 pratima Is there a way to find the parent branch name of a current branch
08:00 sdothum joined #git
08:00 pratima could some one help me here
08:00 j416 pratima: no such thing as parent branch.
08:01 settermjd joined #git
08:01 jhass are you looking for all branches which have a common ancestor instead?
08:01 j416 pratima: branches are related only through the commit history
08:02 pratima the requirement is that while release branch is in progress we have insisted that they should create bugfix/<bug#> for all the bugs logged on release/1.0
08:02 pratima and once its fixed create a merge request (internal process where git merge is not executed yet )
08:02 pratima so I want to validate that the bugfix/.<bug#> is created from Release/1.0
08:03 cdown joined #git
08:03 mingrammer_ joined #git
08:03 lolmac joined #git
08:03 jhass opposed from which branch?
08:03 pratima this should be via an automated perl script
08:03 algun joined #git
08:03 algun joined #git
08:04 jhass you can assert that a branch was not created from a certain branch
08:04 jhass mh, no actually not even t hat
08:05 marcogmonteiro joined #git
08:05 jhass you can build a set of commits between two other branches (say release/1.0 and master) and assert that the current branch does not contain these
08:06 j416 pratima: it seems you want two checks then. 1. Branch is based on release branch. 2. Branch does not contain things that happened after release branch.
08:06 j416 pratima: or, you could simply check before you merge. Set the MR to target the release branch and it should be easy to spot an error.
08:06 pratima is it possible to get the first commit of a branch ?
08:07 pratima oh no pls ignore my previous req it may not work that way as well
08:07 j416 pratima: that is a cumbersome way to go about it.
08:08 pratima the problem we c here is that bugfix/<bug#> branch could be something on develop and release/1.0 for different purposes
08:08 mflow joined #git
08:08 j416 pratima: I would solve it by using some sense :)
08:08 pratima but some fix which was planned for release/2.0 should not go into Release/1.0
08:08 pratima so if we could check the parent we could be safe
08:09 j416 pratima: make sure that the person who merges knows what they are doing. Then it should be fine.
08:09 pratima ya pls any other solutions are welcoem
08:09 pratima No I cannot trust my developers
08:09 selckin then fire them
08:09 j416 pratima: you merge then
08:09 pratima merge what and what
08:09 King_Hual joined #git
08:09 King_Hual joined #git
08:10 jhass you review the difference between the branch and its target before merging it
08:10 jhass by hand
08:10 ph88 left #git
08:10 pratima you mean git diff ?
08:11 pratima git diff of Release/1.0 and bugfix/bug# ?
08:11 jhass and/or git log release/1.0..bugfix/x
08:11 j416 pratima: we have devs who are not very skilled with Git, and we solve this problem by having a dedicated person responsible for merging correct things. It works great. Bonus is that we get very good consistency in our git history.
08:11 fuchstronaut joined #git
08:11 pratima ok
08:11 Sucks joined #git
08:12 jhass you can also consider to get a tool that supports a pull request based workflow and nice visualizes all that stuff for you, like a private github repo, github enterprise, gitlab etc
08:12 jhass *nicely
08:13 j416 jhass: suspect they are using something like this since he mentioned merge request
08:13 pratima jhass what does git log release/1.0..bugfix/x  give me
08:13 j416 Or maybe not.
08:13 Sucks joined #git
08:13 jhass pratima: the commits to bugfix/x since release/1.0
08:14 jhass keep in mind, branchnames are just (moving) pointers to commits
08:14 jhass when you use them you use them in place of the commit sha
08:14 pratima really I do not c it that way
08:14 jhass quite similar to how you use google.com instead of 216.58.213.206
08:15 pratima I executed it with two independent branch names and still it gives me the one which has more
08:15 Sucks joined #git
08:15 pratima like A-B
08:15 osse pratima: https://raw.githubusercontent.com/Osse/git-stuff/master/dots.txt
08:15 a_thakur joined #git
08:15 ams__ joined #git
08:16 Sucks joined #git
08:16 djb-irc joined #git
08:17 Sucks joined #git
08:18 Sucks joined #git
08:19 uhmgswa^2 joined #git
08:19 carell joined #git
08:20 pratima thanks osse need to execute them with my data and test
08:20 pratima thank you guys will try and get back to you
08:21 fornax joined #git
08:21 mablae_ hey, can I stage specific lines in a file?
08:21 mablae_ I tried git add -p file but the suggested hunks do not match
08:22 jhass "match"?
08:22 jhass you can edit the hunk
08:22 troulouliou_div2 joined #git
08:27 leeN joined #git
08:29 circ-user-bgUQR joined #git
08:30 uhmgawa joined #git
08:30 PHPanos joined #git
08:30 jceb joined #git
08:31 Meteorhead joined #git
08:31 cqi joined #git
08:32 texinwien joined #git
08:34 TomyWork joined #git
08:34 kurkale6ka joined #git
08:34 phanimahesh joined #git
08:35 madduck joined #git
08:39 c0ded joined #git
08:40 jknetl joined #git
08:41 cqi joined #git
08:41 raijin joined #git
08:42 jknetl joined #git
08:45 djb-irc joined #git
08:48 ocbtec joined #git
08:51 antranigv joined #git
08:51 carpii joined #git
08:52 djb-irc joined #git
08:54 watabou joined #git
08:54 carpii i was hoping 'git rev-list --tags --max-count=1 --branches=master' would pull the most recent commit which has a tag in master branch. But it seems no matter what i put for --branches=, its not affecting the output at all.   Docs arent really helping, any ideas?
08:57 mingrammer_ joined #git
08:58 ochorocho__ joined #git
08:59 Mo joined #git
08:59 Mo Hi, I have a bare repo, now I like to change a previous submit message. commit --amend does not work here.
09:00 tobiasvl Mo: easiest to do in a non-bare clone
09:01 tobiasvl and then force-push to the bare repo
09:01 tobiasvl !rewrite
09:01 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
09:02 nick123 joined #git
09:03 ZenWalker joined #git
09:04 mingrammer_ joined #git
09:04 ZenWalker hello, I add new files with git add -N, then I create one patch with git diff, now I want to apply the patch with git apply diffile, why doesnt create the new files?
09:04 stuivi joined #git
09:06 infra-red joined #git
09:07 carpii Zen: what do you see when you git apply -v <patchfile> ?
09:08 Mo tobiasvl: This is a continious git p4 sync in a cronjob. I already edited the message in the parent p4 repo, but sync does only sync new commits, so I need to edit the same in my git clone.
09:08 Mo I only need a bare repo as I only need the meta data for a Trac-Server, never submitting nor pushing on that clone
09:09 ZenWalker carpii: "doesnt exist the file or folder"
09:09 Mo So how can I modify the history in a bare clone without pushing?
09:09 Raging_Hog carpii: it seems like you need to do --branches="*master" because it will include the full ref name, and the globbing * is only added to the end. But this doesn't solve your problem, since using both --tags and --branches seems to show the commits from both
09:10 eletuchy_ joined #git
09:10 zeroed joined #git
09:10 tobiasvl Mo: hm, I believe !interactive_rebase with the reword keyword would work. it doesn't stage the commit again like --amend does IIRC
09:10 gitinfo Mo: 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'.
09:10 Mo tobiasvl: Maybe git p4 sync will resync after a  git update-ref HEAD HEAD^ ?
09:10 ZenWalker carpii: previously I need to create empty files with that names?
09:11 tobiasvl Mo: yeah that'll probably work!
09:12 carpii Raging_Hog: thanks the globbing issue makes sense. yeah still not convinced im heading down right road with rev-parse-list. Ive since started trying with "git for-each-ref refs/tags --sort=-taggerdate --format='%(refname)' " but not yet sure this is right either :p
09:13 carpii Zen: I dont recall sorry. I dont think the file has to pre-exist in order to apply patch, but ive not used patches in a long while
09:13 carpii Zen: id recommend you go through https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/  to see if youre doing everything right
09:16 fannymay joined #git
09:17 notebox joined #git
09:17 eletuchy joined #git
09:17 jbitdrop joined #git
09:17 gsingh joined #git
09:18 ZenWalker carpii: thanks
09:20 settermjd joined #git
09:23 Kicer86 joined #git
09:23 barteks2x joined #git
09:23 cyphase joined #git
09:24 cdown joined #git
09:27 carpii Raging_Hog: figured out my 'retrieve latest tag' issue. Its as simple as git describe HEAD --tags --abbrev=0
09:28 carpii where HEAD is master
09:28 romerocesar joined #git
09:29 inflames joined #git
09:30 reim joined #git
09:33 marcogmonteiro joined #git
09:33 eletuchy_ joined #git
09:36 tesuji joined #git
09:38 davisonio joined #git
09:39 courrier joined #git
09:40 peem left #git
09:40 Silenced joined #git
09:40 qt-x joined #git
09:43 gemie joined #git
09:44 lindenle joined #git
09:44 gemie Hi, I have a branch that hasn't been pushed to origin yet. Inside that branch some commits back from head I want to change that commit. Is there a way to just change that commit without reseting and stashing and doing a bunch of tricks?
09:45 reim joined #git
09:45 Raging_Hog carpii: awesome, I'll make note of it
09:45 djb-irc joined #git
09:46 tobiasvl gemie: !rebase_interactive
09:47 bdonnahue joined #git
09:47 bdonnahue hey guys im new to git. im tryign to setup a mirror as mentioned here http://www.redmine.org/projects/redmine/wiki/HowTo_keep_in_sync_your_git_repository_for_redmine
09:48 tobiasvl gemie: !interactive_rebase
09:48 gitinfo gemie: 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'.
09:48 reim joined #git
09:49 rossome joined #git
09:49 cdown joined #git
09:51 babyswizz joined #git
09:52 reim joined #git
09:52 dopesong joined #git
09:52 suy Is there any advice for when you have multiple email addresses, and want to avoid making commits with the wrong one configured? As in, I've just noticed personal email in work repos. :-/ I have more personal repos, so the default is that. But that I want to avoid mistakes with work repos.
09:52 cdown_ joined #git
09:54 dokma joined #git
09:54 ahmedelgabri joined #git
09:54 reim joined #git
09:54 watabou joined #git
09:54 mkoskar joined #git
09:54 jhass git config --local user.email ?
09:55 afuentes joined #git
09:55 User458764 joined #git
09:56 babyswizz Still new to git and am trying to make my first commit with "git commit -m "Commit all june12 project files"" command but I get an error "Please tell me who you are"
09:56 tobiasvl suy: to avoid that same mistake, I haven't set a --global user.email. I always set it locally for each repo.
09:56 babyswizz what could I be doing wrong
09:57 tobiasvl every time I clone or init a new repo I forget that I have to do that, of course, so the first commit I make always becomes tobiasvl@computer-name :P but git tells me about that and I set the local user.email and amend.
09:57 carpii babyswiz, http://stackoverflow.com/questions/11656761/git-please-tell-me-who-you-are-error
09:57 carpii first hit on google.
09:57 reim joined #git
09:57 weckl joined #git
09:59 suy tobiasvl: that's what I was considering to do. Unset globally, and suffer having to set it explicitly for each and every repository
10:00 suy jhass: I know that feature, my point is that that way you have to remember setting that, and if you don't and push, you just screwed up
10:00 eletuchy joined #git
10:00 cdown joined #git
10:00 babyswizz thanks
10:01 carpii suy, if its not set at all, git should notify you when you commit
10:01 jhass suy: so say anything goes, what would be your dream solution to be? What do you expect git to do here?
10:01 goTAN joined #git
10:01 jhass I'm not quite getting what kind of solution you expect
10:02 carpii a magic one
10:02 EvilDMP On this pull request https://github.com/divio/django-cms/pull/5427 there are two commits, but the earlier one 5876d2f is actually a kind of ghost of 7632db7, which was merged earlier - I don't know how that happened, but I think it was a mistake while rebasing somewhere.
10:02 EvilDMP I don't want 5876d2f to show up in the history.
10:02 tobiasvl my solution is obviously the dream solution, although it would be nice if git asked you interactively what to set user.email to when first commiting, instead of using your computer username and hostname by default ;) but it's a minor annoyance, suy, I assure you.
10:02 EvilDMP And so far, I haven't been able to rebase it out of existence...
10:03 jhass EvilDMP: git rebase -i and simply delete its line or squash the the latter one into it
10:03 reim joined #git
10:03 jhass EvilDMP: make sure to use something clean as rebase base, git fetch upstream; git rebase -i upstream/master or so
10:03 EvilDMP jhass: what does actually deleting the line do?
10:03 jhass it makes git not apply the commit
10:04 gemie tobiasvl: hi and thanks for your answer. I have used interactive rebase to squish commits, how can I use it to change a commit?
10:04 EvilDMP And I think the commit is empty/makes no changes, so that should be OK
10:04 EvilDMP jhass: will try that
10:04 chid joined #git
10:04 EvilDMP thanks
10:04 tobiasvl gemie: man git rebase
10:04 gitinfo gemie: the git-rebase manpage is available at http://jk.gs/git-rebase.html
10:04 jhass EvilDMP: you can even reoder the commits there if you'd want to ;)
10:05 jhass it's a quite literal todo list for git
10:05 Mo tobiasvl: Worst case, the new git p4 sync was syncing all and all ids have changed. I need to restore a backup....
10:05 tobiasvl gemie: to change a commit, change "pick" in front of the commit in the rebase list to "edit". you can do other stuff too.
10:05 gemie tobiasvl: super awesome, thanks!
10:05 reim joined #git
10:05 EvilDMP jhass: presumably, re-ordering commits can cause all kinds of conflict horror if they depend on each other
10:05 jhass EvilDMP: yes.
10:05 infinite_ joined #git
10:06 EvilDMP jhass: I prefer a life free of conflict horror, I have to say
10:06 suy carpii: jhass: I wasn't expecting any solution, just advice on what you do. tobiasvl's solution to remove global email config is the only thingn that ocurred to me, and I'll try that. Maybe chain with an alias to avoid doing typos when adding a predefined email address.
10:06 jhass EvilDMP: I just thought that fact might help your understanding of what git rebase -i actually does ;)
10:06 EvilDMP jhass: it does
10:07 EvilDMP jhass: yay, I now have a nice clean mergeable PR; thanksa lot
10:07 jhass yw
10:08 EvilDMP I once lost a finger to rebase, so I am quite cautious with it
10:08 jhass heh
10:08 _Patrick_ joined #git
10:08 jhass if everything fails git rebase --abort or git reflog & git reset --hard should still be there for you
10:09 pierre__ joined #git
10:10 carpii suy, yeah you could just add a couple of aliases in your .bash_profile  repo_work and repo_personal or something
10:11 pierre365 joined #git
10:11 pierre365 hi
10:11 gsingh joined #git
10:12 bernardio joined #git
10:12 pierre365 i have a list of diff's that i can see using git diff. My issue is that a in lot of those diff just the copyright notice is changes (first N lines), and i would like to get a diff of all the files that _not only_ have the first N lines changed. Is it possible please?
10:12 fuchstronaut joined #git
10:14 sdothum joined #git
10:14 Silenced_v2 joined #git
10:21 settermjd joined #git
10:22 rnsanchez joined #git
10:22 djb-irc joined #git
10:23 JRHaigh joined #git
10:23 mda1_ joined #git
10:25 k3rn31 joined #git
10:26 settermjd joined #git
10:31 sostenuto joined #git
10:32 djb-irc joined #git
10:32 carpii pierre, you could try looking at adding a 'clean' filter in gitattributes, just while you run the diff... https://git-scm.com/docs/gitattributes
10:33 carpii but if its just for a one off review, you might be better just generating a diff patch and then grepping it
10:33 User458764 joined #git
10:34 User458764 joined #git
10:34 carell joined #git
10:36 settermjd joined #git
10:36 achadwick joined #git
10:37 settermjd joined #git
10:42 eletuchy joined #git
10:43 GuKKDevel joined #git
10:51 keltvek joined #git
10:51 flopsec joined #git
10:53 User458764 joined #git
10:56 johnmilton joined #git
10:57 Urbany joined #git
10:57 watabou joined #git
10:57 jknetl joined #git
10:58 eletuchy joined #git
10:58 a_thakur_ joined #git
10:58 fuchstronaut joined #git
10:59 ochorocho__ joined #git
11:03 nick123 joined #git
11:04 satbyy joined #git
11:05 fscala joined #git
11:08 NightMonkey joined #git
11:09 dstarh joined #git
11:12 ShekharReddy joined #git
11:12 rahtgaz joined #git
11:12 allcentury joined #git
11:12 acetakwas joined #git
11:14 Pulp joined #git
11:16 PHPanos joined #git
11:17 WizJin joined #git
11:18 swahili joined #git
11:18 swahili just merged branchA into the master branch (branchA has a lot of history) and I want to go back, is there a way ?
11:18 swahili if I do git log, I have months of branchA commits into master
11:19 carpii go back meaning what?
11:19 carpii undo the merge completely?
11:19 swahili carpii: thanks for lookng! yes, undo the merge : )
11:19 swahili if possible
11:19 swahili git reset --hard origin/master ?
11:20 swahili does this make sense
11:20 carpii the merge hasnt been pushed yet?
11:20 shaggycat joined #git
11:20 swahili not yet
11:20 eletuchy joined #git
11:20 carpii ok, yes you can reset hard
11:20 swahili Thank you : )
11:20 carpii np
11:21 wrksx joined #git
11:21 wrksx hi there
11:21 reim joined #git
11:22 arand joined #git
11:24 wrksx What would be the sequence you recommend in order to merge a conflicting branch to some master branch? Should I rebase the branch onto master, fix conflicting stuff, and then merge in one go?
11:24 wrksx I'm wondering if there's any sensible aproach to this
11:24 wrksx or if you just merge your branch in master, fix the conflict, and then commit?
11:25 carell joined #git
11:25 espindola joined #git
11:26 reim joined #git
11:26 carpii just fix the conflict as you are merging into master
11:26 carpii rebase has its uses, but it also rewrites history, so rebasing a branch will screw things up for other devs if its also a remote branch
11:29 romerocesar joined #git
11:29 fuchstronaut joined #git
11:30 nachoman joined #git
11:30 a_thakur joined #git
11:30 d0nkeyBOB joined #git
11:31 digidog joined #git
11:35 cyan__ joined #git
11:38 inflames joined #git
11:39 settermjd joined #git
11:42 acetakwas joined #git
11:46 pungi-man joined #git
11:49 crater2150 joined #git
11:52 espindola joined #git
11:54 EduardoMartins joined #git
11:54 settermjd joined #git
11:54 davisonio joined #git
11:55 ahmedelgabri joined #git
11:57 Sceorem joined #git
11:58 ntonjeta joined #git
11:58 watabou joined #git
11:59 settermjd joined #git
12:02 stoopkid joined #git
12:04 reim joined #git
12:05 wrksx ha sure makes sense
12:06 wrksx ty carpii
12:06 basiclaser joined #git
12:07 rgrinberg joined #git
12:07 jstein_ joined #git
12:08 ejb joined #git
12:09 synthroid joined #git
12:09 wrksx but now let's say the branch in question (let's call it branch A) doesn't desapear. You want to keep workin into it and merge again into master later. If you keep the branch alive long enought you will eventually need to 'incorporate' commits from other branches (including master), right? How would you do that?
12:09 a_thakur joined #git
12:10 DolphinDream joined #git
12:11 jagob joined #git
12:11 reim joined #git
12:12 tobiasvl wrksx: rebase is probably the best way
12:12 tobiasvl (of course you can merge too, but that's not as clean)
12:15 reim joined #git
12:17 reim joined #git
12:18 Lunatrius` joined #git
12:19 rwb joined #git
12:19 noteness joined #git
12:21 davisonio joined #git
12:22 liquidjamm joined #git
12:23 a_thakur joined #git
12:23 dstarh joined #git
12:23 goTAN joined #git
12:25 roelmonnens joined #git
12:25 pfsmorigo joined #git
12:25 jh3 joined #git
12:26 mdw joined #git
12:29 acetakwas joined #git
12:30 t0by joined #git
12:31 _noblegas joined #git
12:32 fuchstronaut joined #git
12:33 CEnnis91 joined #git
12:35 ejb joined #git
12:35 narendraj9 joined #git
12:35 Noldorin joined #git
12:40 SpeakerToMeat joined #git
12:42 Kulrak joined #git
12:42 Kulrak joined #git
12:42 shymega joined #git
12:43 StarYa joined #git
12:44 CheckDavid joined #git
12:44 zivester joined #git
12:46 rubyonrailed joined #git
12:46 a_thakur joined #git
12:46 fmcgeough joined #git
12:46 taylorm joined #git
12:46 flaguy48 joined #git
12:47 wrksx tobiasvl, as carpii said that would mess up the history and screw my fellow devs, wouldn't it?
12:48 tobiasvl didn't see that you had already discussed it
12:48 hanlof joined #git
12:48 tobiasvl if you have pushed the branch and other people have pulled it then yeah, maybe not rebase
12:48 tinajohnson___ joined #git
12:49 wrksx tobiasvl, is there a third alternative? or should I merge master in the branch to get it up to date?
12:50 hanlof hello. could someone please help? i can't figure this one out: $ git branch --set-upstream-to refs/remotes/origin/master
12:50 hanlof error: Not tracking: ambiguous information for ref refs/remotes/origin/master
12:51 theduke_ joined #git
12:51 hanlof also: git show-ref refs/remotes/origin/master returns only one hash
12:51 jceb joined #git
12:51 osse hanlof: try git branch --set-upstream-to origin/master
12:52 st0opkid joined #git
12:52 hanlof $ git branch --set-upstream-to origin/master warning: refname 'origin/master' is ambiguous. fatal: Ambiguous object name: 'origin/master'.
12:52 osse hanlof: git branch -a | grep master
12:52 hanlof sorry the linebreaks were stripped.
12:52 tobiasvl wrksx: there's not really any third alternative than merge or rebase. what would that be?
12:53 wrksx tobiasvl, okay I'll run a test with merge to see how it goes =)
12:54 M-theduke joined #git
12:54 PHPanos joined #git
12:54 hanlof osse: what should i look for? i have "master" and then i have remotes/origin/XX-master and remotes/origin/YY-master and remotes/origin/master
12:54 hanlof also remotes/origin2/master
12:54 DieguezZ joined #git
12:55 carpii this sounds like a mess :)
12:55 osse look for ambiguities
12:55 hanlof there are none
12:55 osse can i see
12:55 hanlof $ git branch -a | grep origin/master
12:55 hanlof this returns only one line
12:55 dsdeiz joined #git
12:55 introsp3ctive joined #git
12:55 osse what does 'git branch' say
12:56 M-theduke left #git
12:56 jimi_ joined #git
12:56 hanlof well theres 4 branches. master, xxx, yyy and zzz
12:57 Julie3 joined #git
12:57 osse you are on a branch now, right?
12:57 hanlof yep
12:58 _pix left #git
12:58 hanlof im seriously suspecting a bug
12:58 osse IOW one of those four branches has a * next to it?
12:58 hanlof yes osse
12:58 osse git for-each-ref | grep origin/master
12:59 hanlof in total 1 result
12:59 hanlof $ git for-each-ref | grep origin/master 527d1223cc6c2355cc8ca09fbdb47e3af8f41569 commitrefs/remotes/origin/master
12:59 hanlof again sorry about stripped linebreak
12:59 osse then I don't know
12:59 carpii what remotes do you have set in ./git/config ?
12:59 watabou joined #git
12:59 carpii .git/config sorry
12:59 davisonio joined #git
12:59 ochorocho__ joined #git
12:59 notebox joined #git
13:00 cdg joined #git
13:00 hanlof origin is one of them. and then i have two other ones
13:00 DolphinDream joined #git
13:00 carpii intentionally, or is this a result of someone getting some commands wrong?
13:00 k3rn31 joined #git
13:01 hanlof i have intentionally added two other remotes
13:01 carpii oki
13:01 aguimaraes1986 joined #git
13:01 osse we're looking for mabiguities. that's pretty hard when everything is a secret :(
13:01 carpii and in [branch "master"] whats the remote set to?
13:01 Julie3 Hi ! I have branches "dev" and "prod" and "master" and branches "beta" and "beta_prod". I'd like to merge my beta to master (so that I'll merge master to uat and prod). I am using gitlab, and I tried to do my merge from beta to master, but there are conflits (of course, I had some modifications to do on dev/prod versions while woring on beta).
13:01 livingstn joined #git
13:01 Julie3 I'd like to merge to master by overwriting everything, and I have no idea how to do that (I tried a few things that I don't understand but no sucess). How can I do that ? (I am about to rm -rf my repertory to make a totally new git everything....) (And no, I don't understand anything about what I'm doing with git...)
13:01 Julie3 Thanks !
13:02 pfsmorigo joined #git
13:02 hanlof sorry osse. im trying not to be specific because im nervous about revealing company secrets
13:03 hanlof branch master has remote set to origin
13:03 guardianJ joined #git
13:04 carpii hanlof, when did this start happening? presumably you were able to push to master previously
13:04 wrksx Julie3, "And no, I don't understand anything about what I'm doing with git" haha
13:04 nick123 joined #git
13:04 italoacasas joined #git
13:04 osse hanlof: and what is the "merge" set to? under [branch "master"]
13:05 wrksx like hanlof branch_dev-android-trojan
13:05 wrksx =)
13:05 hanlof so heres the whole config for remote origin
13:05 hanlof [branch "master"] remote = origin merge = refs/heads/master
13:05 happy-dude joined #git
13:05 carpii Julie3 you want to replace master branch with beta branch? losing everythig that isnt already in beta
13:06 osse hanlof: in that case what git branch --set-upstream-to would do is already done, so if you want you can pretend you didn't have this problem to begin with
13:06 hanlof and i am not really sure when it started happening. but pushing is not the issue. i just can't set remote-tracking branch
13:06 fuchstronaut joined #git
13:07 Julie3 carpii: yes
13:07 hanlof osse no i was not trying to set upstream for master. i was trying to do it for a new branch
13:07 hanlof like this
13:07 carpii Julie, has anyone else pulled this repo?
13:07 carpii potentially
13:07 wrksx Julie3, what do you mean by "I'd like to merge to master by overwriting everything"? Do you mean "I want to merge beta into master and solve every conflict by keeping the file version that's in the beta branch"
13:07 hanlof $ git checkout -b xxx refs/remotes/origin/master fatal: Not tracking: ambiguous information for ref refs/remotes/origin/master
13:07 Julie3 wrksx: that is exatly what I meant :D
13:08 carpii hanlof, do you get the same error when you 'git show refs/remotes/origin/master' ?
13:08 wrksx joined #git
13:08 hanlof i will cut and paste from the terminal. one sec
13:09 hanlof $ git show-ref refs/remotes/origin/master 527d1223cc6c2355cc8ca09fbdb47e3af8f41569 refs/remotes/origin/master
13:09 barteks2x joined #git
13:09 wrksx_ joined #git
13:09 hanlof that's it. i get only one line of output
13:09 carpii hm
13:09 hanlof this is git version 2.8.1
13:10 carpii ah oki, you used show-ref instead of show
13:10 carpii wondered why they differed
13:10 hanlof oh im sorry. my bad
13:10 carpii git show-ref origin/master shows same output?
13:11 RedShift joined #git
13:11 hanlof yes
13:12 hanlof show-ref master gives me heads/master and remotes/origin/master and remotes/xxx/master
13:12 wrksx is this possible to have a tag named 'refs/remotes/origin/master'?
13:12 wrksx with the slashes inside?
13:13 FuzzySockets joined #git
13:13 hanlof git tag -l | grep master
13:13 hanlof empty
13:13 wrksx =)
13:13 hanlof isent it wierd??
13:14 wrksx it is
13:14 wrksx hanlof, are you on windows?
13:14 hanlof im gonna try git version 1.7.1
13:14 carpii hanlof, in gitconfig, [remote "origin"]
13:14 carpii whats the fetch set to?
13:14 rueben joined #git
13:15 hanlof im on RHEL 6.4
13:15 hanlof well there are many fetch lines in my git config
13:15 hanlof for origin
13:16 hanlof fetch = +refs/heads/master:refs/remotes/origin/master         fetch = +refs/heads/cl2:refs/remotes/origin/cl2         fetch = +refs/heads/cl3:refs/remotes/origin/cl3
13:16 hanlof ets
13:16 hanlof etc
13:16 hanlof because there are so many branches in origin that i dont want. i just fetch some specific ones
13:18 mdw joined #git
13:18 carpii and the reason you want to set upstream is? you are switching between origins regularly or?
13:20 f3r70rr35f joined #git
13:20 hanlof well i guess i want to git pull without extra arguments :)
13:20 hanlof heres a funny thing!
13:20 Julie3 left #git
13:20 hanlof $ grep origin/master .git/info/refs  e368d0fbcabbadfbf213e9188fec20addf67d763refs/remotes/origin/master
13:20 DolphinDream joined #git
13:20 hanlof this one differs from .git/refs/origin/master
13:20 hanlof $ cat .git/refs/remotes/origin/master  527d1223cc6c2355cc8ca09fbdb47e3af8f41569
13:21 a_thakur_ joined #git
13:21 stuivi joined #git
13:22 rnsanchez_ joined #git
13:22 a_thaku__ joined #git
13:23 carpii im out of ideas i think
13:23 carpii cant help thinking youre making life complicated with all these origins and selective fetching tho :p
13:23 hanlof oh. hehe
13:23 hanlof yeah maybe
13:23 hanlof but it used to work
13:24 hanlof but do you think that origin/master in .git/info/refs should differ from .git/refs/remotes/origin/master ?
13:24 aLeSD joined #git
13:25 aLeSD hi all
13:25 APic Hi
13:25 aLeSD how could I copy my repo and put it out of the git control ?
13:25 wrksx hanlof, not sure if that can help, have you seen this: http://stackoverflow.com/a/15236035
13:25 aLeSD I'd like to create a not-git copy of my software
13:25 carpii in not sure hanlof, im not sure what git info is used for
13:26 nilg joined #git
13:27 mbrzuzy joined #git
13:28 hanlof aLeSD: if you just remove the .git directory in your repo there is nothing but your files left
13:28 hanlof i dont think there is a git command to do that
13:28 wrksx git archive maybe?
13:29 hanlof wrksx: well we looked for tags named something with master
13:29 imjacobclark joined #git
13:29 hanlof carpii: im not sure either.
13:29 wrksx hanlof, I was pointing u to a specific place in the page
13:29 carpii hanlof, does git update-server-info produce any output?
13:29 wrksx hanlof, the guy had a file .git/master or smthin
13:30 wrksx aLeSD, but anyway there are git specific files you 'll have to remove yourself (.gitignore and the likes)
13:30 imjacobclark joined #git
13:31 wrksx hanlof, I closed the page and gotta get back to work but I thought that might help you dig in the direction of the differing sha for master found in your setup
13:32 wrksx hanlof, the guy was sayin after deleting that file the error was gone. So a bit of reserch on the subject might get you sorted, but I haven't much clue sorry
13:33 hanlof oh sorry wrksx
13:33 hanlof update-server-info does not say anything
13:33 carpii ok, was a long shot
13:34 wrksx "It is caused when you forget the "refs/heads" part of the update-ref command"
13:34 wrksx did u do that ?
13:35 hanlof i tried with and withouth refs/heads
13:35 hanlof btw when i used git version 1.7.1 i did not get a problem :O
13:35 hanlof then it worked
13:35 hanlof im totally confused
13:35 heroux_ joined #git
13:36 LeBlaaanc joined #git
13:36 shaggycat joined #git
13:37 scoobertron joined #git
13:37 wrouesnel1 joined #git
13:40 watabou joined #git
13:41 Dougie187 joined #git
13:42 a_thakur joined #git
13:43 wrksx hanlof, you did not get it. It said that once you forgot the "refs/heads" part, it create a file .git/xxxxx that then can create ambiguity
13:43 wrksx hanlof, but again no clue if that's the case for your issue. Glad to know you somehow manage to acheive your goal
13:45 rahtgaz I'm trying to 'flow feature finish', but I'm getting the following fatal error: http://dpaste.com/279B56Z. I can however successfully checkout to develop or integrate develop into feature-datastore. What's wrong?
13:45 aLeSD hanlof, wrksx: thanks
13:46 a_thakur_ joined #git
13:47 raijin joined #git
13:49 ash_workz joined #git
13:52 AaronMT joined #git
13:53 watabou joined #git
13:54 uhmgswa^2 joined #git
13:55 bdonnahue left #git
13:56 davisonio joined #git
13:58 espindol_ joined #git
13:59 rkazak joined #git
13:59 GodGinrai joined #git
14:00 ochorocho__ joined #git
14:02 dopesong joined #git
14:05 rubyonrailed joined #git
14:10 howdoi joined #git
14:10 allcentury joined #git
14:10 msonntag joined #git
14:12 ResidentBiscuit joined #git
14:13 dopesong joined #git
14:13 heroux_ joined #git
14:17 mmlb joined #git
14:18 gkatsev joined #git
14:18 nickthetait joined #git
14:21 dopesong_ joined #git
14:23 shinnya joined #git
14:25 efdetonator joined #git
14:25 tristanp joined #git
14:26 stonerfish joined #git
14:27 kaldoran joined #git
14:28 gkatsev joined #git
14:28 robotroll joined #git
14:30 mmlb joined #git
14:31 t0by joined #git
14:31 phaleth joined #git
14:32 samson joined #git
14:32 ki0 joined #git
14:36 Meteorhead I fetched a remote branch from a colleague's repo, I'd like to pull from that branch again to update my local one, is it a matter of git fetch <url> branchName and then git merge FETCH_HEAD?
14:36 Meteorhead of course im already on the given branch
14:37 madewokherd joined #git
14:38 GodGinrai Meteorhead: `git fetch colleague_remote/colleague_branch` `git merge colleague_remote/colleague_branch` should work, I'd think
14:40 Meteorhead GodGinrai: thanks God!
14:41 ejb joined #git
14:41 rwb joined #git
14:41 acetakwas joined #git
14:41 zumba_addict joined #git
14:42 nnyk_ joined #git
14:42 GodGinrai yw
14:42 MrMojito2 joined #git
14:42 MrMojito2 joined #git
14:42 aarobc joined #git
14:43 ResidentBiscuit Or just git pull colleague/branch
14:44 a_thakur joined #git
14:44 GodGinrai Sure, but I tend to only pull branches I know won't break.  Like master into master
14:45 ResidentBiscuit A pull is just a fetch + merge, it's the same as what you proposed but in one step
14:45 circ-user-Oetft joined #git
14:46 GodGinrai ResidentBiscuit: yes.  I left out the extra steps I normally take like making copy branches ;)
14:46 ki0 joined #git
14:46 uhmgswa^2 left #git
14:46 ki0 joined #git
14:47 uhmgawa joined #git
14:47 P4Titan joined #git
14:47 slick joined #git
14:48 thiago_ joined #git
14:48 zivester joined #git
14:48 davisonio joined #git
14:48 P4Titan Hello all. Why is it that when I run `git submodule update`, git doesn't pull the latest changes from the remotes. I'm reading online that it checks out some commit specific in the index of the superproject, but I'm not sure what that means exactly.
14:49 raven-au_ joined #git
14:50 CJKinni joined #git
14:53 deadnull_ joined #git
14:53 jceb joined #git
14:53 linx joined #git
14:54 elementalest joined #git
14:54 elementalest joined #git
14:54 watabou joined #git
14:55 mmmveggies joined #git
14:57 ilmari P4Titan: the superproject has a commit id, 'git submodule update' checks that one out, if it changd
14:57 P4Titan I did a simple git checkout master, git pull, and then committed that
14:57 P4Titan To update the superproject's commit id
14:57 P4Titan That's what the internet suggested
15:00 NeverDie joined #git
15:03 crose joined #git
15:05 nick123 joined #git
15:06 Gitzilla joined #git
15:09 ItSANgo joined #git
15:11 diegoaguilar joined #git
15:11 kpease joined #git
15:11 P4Titan left #git
15:11 narendraj9 joined #git
15:12 leeN joined #git
15:12 bango2 joined #git
15:13 rossome joined #git
15:14 ResidentBiscuit joined #git
15:15 rominronin joined #git
15:15 HerrK joined #git
15:16 LeBlaaanc joined #git
15:18 taylorm joined #git
15:20 dimi1947 joined #git
15:21 romerocesar joined #git
15:21 cdown joined #git
15:22 tyreld joined #git
15:22 darkblue_b joined #git
15:22 dmto joined #git
15:22 imjacobclark joined #git
15:22 zumba_addict joined #git
15:23 darkblue_b Q. how should I say to my colleague.. I have ten commits in this PR ...  what are the terms from git ?  "commit" is simple.. but the collection of commits into one "changeset" ?  is that it ?
15:24 imjacobclark joined #git
15:24 osse darkblue_b: a gaggle of commits
15:24 ResidentBiscuit A flock of seacommits
15:24 osse just kidding. I don't know; good question. I would just call it a branch
15:24 darkblue_b hmm branch is the whole named thing
15:24 ResidentBiscuit I would just say "I have 10 commits"
15:25 darkblue_b there is something between commits and branch
15:25 ResidentBiscuit Or "Look at my PR"
15:25 darkblue_b I did that !
15:25 darkblue_b .. so thats why I have a few minutes to ask
15:25 osse "Hey baby... wanna look at my PR"
15:25 osse "eww"
15:25 imjacobclark joined #git
15:25 kashyap joined #git
15:25 darkblue_b they are looking at a bunch of tedious bash right now, and I am wondering about this group of commits
15:26 SimonNa joined #git
15:26 darkblue_b btw- I have gotten almost everyone off of Github
15:26 darkblue_b .. I might as well know the right names :p
15:26 darkblue_b I have a Kallithea, but the one that is the main now is gogs
15:27 darkblue_b very happy to stay away from a single for-profit company to hold our FOSS work
15:28 darkblue_b hmm well the PR does update when the branch has new commits
15:28 ResidentBiscuit Yes it does
15:28 darkblue_b so it is a branch to branch compare then
15:28 imjacobclark joined #git
15:28 _ikke_ it is
15:28 jast well, one advantage of a DVCS like git is that you can easily switch to another hoster if one goes crazy or disappears :)
15:28 _ikke_ <base>..<branch>
15:28 darkblue_b "easily"
15:29 jast sure, it's a hassle for each contributor, but a fairly minor hassle
15:29 darkblue_b I did pull from the master branch during the feature build, so I am getting more sophisticated now
15:29 jast with something like subversion or CVS you'd have to make the hoster give you a dump of the server-side data, with git you have all of it locally
15:29 darkblue_b sorry to be happy about such a small thing, but lots of variables to get to that simple mechanuic, as you know
15:30 shiriru joined #git
15:30 jast well... every little bit of progress is a small revelation, so why not be happy :)
15:30 darkblue_b its the tickets and PRs and logins plus other, combined
15:30 jast right, I don't think about those as much because I don't use them a lot
15:31 darkblue_b you know I did read the git source a bit in December, maybe I should look at that again one of these hours
15:32 darkblue_b .. see what they say... gogs and Kallithea would have a section too, describing the "bunch of commits being considered"
15:32 nedbat jast: the "easy to switch" thing is more difficult when you consider pull requests, issues, wiki, etc.
15:32 darkblue_b its not easy to switch, I can almost gurantee it
15:32 jast yeah, that already got pointed out to me
15:32 watabou joined #git
15:32 darkblue_b three decades of software - been there done that
15:32 quakephil joined #git
15:32 jast though it couldn't happen to me personally because I don't use these features for anything important
15:33 quakephil Is there a way to see how many lines of code (maybe as a % of total lines) a certain author has committed per repository branch?
15:33 j416 quakephil: I found a tool recently called "git fame", it's a ruby gem
15:34 j416 quakephil: bit buggy but worked fine
15:34 j416 quakephil: I think the gem name is git_fame
15:34 quakephil Interesting let me check it out
15:34 shgysk8zer0 joined #git
15:36 quakephil Hmm, only finds a single author and either shows 100% or NaN
15:36 j416 I think it's hard-wired to look at branch master
15:36 * quakephil facepalm
15:36 ocbtec joined #git
15:37 cdown joined #git
15:37 quakephil Ah, it accepts --branch
15:37 j416 huh.
15:37 quakephil And .gitauthors I hope...
15:37 darkblue_b dont wear out your face so quickly quakephil - you might need it later
15:38 j416 what's .gitauthors
15:38 quakephil Err, i mean .mailmap
15:38 j416 quakephil: do you mean .mailmap ?
15:38 j416 yeh
15:39 ahmedelgabri joined #git
15:39 dreiss joined #git
15:39 quakephil And you can use --after to exclude the initial commit, which skewes the data
15:39 kashyap left #git
15:40 darkblue_b its a security feature, so I can snoop people who are busy doing real work
15:40 ToBeCloud joined #git
15:41 neurocroc joined #git
15:41 romerocesar joined #git
15:41 j416 quakephil: how does initial commit skew the data?
15:42 jast someone mass-imported existing source into a fresh repo, I guess
15:42 j416 yeh I suppose
15:42 quakephil Yeah, there was a template import
15:43 vuoto joined #git
15:44 watabou joined #git
15:45 piling joined #git
15:45 rminol joined #git
15:46 acetakwas joined #git
15:47 rminol left #git
15:47 synthroid joined #git
15:48 imjacobclark joined #git
15:48 lindenle joined #git
15:49 ejb joined #git
15:50 dopesong joined #git
15:51 keltvek joined #git
15:52 playfullyExist joined #git
15:54 mwhooker joined #git
15:57 playfullyExist joined #git
15:57 fornax joined #git
15:59 xaviergmail joined #git
16:00 gravitron joined #git
16:01 ochorocho__ joined #git
16:02 jungsubk joined #git
16:02 PCatinean joined #git
16:03 clemf joined #git
16:03 diegoaguilar joined #git
16:04 cdown joined #git
16:05 skirk joined #git
16:07 madewokherd joined #git
16:09 clemf joined #git
16:09 ochorocho__ joined #git
16:11 subhojit777 joined #git
16:11 shaggycat joined #git
16:12 kpease joined #git
16:12 chachasmooth joined #git
16:12 DieguezZ joined #git
16:13 cdown joined #git
16:14 watabou joined #git
16:17 playfullyExist joined #git
16:18 tomog999_ joined #git
16:18 refried_ joined #git
16:19 a_thakur joined #git
16:19 playfullyExist joined #git
16:19 EduardoMartins1 joined #git
16:20 xorox90 joined #git
16:21 LionsMane joined #git
16:22 rominronin joined #git
16:22 stonerfish joined #git
16:22 psav joined #git
16:22 psav left #git
16:23 cbx33 joined #git
16:23 cbx33 Hey all long time no see
16:23 cbx33 what would cause git cherry to show a commit as a + when I see the same changeset in both branches
16:23 durham joined #git
16:24 PCatinean joined #git
16:24 dsdeiz_ joined #git
16:25 cbx33 oh hey j416 ! been a while
16:25 gsingh joined #git
16:26 M-sbts left #git
16:29 settermjd joined #git
16:30 timmu_ joined #git
16:30 algun joined #git
16:31 piling_ joined #git
16:32 xorox90 joined #git
16:33 j416 cbx33: whoa, indeed.
16:33 romerocesar joined #git
16:33 watabou joined #git
16:34 j416 cbx33: you know, just the other day oddly enough I was thinking to myself that I should get to read the rest of the book, I'm eager to read the rest of the story :D
16:34 EvilPenguin joined #git
16:34 j416 but, work and priorities and whatnot usual stuff.
16:35 linx joined #git
16:36 diego1 joined #git
16:36 kadoban joined #git
16:36 ImJune joined #git
16:37 Sleepy63 joined #git
16:38 nnyk joined #git
16:38 nnyk joined #git
16:39 givello joined #git
16:40 givello Hey, I'm trying to find a way to checkout an old revision of a directory into a new directory, is it possible?
16:41 NeverDie_ joined #git
16:41 djb-irc joined #git
16:42 osse givello: it's doable in one swoop with some magicks:  git archive oldrev oldpath | tar -xf - -C newpath
16:43 givello osse: oh, that's smart
16:43 givello osse: I assume "oldrev" is a treeish thingy?
16:43 osse givello: i mean whatever you meant by "an old revision"
16:44 givello osse: sure, alright
16:44 osse :P
16:44 givello osse: thanks, will try that.
16:45 osse givello: commit/tag/branch will work. I guess you can give the tree hash of the directory in question directly and spare specifying oldpath. But just finding that tree hash can be a hassle comparatively
16:46 maestrojed joined #git
16:49 tgunr joined #git
16:49 givello osse: worked like a charm, thanks a ton
16:49 osse metric or imperial?
16:49 cdown joined #git
16:50 givello Well, metric of course
16:50 givello nobody uses imperial, now do they
16:50 givello Thanks a tonne
16:51 givello haha
16:51 hahuang61 joined #git
16:52 Balliad joined #git
16:54 davisonio joined #git
16:56 cbx33 j416, hehehe
16:56 xall joined #git
16:56 cbx33 j416, I should probably upgrade it now :)
16:57 cbx33 j416, plus I jsut started using some new command today :)
16:57 j416 has it become too outdated?
16:57 j416 new command huh
16:57 j416 fancy
16:57 prydeep joined #git
16:58 nnyk joined #git
16:58 linx joined #git
16:58 mwhooker joined #git
16:59 italoacasas joined #git
17:00 cbx33 heheh
17:00 cbx33 j416, you may be bale to help me out
17:00 cbx33 :)
17:00 cbx33 so imagine this scenario
17:00 cbx33 I have a commit
17:00 durham_ joined #git
17:01 JZA left #git
17:01 cbx33 and it's on a branch - I cherry pick this commit to a second branch, except one of the lines in the diff(not a line that actually changed) has been modify in the first branch, but not yet in the second
17:01 cbx33 so when I use the git cherry brancha branchb it tells me that there is no equivalent commit
17:01 cbx33 because the diffs do not match
17:01 mwhooker joined #git
17:02 geoid joined #git
17:02 cbx33 can I fix this at all?
17:02 cbx33 because now, even if I apply the commit which changed that other line, the diffs still won't match
17:03 j416 git-cherry uses patch-id to determine if two commits have the same change
17:03 j416 "A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored" (from man git-patch-id)
17:03 gitinfo the git-patch-id manpage is available at http://jk.gs/git-patch-id.html
17:03 j416 so, I would assume the answer is no
17:03 j416 but, I rarely use git-cherry.
17:04 j416 cbx33: you can test it by running git-patch-id on a diff
17:05 reim joined #git
17:06 cbx33 j416, ahhh ok
17:06 cdg joined #git
17:06 cbx33 it's a PITA
17:06 nick123 joined #git
17:07 flavius joined #git
17:07 m0viefreak joined #git
17:07 sauvin joined #git
17:07 mepholic joined #git
17:07 kpease_ joined #git
17:08 EduardoMartins1 joined #git
17:08 mepholic hey guys
17:08 gitinfo mepholic: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
17:08 vuoto joined #git
17:09 mepholic I'm having issues with git lfs on Mac OS X El Capitan
17:09 mepholic it's throwing some errors when trying to push tags
17:09 mepholic http://paste.ee/p/k7rod#l1JOPrMdBRZ4CRiAVwiCwg40T2uTHNDm
17:09 mepholic anyone have any ideas as to what could be going wrong?
17:10 refried_ joined #git
17:10 durham joined #git
17:10 elastix joined #git
17:11 fornax joined #git
17:11 vuoto joined #git
17:11 a_thakur joined #git
17:12 vuoto joined #git
17:12 djb-irc joined #git
17:12 vuoto joined #git
17:12 thiago joined #git
17:13 vuoto joined #git
17:14 AaronMT_ joined #git
17:16 fracting joined #git
17:18 LeBlaaanc joined #git
17:18 romerocesar joined #git
17:21 liuzhen joined #git
17:22 ejb joined #git
17:22 NeverDie joined #git
17:23 rominronin joined #git
17:24 EvilPenguin joined #git
17:25 thiago joined #git
17:26 nnyk_ joined #git
17:27 geoid joined #git
17:29 kpease joined #git
17:30 Spacew00t joined #git
17:30 NeverDie joined #git
17:32 watabou joined #git
17:33 reim joined #git
17:34 xorox90 joined #git
17:34 dreiss joined #git
17:36 BrianBlaze420 joined #git
17:36 reim joined #git
17:37 mepholic this is the command I'm running that's causing this error: git --bare push --tags
17:38 runlevl4 joined #git
17:38 mmlb joined #git
17:38 ki0 joined #git
17:38 rnsanchez joined #git
17:38 ac3takwas joined #git
17:39 w00tner joined #git
17:41 BlaXpirit what is this nonsense.  #github ?
17:42 jstein_ joined #git
17:42 rainbyte joined #git
17:42 mepholic I asked in there as well
17:42 mepholic I figured that there's probably also some intelligent people in this channel that might be able to help me
17:42 mepholic for whatever that is worth
17:43 mepholic please correct me if I'm wrong
17:43 clemf joined #git
17:44 Dyonisos joined #git
17:45 acetakwas joined #git
17:46 clemf joined #git
17:47 Gamecubic joined #git
17:47 docnvk joined #git
17:49 Sasazuka joined #git
17:51 italoacasas joined #git
17:53 hahuang61 joined #git
17:54 blackwind_123 joined #git
17:55 mepholic I'm going to spin up a centos 7 vm and see if it works on there
17:56 linx joined #git
17:57 jh3 joined #git
17:59 romerocesar joined #git
18:01 clemf joined #git
18:01 DrSlony joined #git
18:01 italoacasas joined #git
18:02 TooLmaN joined #git
18:02 DrSlony Hello, I'm in a folder where I ran "git init" and made a few commits, now I would like to squash them into one. "git rebase -i" refuses to run because "There is no tracking information for the current branch." How do I fix that?
18:03 italoacasas joined #git
18:03 jhass DrSlony: git rebase -i --root
18:03 Tryop88 joined #git
18:04 cbreak DrSlony: or: git reset --soft firstcommit
18:04 cbreak then git commit --amend
18:05 DrSlony thanks :)
18:06 kasper93 joined #git
18:07 DrSlony Another question: I just found out that git is available on a server I control. How do I go about making a git repo on that server so that I can pull the changes from this laptop, the ones I just squashed?
18:09 playfullyExist joined #git
18:09 jhass it might be easier to just push them up to a bare repo on the server
18:10 jhass mkdir foo.git; cd foo.git; git init --bare  on the server, git remote add server server:foo.git; git push server master; on the laptop
18:10 Oebele joined #git
18:11 ejb joined #git
18:11 DrSlony this is new to me, trying it out
18:12 DrSlony jhass "server server:foo.git"
18:13 DrSlony is the first "server" any name i want to use, and the second one the actual ip?
18:13 jhass name address:path_on_server
18:13 jhass so the former
18:15 DrSlony thank you
18:16 DrSlony i access the server via ssh, "ssh bob@ip -p 3130", are there any special tricks needed to make this work?
18:16 DrSlony i suppose i need ot get some kind of git daemon running to lsiten for connections?
18:18 Sadeukko joined #git
18:19 dunpeal joined #git
18:20 nitin joined #git
18:21 dopesong joined #git
18:22 DrSlony omg works
18:22 elastix1 joined #git
18:23 rominronin joined #git
18:23 Codfection joined #git
18:23 DrSlony just had to "git remote add muffins ssh://bob@345.678.123.456:1234/var/www/banana.git"
18:24 DrSlony thank you jhass!
18:24 axiom_1 joined #git
18:24 osse ♫ ♪ girrrrl you thought it was a man but it was a muffin! ♪
18:24 jason237 joined #git
18:24 k3rn31 joined #git
18:25 uhmgswa^2 joined #git
18:25 DrSlony hmm
18:25 DrSlony pushing worked, the data clearly went
18:26 DrSlony but
18:26 DrSlony where did it go to?
18:26 jhass you should make a local clone of the bare repo on your server
18:26 jhass and then pull from it as you push new things
18:26 jhass that is from the bare repo in the local repo
18:27 mostlybadfly joined #git
18:27 DrSlony jhass oho
18:27 liuzhen joined #git
18:29 xorox90 joined #git
18:29 DrSlony works, yay! :)
18:32 APic B-)
18:33 dunpeal How do I refer to the default upstream in something like git log?
18:33 dunpeal I'd like to see all commits in a local branch that are not yet on the remote.
18:34 j416 dunpeal: configured upstream is @{upstream} or @{u} for short
18:34 j416 dunpeal: so git log @{u}..
18:35 dunpeal j416: thanks.
18:35 j416 dunpeal: welcome
18:35 FroMaster joined #git
18:36 watabou joined #git
18:37 k3rn31 joined #git
18:38 nwkj86 joined #git
18:38 digitalpeer joined #git
18:42 ynanm joined #git
18:42 maestrojed starting a few weeks ago about 50% of the time I run "git difftool" I am told the files are identical when I know they are not. I immediately run the command again and it works.
18:42 fornax joined #git
18:42 romerocesar joined #git
18:45 italoacasas joined #git
18:45 j416 maestrojed: what tool is it?
18:45 pipegeek joined #git
18:45 j416 maestrojed: git diff != git difftool; difftool is external
18:46 italoacasas joined #git
18:46 reim joined #git
18:48 italoacasas joined #git
18:49 anddam joined #git
18:49 anddam hello
18:50 reim joined #git
18:50 anddam I cloned a project, then created a fork of it on github and now I want to push on my own fork from my local clone. Should I add another remote, edit origin or clone again from my own repo'
18:50 anddam s/'/?
18:51 DrSlony thanks again jhass
18:52 zjaffee joined #git
18:52 uhmgswa^2 left #git
18:53 CJKinni joined #git
18:53 uhmgawa joined #git
18:54 JanC_ joined #git
18:54 hahuang61 joined #git
18:54 DrSlony left #git
18:56 GodGinrai anddam: shouldn't you just make changes up-stream and have downstream pull them?
18:58 darkblue_b left #git
18:59 axiom_1 joined #git
18:59 jimi_ joined #git
18:59 shinnya joined #git
18:59 fahadash joined #git
19:00 n00bdev joined #git
19:01 blackpajamas joined #git
19:01 xall joined #git
19:02 settermjd joined #git
19:02 dsdeiz joined #git
19:03 Motoko joined #git
19:04 NeverDie joined #git
19:06 pandeiro joined #git
19:07 j416 anddam: doesn't matter. Whichever way feels more convenient.
19:08 reim joined #git
19:10 aard_ joined #git
19:11 vuoto joined #git
19:11 vuoto joined #git
19:12 vuoto joined #git
19:14 xaviergmail joined #git
19:15 reim joined #git
19:18 zmanfx joined #git
19:21 maestrojed j416  I use bbdiff (part of bbedit). I have double checked my gitconfig, the path to the tool, etc. All looks right, and it does work when I rerun the command immedately.
19:22 reim joined #git
19:22 maestrojed I understand diff vs difftool. I can't say wether I'd get the same results with just a "git diff". I am in a habit of most often using my difftool
19:23 rominronin joined #git
19:23 sonOfRa joined #git
19:24 NeverDie_ joined #git
19:25 scoobert1on joined #git
19:25 Arban joined #git
19:25 TomyLobo joined #git
19:26 fscala joined #git
19:27 synthroid joined #git
19:29 nwkj86 joined #git
19:30 xaa joined #git
19:31 reim joined #git
19:36 Somelauw joined #git
19:37 digidog joined #git
19:37 Somelauw I'm told my branch and origin/master have diverged, even though it's a private repository. I'm told I should git pull? Is there a way to preview git pull?
19:37 davidosomething fetch first
19:37 i7c git fetch
19:38 davidosomething then diff against the remote/branch
19:38 sq-one joined #git
19:38 Somelauw I may have amended to commits after pushing, but it's a private repo.
19:38 reim joined #git
19:38 ojacobson that'd do it
19:38 Somelauw davidosomething: that shows all my commits, but all my commits are newer
19:38 watabou joined #git
19:39 romerocesar joined #git
19:40 Somelauw i think i'll just force-push
19:40 davidosomething you can find the point of divergence using the log graph and compare diff of the first commit after that if you're wary
19:43 Somelauw davidosomething: ah, I found the difference. i just want to keep mine
19:44 Somelauw is that what force push does
19:44 reim joined #git
19:44 ensyde__ joined #git
19:46 efdetonator joined #git
19:46 Cata|Work joined #git
19:49 ojacobson git push copies branch tips around, carrying their ancestors around in the process
19:49 ojacobson git push --force pays no attention to any existing branch on the target repo
19:50 playfullyExist joined #git
19:51 Jordan_U joined #git
19:51 reim joined #git
19:52 Jordan_U How can I get something like "git log -p" but with word by word diff instead of line by line?
19:53 Cata|Work joined #git
19:54 vuoto joined #git
19:55 hahuang61 joined #git
19:55 nilg` joined #git
19:56 grawity git log -p --word-diff
19:57 ajf- joined #git
19:57 duderonomy joined #git
19:57 BombStrike joined #git
19:59 LeBlaaanc joined #git
19:59 Darcidride joined #git
20:05 mwhooker joined #git
20:05 sentriz joined #git
20:07 vuoto joined #git
20:08 davisonio joined #git
20:08 vuoto joined #git
20:08 vuoto joined #git
20:10 clemf joined #git
20:10 sangy joined #git
20:13 diegoaguilar joined #git
20:13 pampeho joined #git
20:14 xaa joined #git
20:14 pampeho_ joined #git
20:15 kpease joined #git
20:15 johnflux joined #git
20:17 ki0 joined #git
20:20 barteks2x joined #git
20:20 maucar joined #git
20:20 nnyk_ joined #git
20:20 Jordan_U grawity: So simple. Thank you.
20:22 mitzip joined #git
20:22 ngladitz joined #git
20:22 ngladitz joined #git
20:24 rominronin joined #git
20:27 cite joined #git
20:27 bremner joined #git
20:27 BooK joined #git
20:27 mika joined #git
20:27 mika joined #git
20:27 dsop joined #git
20:27 tcurdt joined #git
20:27 DANtheBEASTman joined #git
20:27 Kartagis joined #git
20:27 Riviera joined #git
20:27 u1106 joined #git
20:27 inodb joined #git
20:27 ulkesh joined #git
20:27 aca20031 joined #git
20:27 ReenignE joined #git
20:27 ReenignE joined #git
20:27 davidstrauss joined #git
20:27 ikmaak joined #git
20:27 fkm joined #git
20:27 Afforess joined #git
20:27 voidfire joined #git
20:27 tanuki joined #git
20:27 nuck joined #git
20:27 ariver joined #git
20:27 dwmw2_go` joined #git
20:27 boshhead joined #git
20:27 `mx joined #git
20:27 SegFaultAX joined #git
20:27 cebor joined #git
20:27 martinklepsch joined #git
20:27 bket joined #git
20:27 harv joined #git
20:27 same_ol_geez joined #git
20:27 yang joined #git
20:27 _W_ joined #git
20:27 marienz joined #git
20:27 nedbat joined #git
20:27 bremner joined #git
20:27 Olipro joined #git
20:27 hahuang65 joined #git
20:27 the_cybersphinx joined #git
20:27 stfn joined #git
20:27 Neo joined #git
20:27 aspellip_ joined #git
20:27 ygeLN joined #git
20:27 skalpin joined #git
20:27 Darcidride joined #git
20:27 KnightsOfNi joined #git
20:27 flavius joined #git
20:27 sharpy joined #git
20:27 Jeroen joined #git
20:27 jor joined #git
20:27 Grum joined #git
20:27 themill joined #git
20:27 j416 joined #git
20:27 Sadeukko joined #git
20:27 raijin joined #git
20:27 trobotham joined #git
20:28 clemf joined #git
20:28 cschneid joined #git
20:28 foul_owl joined #git
20:28 KevinMGranger joined #git
20:28 sparetire joined #git
20:28 moei joined #git
20:28 sPiN joined #git
20:28 RedShift joined #git
20:28 GingerGeek joined #git
20:28 GingerGeek joined #git
20:28 grawity joined #git
20:28 superrorc joined #git
20:28 batrick joined #git
20:28 DTekk_ joined #git
20:28 AaronMT joined #git
20:28 daurnimator joined #git
20:28 dx joined #git
20:28 weylin joined #git
20:28 DolphinDream joined #git
20:28 trelane joined #git
20:28 enleeten_ joined #git
20:28 trelane joined #git
20:28 DistantStar joined #git
20:28 Linkandzelda joined #git
20:28 Linkandzelda joined #git
20:28 Eryn_1983_FL joined #git
20:28 Ragnor joined #git
20:28 Caelum joined #git
20:28 alip joined #git
20:28 DrDaemonEye joined #git
20:28 spaceone joined #git
20:28 doebi joined #git
20:28 Kulrak joined #git
20:28 Kulrak joined #git
20:28 orcus joined #git
20:28 maxorator joined #git
20:28 nyuszika7h joined #git
20:28 dsantiago joined #git
20:28 Shentino joined #git
20:28 kontoo joined #git
20:28 kontoo joined #git
20:28 mwleeds joined #git
20:28 pkiller joined #git
20:28 lohfu joined #git
20:28 digitalpeer joined #git
20:28 bastelfreak joined #git
20:28 GGMethos joined #git
20:29 vigilvindex joined #git
20:29 scalability-junk joined #git
20:29 asdofindia joined #git
20:29 tgy joined #git
20:29 FritzLakritz joined #git
20:29 WebDawg joined #git
20:29 bttf joined #git
20:29 danemacmillan joined #git
20:29 yanome joined #git
20:29 blackpajamas joined #git
20:29 lamont joined #git
20:29 angseus joined #git
20:29 clemf joined #git
20:29 metastableB joined #git
20:29 Fiouz joined #git
20:29 WillMoogle joined #git
20:29 ec joined #git
20:29 yuhlw_ joined #git
20:29 DirtyCajun joined #git
20:29 ixian joined #git
20:29 Bowel joined #git
20:30 mmmveggies joined #git
20:30 Liam` joined #git
20:30 musl joined #git
20:30 etcinit joined #git
20:30 _flow_ joined #git
20:30 angelsl joined #git
20:30 MikeChernev joined #git
20:30 osse joined #git
20:30 mostlybadfly joined #git
20:30 Balliad joined #git
20:31 kenansulayman joined #git
20:31 sebhoss joined #git
20:31 wizonesolutions joined #git
20:31 DuncanT joined #git
20:31 sylario joined #git
20:31 bouncy joined #git
20:31 cyphase joined #git
20:31 leonarth joined #git
20:32 psacrifice joined #git
20:32 {AS} joined #git
20:33 linx joined #git
20:34 Tee_Pee joined #git
20:34 alexsystemf__ joined #git
20:34 ionelmc joined #git
20:34 tazle_ joined #git
20:35 fujinuma left #git
20:35 dhanush joined #git
20:35 ToeSnacks joined #git
20:35 ToBeCloud joined #git
20:35 braderhart joined #git
20:35 introsp3ctive left #git
20:35 davisonio joined #git
20:36 cmosguy joined #git
20:36 McKraken_zzzzz joined #git
20:36 EvilPenguin joined #git
20:36 chandlerbing joined #git
20:37 sadmac joined #git
20:37 jaeckel joined #git
20:37 Awesomecase joined #git
20:37 epic joined #git
20:37 aendrew joined #git
20:37 ItSANgo joined #git
20:38 angiebadillo joined #git
20:38 ejb joined #git
20:38 ggherdov joined #git
20:38 kwmiebach joined #git
20:39 rfv joined #git
20:39 theresajayne joined #git
20:39 imanc joined #git
20:39 zumba_a__ joined #git
20:39 pizzaops joined #git
20:39 watabou joined #git
20:39 romerocesar joined #git
20:40 NyB left #git
20:40 linx joined #git
20:40 imdsm_ joined #git
20:41 radsy joined #git
20:41 zeroed joined #git
20:41 xall joined #git
20:41 JohnLea____ joined #git
20:41 paperziggurat joined #git
20:42 unreal joined #git
20:44 kutenai joined #git
20:44 linx joined #git
20:45 torbjorn joined #git
20:46 [diecast] joined #git
20:47 HerrK joined #git
20:47 cloudcell__ joined #git
20:47 hecliunyx joined #git
20:49 clemf joined #git
20:50 ggherdov joined #git
20:51 ki0_ joined #git
20:55 d0nn1e joined #git
20:55 hahuang61 joined #git
20:56 rubyonrailed joined #git
20:57 fusionx86 joined #git
20:57 cdown_ joined #git
20:57 jh3 joined #git
21:00 mwhooker joined #git
21:00 EvilPenguin joined #git
21:03 SmashingX joined #git
21:03 douglascorrea joined #git
21:04 SmashingX hi guys, I have two branches master and testing, I just realized that I messed up something on master and I would like testing to be the new master
21:04 SmashingX I don't want to merge anything from master to testing
21:04 refried_ joined #git
21:05 BlaXpirit SmashingX,  git branch -d master; git checkout testing; git branch master
21:05 BlaXpirit hopefully i got the nomenclature right.  so this deletes a branch and makes a new one based on 'testing'
21:06 SmashingX yeah the problem is that when I want to push up to master it says that I have to pull first
21:06 SmashingX and when I pull I get the same as before
21:06 liuzhen joined #git
21:07 BlaXpirit SmashingX, well you probably have to get rid of master on the remote as well
21:08 nick123 joined #git
21:09 GodGinrai SmashingX: push --force
21:09 emPi joined #git
21:10 clemf joined #git
21:11 newbsie joined #git
21:11 SmashingX I just had to remove the local and the remote
21:11 SmashingX and then create master based on testing branch
21:11 SmashingX voila
21:11 SmashingX thanks
21:12 newbsie When using .gitignore files, is the ignored files still suppose to show up in unstaged changes in git status?
21:12 j416 newbsie: if it is already tracked, yes.
21:13 DolpheenDream joined #git
21:14 newbsie j416: So is it safe to assume that if isn't tracked, it will not show up?
21:14 cdown___ joined #git
21:14 newbsie j416: How do I get it to refresh the tracked filed list then to reflect .gitignore?
21:14 nonconvergent joined #git
21:14 nonconvergent Hi.
21:14 nonconvergent Umm...git apply is nondestructive of the stash, right?
21:15 _ngz_ngzz joined #git
21:16 nonconvergent can I list what changes would be done by an git apply?
21:17 mwhooker joined #git
21:17 nonconvergent nm, I'm good, I forgot the stash part
21:18 ajf- joined #git
21:19 fornax joined #git
21:19 cdown joined #git
21:19 j416 newbsie: remove the file to make it not tracked.
21:20 j416 newbsie: git rm --cached -- file && git commit
21:20 j416 newbsie: if it is ignored and not tracked, git status will not show it, this is correct.
21:20 newbsie j416: thanks!
21:21 ajf- joined #git
21:22 King_Hual` joined #git
21:25 dmto joined #git
21:25 rominronin joined #git
21:27 ajf- joined #git
21:27 DieguezZ joined #git
21:29 aidalgol joined #git
21:31 madewokherd joined #git
21:33 fuchstronaut joined #git
21:35 aznman joined #git
21:35 mellernoia joined #git
21:36 aznman Can you fork a github repo over to a private repo, or is that GitHUb specific?
21:36 zumba_ad_ joined #git
21:36 spudowiar aznman: GitHub specific
21:36 spudowiar aznman: #github
21:36 thiago joined #git
21:37 aznman left #git
21:37 eijk joined #git
21:37 clemf joined #git
21:37 ramsub07 joined #git
21:37 mwhooker joined #git
21:38 ramsub07 Hello, i've a commit hash and i want to rollback to that commit. How do i do? Also, i want to come back to the current tip of the branch
21:38 xaa joined #git
21:38 tobiasvl ramsub07: !revert
21:38 gitinfo ramsub07: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
21:38 romerocesar joined #git
21:38 tobiasvl ramsub07: what do you mean by "rollback" and that you want to come back to current tip? do you just want to checkout an earlier commit, look at it, and then checkout the tip again=
21:38 tobiasvl ?
21:39 tobiasvl don't really understand your scenario
21:39 ramsub07 tobiasvl: yeah
21:39 tobiasvl ok, man git checkout then, simply
21:39 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
21:39 ramsub07 i want to be in a scenario as it was in commit with hash abcd and come back to the tip
21:39 ajf- joined #git
21:39 ejb joined #git
21:40 tobiasvl "git checkout abcd", look at it, then "git checkout -" is a shorthand for checking out the previous commit/branch again
21:40 LaptopBrain joined #git
21:41 watabou joined #git
21:42 aax joined #git
21:42 Dougie187 left #git
21:45 theskillwithin joined #git
21:48 netj joined #git
21:52 w00tner joined #git
21:53 xaa joined #git
21:54 joki joined #git
21:55 qsx _ikke_: in which part of the nether are you? did you see the thunderstorm?
21:55 qsx and jast: did you survive it? :>
21:56 jast nothing much happened
21:56 qsx we didn't _hear_ a thing here, but the view was quite impressive
21:56 hahuang61 joined #git
21:57 allcentury joined #git
21:57 SimonNa joined #git
21:58 inflames joined #git
21:59 ahr3n joined #git
22:00 cdown_ joined #git
22:01 robot joined #git
22:02 jeffreylevesque joined #git
22:03 javster joined #git
22:03 inflames joined #git
22:05 Somelauw left #git
22:07 rockstar____ joined #git
22:11 w00tner_ joined #git
22:12 rubyonrailed joined #git
22:14 chid joined #git
22:14 NaN joined #git
22:15 NaN hi there
22:16 NaN if I created a tmp-branch from feature-branch and fixed some bugs, how can I send it back all those changes to feature-branch?
22:16 w00tner_ joined #git
22:17 cyan__ joined #git
22:20 fornax joined #git
22:21 texinwien joined #git
22:21 st0opkid joined #git
22:23 tobiasvl NaN: git merge?
22:27 rominronin joined #git
22:27 d0nn1e joined #git
22:28 aax joined #git
22:28 lindenle joined #git
22:29 mablae joined #git
22:29 romerocesar joined #git
22:31 Moult joined #git
22:31 Moult Anyone know where I can ask questions about git annex?
22:33 ResidentBiscuit joined #git
22:35 mwhooker_ joined #git
22:38 lindenle joined #git
22:39 carell joined #git
22:40 EvanDotPro joined #git
22:42 MajorPayne joined #git
22:42 eggoez joined #git
22:42 Spanktar joined #git
22:43 Spanktar hello! If I’m using git-flow, what would I set upstream of develop to?
22:43 nonconvergent joined #git
22:43 Spanktar `    git branch --set-upstream-to=origin/<branch> develop`
22:43 Spanktar master?
22:43 watabou joined #git
22:44 acetakwas joined #git
22:44 clemf joined #git
22:45 BlaXpirit Spanktar, i don't see any kind of flow where this would make sense
22:45 BlaXpirit i've always kept local and remote branch names in sync
22:45 Spanktar https://github.com/nvie/gitflow
22:45 Spanktar is what I’m referring to
22:46 Spanktar so, origin/develop
22:46 DistantStar joined #git
22:46 acetakwas joined #git
22:48 acetakwas joined #git
22:49 marvi joined #git
22:50 eggoez joined #git
22:50 orbitphreak joined #git
22:50 xaa joined #git
22:54 DieguezZ joined #git
22:54 DistantStar joined #git
22:55 aax joined #git
22:56 user____ joined #git
22:57 hahuang61 joined #git
22:57 user____ left #git
22:59 johntramp joined #git
23:00 xaa__ joined #git
23:01 dunpeal joined #git
23:01 clemf joined #git
23:04 ZenWalker left #git
23:04 DolpheenDream joined #git
23:05 xall_ joined #git
23:05 rbern joined #git
23:09 eletuchy joined #git
23:09 nick123 joined #git
23:10 eletuchy_ joined #git
23:10 xall joined #git
23:10 liuzhen joined #git
23:11 inflames joined #git
23:12 eletuch__ joined #git
23:13 raijin joined #git
23:15 afuentes joined #git
23:16 eletuchy joined #git
23:17 NaN tobiasvl: you where right
23:18 Synthead joined #git
23:18 rubyonrailed joined #git
23:19 aznman joined #git
23:20 aznman I forked a project off github. I made a remote branch called "dev". How do I pull changes from a tag, completely replace a local branch with the tag, and push the branch to it's remote branch dev?
23:22 nonconvergent joined #git
23:22 xaa joined #git
23:23 aznman keeps saying i'm up to date with master.. i don't want to be current with that branch
23:23 aznman obviously, i don't know what I'm doing...
23:23 romerocesar joined #git
23:23 eletuchy_ joined #git
23:23 mablae_ joined #git
23:24 acetakwas joined #git
23:25 acetakwas joined #git
23:25 ShekharReddy joined #git
23:26 ffabi joined #git
23:26 eletuchy joined #git
23:27 osse aznman: the easiest is to delete the branch and reawd dfssa gkmsrfaadjfsgdff<ase
23:27 rominronin joined #git
23:30 eletuchy_ joined #git
23:30 netj joined #git
23:33 garethdaine joined #git
23:34 italoacasas joined #git
23:34 zumba_addict joined #git
23:37 rkazak joined #git
23:39 CEnnis91 joined #git
23:41 a3Dman_ joined #git
23:42 xaviergmail joined #git
23:43 ejb joined #git
23:43 watabou joined #git
23:44 fullstack joined #git
23:44 mehola joined #git
23:49 ikmaak joined #git
23:50 LeBlaaanc joined #git
23:52 xaa joined #git
23:53 arescorpio joined #git
23:53 aax joined #git
23:54 taylorm joined #git
23:56 mda1_ joined #git
23:57 douglascorrea joined #git
23:58 hahuang61 joined #git
23:59 ResidentBiscuit joined #git

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