Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-29

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

All times shown according to UTC.

Time Nick Message
00:00 netj joined #git
00:04 ecuanaso joined #git
00:07 Gsham joined #git
00:08 lindenle joined #git
00:13 Redfoxmoon left #git
00:17 howitdo joined #git
00:19 masuberu joined #git
00:21 umpc joined #git
00:21 ResidentBiscuit joined #git
00:27 Naan joined #git
00:28 kyan Can I not use a .gitconfig file in the root of my repository to set up the filters?
00:29 ozmage joined #git
00:30 phroa filters? like man gitignore filters?
00:30 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
00:32 osse kyan: not afaik. you can perhaps configure git to read repo/.gitconfig as a config file, but that itself has to go in .git/config for ~/.gitconfig
00:32 kyan phroa: No, filters https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#filters_a
00:32 kyan osse: Ah, I see. cool, thanks! :)
00:32 phroa mm, smudge filters
00:34 m0viefreak joined #git
00:34 lindenle joined #git
00:35 quviar joined #git
00:36 fahadash joined #git
00:37 msonntag joined #git
00:42 Oatmeal joined #git
00:42 rt joined #git
00:42 matoro joined #git
00:44 redhedded1 joined #git
00:47 ecuanaso joined #git
00:48 davimore joined #git
00:48 gugah joined #git
00:51 Darren_ joined #git
00:54 jim left #git
00:58 bill99 joined #git
01:05 a_thakur joined #git
01:08 stickperson joined #git
01:16 BackEndCoder joined #git
01:17 Ryanar joined #git
01:17 justanotheruser joined #git
01:19 SwiftMatt joined #git
01:19 dreaddymck joined #git
01:21 ozmage joined #git
01:29 MattMaker joined #git
01:33 BSaboia joined #git
01:36 a_thakur joined #git
01:38 Atemu joined #git
01:42 justan0theruser joined #git
01:43 snowkidind joined #git
01:44 fuzzybear joined #git
01:48 Nilesh_ joined #git
01:55 ToBeCloud joined #git
01:59 z1haze joined #git
01:59 tmcmahon joined #git
01:59 z1haze how do you commit/push and create a tag at the same time?
01:59 kadoban commiting and pushing are separate things, as is creating a tag ... little of that question appears to make sense.
02:00 rewt git commit ; git tag ... ; git push --tags @
02:01 z1haze haha well im sorry about that
02:02 z1haze i thought the tagging and committing were together
02:05 stickperson joined #git
02:07 thiago that doesn't need to be atomic because it's done on the local repository
02:10 jimi_ joined #git
02:10 jimi_ joined #git
02:13 RicardoFuhrman joined #git
02:16 Tsutsukakushi joined #git
02:18 pks joined #git
02:22 RicardoFuhrman left #git
02:24 ozmage joined #git
02:26 xlegoman joined #git
02:26 Anything_HiTech joined #git
02:26 Anything_HiTech left #git
02:27 gugah joined #git
02:34 finalbeta joined #git
02:34 pur3eval joined #git
02:39 dirtyroshi joined #git
02:42 tristanp joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and alternative commits | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:53 d^sh joined #git
02:53 Aleric joined #git
02:56 Cabanossi joined #git
02:56 Aleric I'm having a problem with git; when I try to push it says "The following submodule paths contain changes that can not be found on any remote", but I doubt that is true (this has to be a bug in git).
02:57 Aleric Can someone help me to find out how to recover from this?
02:57 Aleric Or even better, find out what is causing it.
02:57 ozmage joined #git
02:59 Aleric http://codepad.org/wAGnlhBO
02:59 Aleric submodule cwm4 is up-to-date and pushed - nothing wrong with it.
03:00 Aleric I'm pretty sure it is caused by a 'git commit --amend' in the submodule... but now that I'm in this state, nothing allows me to recover from this :/
03:01 mizu_no_oto joined #git
03:01 matoro joined #git
03:02 BSAlb joined #git
03:05 thib joined #git
03:06 stickperson joined #git
03:08 raijin joined #git
03:09 msonntag joined #git
03:11 dtype joined #git
03:12 Eryn_1983_FL joined #git
03:13 dtype migrating an svn repo to git. Is it typical for svnroot/project1/ to migrate as the root of a git project, where a pull would put you directly in the root of the project, or is it more typical to recreate a project1 directory off the root of a new git repo?
03:13 shinnya joined #git
03:13 ozmage joined #git
03:13 thib joined #git
03:14 redhedded1 joined #git
03:15 snowkidi_ joined #git
03:15 fahadash joined #git
03:15 nedbat dtype: what else would be in the git repo other than project1?
03:15 thiago the former
03:16 dtype nedbat: probably nothing. I'm thinking that each project should become its own git repo. Just that with sv, you're always working one project directory deep.
03:17 nedbat dtype: don't make a project1 directory.
03:18 Vortex34 joined #git
03:18 dtype nedbat: and a subversion repo with a few projects would most likely be normally migrated as multiple git repos, each rooted in what was formerly their subversion root?
03:18 dtype I see what *can* be done. Mostly asking what seems to be normal convention.
03:18 nedbat dtype: they would each be their own git repo, yes.
03:18 fstd_ joined #git
03:18 dtype nedbat: thanks. That meshes with what seems to make sense.
03:22 samtheknife joined #git
03:22 jstimm joined #git
03:25 chachasmooth joined #git
03:27 aidalgol joined #git
03:27 snowkidi_ joined #git
03:28 guampa joined #git
03:31 ertes joined #git
03:35 netj joined #git
03:36 samtheknife joined #git
03:38 Derperperd joined #git
03:45 mrnuke left #git
03:45 pks joined #git
03:45 arescorpio joined #git
03:46 chachasmooth joined #git
03:56 Cabanossi joined #git
03:57 jost_ joined #git
04:01 canuk joined #git
04:01 hexagoxel joined #git
04:01 sunri5e joined #git
04:01 chachasmooth joined #git
04:03 jbitdrop_ joined #git
04:04 ShapeShifter499 joined #git
04:08 MarioBranco joined #git
04:08 Cabanossi joined #git
04:12 chipotle joined #git
04:18 mizu_no_oto joined #git
04:19 ozmage joined #git
04:20 chachasmooth joined #git
04:23 robattila256 joined #git
04:23 bobdobbs joined #git
04:24 bobdobbs I switched from master to an existing branch. I made some changes in the branch. I broke something. How do I make the current branch the same as master?
04:29 rewt bobdobbs, checkout master, then delete and recreate the bad branch
04:29 chachasmooth joined #git
04:29 rewt that will ofc lose all changes committed to that branch that weren't merged anywhere
04:31 bobdobbs thanks
04:32 chipotle joined #git
04:35 chachasmooth joined #git
04:36 kadoban reset --hard can also be used to simply change what a branch points to, directly.
04:37 rewt true
04:42 stickperson joined #git
04:48 msonntag joined #git
04:51 ozmage joined #git
04:59 chachasmooth joined #git
05:01 dermoth joined #git
05:02 tristanp joined #git
05:05 raijin joined #git
05:05 seni joined #git
05:09 Cabanossi joined #git
05:15 chipotle joined #git
05:17 robattila256 joined #git
05:18 weyanus joined #git
05:24 ColdKeyboard joined #git
05:29 z3t0 joined #git
05:38 Cabanossi joined #git
05:41 pur3eval joined #git
05:41 surfr1 joined #git
05:43 a_thakur joined #git
05:50 nyo joined #git
05:50 stickperson joined #git
05:53 regedit joined #git
06:00 mizu_no_oto joined #git
06:10 seni joined #git
06:13 pur3eval joined #git
06:16 dtype is the ".git" name present in most repos just a convention, or is there some technical significance to it?
06:17 meloc joined #git
06:17 raijin joined #git
06:18 Peng I *think* it's just a social convention. https://git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server implies as much.
06:19 dtype Peng: thanks, just want to make sure I'm not missing something
06:19 Boniche joined #git
06:20 ankit01ojha joined #git
06:22 seni joined #git
06:26 leak1t joined #git
06:35 ayogi joined #git
06:36 metachr0n joined #git
06:37 mohabaks joined #git
06:38 heftig dtype: you can leave it off most of the time
06:39 heftig gitlab is picky about it being there for access via https
06:47 blackwind_123 joined #git
06:47 govg joined #git
06:54 _ng joined #git
06:54 xall joined #git
06:54 a_thakur joined #git
06:55 zefferno joined #git
07:04 ayogi joined #git
07:05 dreiss joined #git
07:07 JJMcPhearson joined #git
07:09 Cabanossi joined #git
07:09 a_thakur joined #git
07:10 lindenle joined #git
07:11 [0xAA] joined #git
07:11 dtype heftig: thanks
07:16 Murii joined #git
07:18 matoro joined #git
07:24 a_thakur joined #git
07:27 thiago joined #git
07:28 msonntag joined #git
07:33 Derperperd joined #git
07:34 Lauven joined #git
07:37 SwiftMatt joined #git
07:40 pks joined #git
07:49 freimatz joined #git
07:51 z3t0 joined #git
07:56 raijin joined #git
07:58 MineCoins joined #git
07:59 vuoto joined #git
08:00 blahdodo joined #git
08:04 pks joined #git
08:05 bill99 joined #git
08:08 Cabanossi joined #git
08:16 pks joined #git
08:17 bruce_lee joined #git
08:17 bruce_lee joined #git
08:18 nckpz joined #git
08:21 stickperson joined #git
08:23 nostrora joined #git
08:25 BackEndCoder joined #git
08:28 amrx joined #git
08:31 PtxDK joined #git
08:34 m4sk1n joined #git
08:38 Cabanossi joined #git
08:40 jagob joined #git
08:44 [0xAA] joined #git
08:46 msonntag joined #git
08:48 sea-gull joined #git
08:52 z3t0 joined #git
08:54 jozwior joined #git
08:55 dersand joined #git
08:58 overlord_tm joined #git
09:01 _main_ joined #git
09:02 _main_ joined #git
09:02 robotroll joined #git
09:02 rivarun joined #git
09:04 Ragnor joined #git
09:04 xall joined #git
09:09 chachasmooth joined #git
09:09 Ragnor joined #git
09:16 __main__ joined #git
09:19 t0by joined #git
09:19 t0by joined #git
09:19 a_thakur joined #git
09:22 ResidentBiscuit joined #git
09:23 YuGiOhJCJ joined #git
09:24 evil-t0by joined #git
09:24 evil-t0by joined #git
09:28 dsdeiz joined #git
09:28 dsdeiz joined #git
09:34 bernardio joined #git
09:40 SteffanW joined #git
09:44 tirej_ joined #git
09:49 brent__ joined #git
09:49 Vgr_ joined #git
09:49 Vgr_ joined #git
09:49 Vgr_ joined #git
09:49 Vgr_ joined #git
09:51 afuentes joined #git
09:52 Lauven joined #git
09:54 z3t0 joined #git
09:59 zeroed joined #git
10:06 Ragnor joined #git
10:06 mkoskar joined #git
10:06 mablae joined #git
10:06 pur3eval joined #git
10:09 g5pw joined #git
10:10 rivarun joined #git
10:14 z3t0 joined #git
10:16 King_Hual joined #git
10:19 Arban joined #git
10:21 WayToDoor joined #git
10:22 catsup joined #git
10:23 catsup joined #git
10:24 tirej_ joined #git
10:30 mikecmpbll joined #git
10:31 spriz joined #git
10:33 jnavila joined #git
10:35 rivarun joined #git
10:38 satifant joined #git
10:40 masuberu joined #git
10:41 Log1x_ joined #git
10:44 g5pw joined #git
10:45 manuelschneid3r joined #git
10:50 rumble joined #git
10:52 navidr joined #git
10:54 anuxivm joined #git
10:57 Ragnor joined #git
10:58 theoceaniscool joined #git
11:00 Log1x_ joined #git
11:05 Ragnor joined #git
11:05 ShalokShalom_ joined #git
11:06 GT4066 joined #git
11:08 Cabanossi joined #git
11:13 Hudu joined #git
11:14 rivarun joined #git
11:16 p4trix joined #git
11:16 bill99 joined #git
11:16 dsdeiz joined #git
11:16 dsdeiz joined #git
11:16 jstein_ joined #git
11:20 nyo joined #git
11:22 CheckDavid joined #git
11:23 a_thakur joined #git
11:23 mehola joined #git
11:28 mda1_ joined #git
11:29 alex1a joined #git
11:30 Jackneill_ joined #git
11:33 JJMcPhearson joined #git
11:36 tyro_21 joined #git
11:37 Hudu joined #git
11:38 grayjoc joined #git
11:39 bill99 joined #git
11:40 chriseadle joined #git
11:47 shinnya joined #git
11:50 zeroed joined #git
11:50 zeroed joined #git
11:51 bill99 joined #git
11:53 ertesx joined #git
11:56 nostrora joined #git
11:57 theoceaniscool joined #git
12:12 mehola joined #git
12:13 wrouesnel1 joined #git
12:15 astrofog joined #git
12:16 _ng joined #git
12:16 z3t0 joined #git
12:20 Limes joined #git
12:26 raijin joined #git
12:29 MuffinMedic joined #git
12:30 sea-gull joined #git
12:33 zeroed joined #git
12:33 zeroed joined #git
12:35 Balliad joined #git
12:38 kristofferR joined #git
12:39 crobays joined #git
12:44 leeN joined #git
12:44 pur3eval joined #git
12:45 ChristopheT joined #git
12:45 dsdeiz joined #git
12:45 dsdeiz joined #git
12:49 wrouesnel1 joined #git
12:55 grayjoc joined #git
12:55 tsdev joined #git
12:58 Hudu joined #git
12:58 freimatz joined #git
12:59 ojdo joined #git
13:08 raijin joined #git
13:08 jozwior joined #git
13:09 Hudu joined #git
13:13 hussam joined #git
13:13 mehola joined #git
13:16 jstein_ joined #git
13:17 z3t0 joined #git
13:18 gribouille joined #git
13:18 gribouille hi
13:21 BlessJah /1/4
13:21 BlessJah /1/4
13:21 gribouille git log --before doesn't list the right commits
13:24 pbrewczynski joined #git
13:25 Anja joined #git
13:26 gribouille someone here for help?
13:27 nedbat gribouille: how doesn't it?
13:28 rivarun joined #git
13:28 _ng joined #git
13:29 clandestino joined #git
13:29 Hudu joined #git
13:30 gribouille nedbat, I have 2 commits : one on Sat Dec 24 17:47:13 2016 +0100, and one on Sun Jan 29 11:17:46 2017 +0100 ; git log --before "Sun Jan 29 11:24:47 2017 +0100" lists le latter, while git log --before "Sun Jan 29 11:23:47 2017 +0100" does not
13:32 govg joined #git
13:32 j416 joined #git
13:33 nedbat gribouille: hmm, i don't know why that is. aren't there a few dates on commits? authored and committed, or something?
13:33 cdg joined #git
13:34 gribouille nedbat, I'm aware of only one date
13:35 nedbat gribouille: ok, i guess i'm thinking of two people: author and committer.
13:38 ChristopheT left #git
13:38 gribouille nedbat, the date is the commit date
13:39 cdg joined #git
13:42 PhysicsSucks joined #git
13:44 gribouille nedbat, git log --before "Sun Jan 29 11:23:53 2017 +0100" lists the last commit; while git log --before "Sun Jan 29 11:23:52 2017 +0100" does not ; at about the same time I did a git commit -n --amend ; could it be the cause?
13:44 j416 joined #git
13:45 nedbat gribouille: does the amend keep the old date, or make a new one?
13:45 raijin joined #git
13:46 gribouille nedbat, I don't know
13:47 dodobrain joined #git
13:47 dodobrain joined #git
13:47 cdg joined #git
13:47 gribouille nedbat, it seems to keep the old date
13:47 gribouille at least in git log
13:49 osse i think the --before/after/since/until stuff apply to commit date
13:50 raijin joined #git
13:50 gribouille osse, that's not the question
13:50 nyo joined #git
13:51 osse amend keeps the old author date, but updates the commit date
13:51 nedbat gribouille: you might get more help if you say, "thanks, what i'm trying to figure out is...."
13:51 osse so yes i am saying "that could be the cause"
13:51 osse surely that is the question since you asked it
13:51 gribouille nedbat, sorry
13:53 nedbat gribouille: git show --fuller HASH  # this shows an AuthorDate and CommitDate
13:54 gribouille nedbat, fatal: ambiguous argument 'HASH': unknown revision or path not in the working tree.
13:54 nedbat gribouille: that was meant to be a placeholder for the hash of a particular commit
13:55 JanC_ joined #git
13:56 gribouille fatal: unrecognized argument: --fuller (I use version 2.1.4)
13:56 nedbat gribouille: sorry:  git show --format=fuller HASH  # this shows an AuthorDate and CommitDate
13:57 uranellus joined #git
13:57 uranellus joined #git
13:58 Gsham joined #git
13:58 redhedded1 joined #git
14:01 gribouille git log --format=fuller lists a commit with "AuthorDate: Sun Jan 29 11:17:46 2017 +0100" and "CommitDate: Sun Jan 29 11:23:53 2017 +0100"
14:05 zeroed joined #git
14:05 zeroed joined #git
14:06 dhollinger joined #git
14:13 Balliad joined #git
14:14 lindenle joined #git
14:17 _ng joined #git
14:20 anuxivm joined #git
14:21 anuxivm joined #git
14:24 anuxivm joined #git
14:25 anuxivm joined #git
14:27 anuxivm joined #git
14:29 anuxivm joined #git
14:30 todd_dsm joined #git
14:31 mSSM joined #git
14:34 ayogi joined #git
14:34 mSSM I have commits A-B-C, where master points to A and devel points to C. What's the best way to have master points to B? Reading a bit about cherry-picking, it looks like it would create a new commit with B?
14:36 osse mSSM: git merge B
14:38 mSSM osse: Huh, now that was easy. :-)
14:45 grayjoc joined #git
14:50 mar77i_ joined #git
14:51 Singmyr joined #git
14:51 shinnya joined #git
14:53 vuoto joined #git
14:53 boreq joined #git
14:54 Cabanossi joined #git
14:54 WayToDoor joined #git
14:55 boreq left #git
14:57 tvw joined #git
14:58 snowkidind joined #git
14:59 pur3eval joined #git
15:01 Ixwvi joined #git
15:05 tvw joined #git
15:07 Gsham joined #git
15:07 ElGrandeAmigo joined #git
15:08 jozwior joined #git
15:11 d1z joined #git
15:12 ph88 joined #git
15:12 ph88 hey guys, i'm trying to clone a repository from bitbucket with git extensions. I tried https and ssh but i get bad credentials all the time, but i can still login into bitbucket. What am i doing wrong ?
15:12 ecuanaso joined #git
15:13 ph88 should i use https or ssh even ?
15:13 SteffanW joined #git
15:17 grayjoc joined #git
15:17 ph88_ joined #git
15:19 ph88_ when i try without git-extensions and just with git for windows i have the same problem  https://i.imgur.com/payh7SJ.png
15:26 ecuanaso joined #git
15:27 Bizkit joined #git
15:28 madewokherd joined #git
15:28 chriseadle joined #git
15:29 jstein__ joined #git
15:29 otiose joined #git
15:33 _ng joined #git
15:35 MuffinMedic joined #git
15:39 codeone joined #git
15:39 theoceaniscool joined #git
15:43 doener joined #git
15:46 MineCoins joined #git
15:47 ShekharReddy joined #git
15:56 vuoto joined #git
15:58 mehola joined #git
15:58 gajus joined #git
15:59 King_Hual joined #git
15:59 King_Hual joined #git
16:00 pur3eval joined #git
16:00 hashpuppy joined #git
16:01 gugah joined #git
16:02 xall joined #git
16:02 bernardio joined #git
16:02 mizu_no_oto joined #git
16:08 ecuanaso joined #git
16:08 Cabanossi joined #git
16:11 Hudu joined #git
16:13 a_thakur joined #git
16:14 Ryanar joined #git
16:14 dviola joined #git
16:15 Limes joined #git
16:20 inflames joined #git
16:22 ecuanaso joined #git
16:22 PHPanos joined #git
16:23 a_thakur joined #git
16:23 otiose joined #git
16:25 mar77i_ joined #git
16:30 diogenese joined #git
16:31 a_thakur joined #git
16:32 stickperson joined #git
16:34 a_thakur joined #git
16:34 Sonderblade joined #git
16:38 Cabanossi joined #git
16:41 MineCoins joined #git
16:42 ph88 fixed after reinstall of git
16:46 robertsmall joined #git
16:46 BackEndCoder joined #git
16:47 Aleric Any guru online who can help me to find out what is causing this: http://codepad.org/wAGnlhBO
16:47 moritz Aleric: read the message
16:48 Aleric submodule cwm4 is already uptodate and I'm already using --recurse-submodules=on-demand. So, this is a bug in git: it refuses to push the parent because something in the submodule is not on any remote, but it is.
16:48 moritz it's obviuosly not a bug in git, because somebody thought of this specific case, and provided a helpful message
16:49 moritz including some advise on what you can do
16:49 Aleric Both lead to nothing
16:49 moritz you could just, like, follow that advise
16:49 moritz you haven't shown that part yet
16:49 Aleric I'm not THAT stupid...
16:49 Aleric Let me show you...
16:49 regedit joined #git
16:49 moritz well, one never knows with random questions from the Internet
16:50 Aleric http://codepad.org/xhrfh1lr
16:50 Aleric I'm a guru myself ;)
16:51 Aleric I even think I know what caused it... it happens after I do a 'git commit --amend' in the submodule.
16:51 moritz Aleric: what does "git status" say?
16:51 moritz ah, hints
16:52 Aleric Hmm, I must say I'm surprised by the output of git status...
16:52 Aleric http://codepad.org/h5F3AvJt
16:53 Gsham joined #git
16:53 moritz ok, I'm surprised that say it's ahead, but a push doesn't push anything
16:53 moritz you could try to git add cwm4; git commit and then push
16:53 Aleric I suppose this means that I didn't 'git add cwm4' yet. Lemme do that yes
16:54 xlegoman joined #git
16:54 Aleric http://codepad.org/hQg59Zlp
16:55 Aleric Ok, so now both are clean - but git push is refused.
16:56 Aleric I think that the problem is that the commit (hash) that I did BEFORE I amended it never was pushed to a remote, but the parent still thinks it should be.
16:56 ecuanaso joined #git
16:57 Virox joined #git
16:57 Aleric This is possible because I automated adding the submodule to the parent... ie, git add cwm4 (which is why I was surprised).
16:57 Aleric So, lets assume that this happened:
16:58 Aleric in cwm4 (submodule): git commit ..;  in the parent: git add cwm4; got commit ..; in cwm4: git commit --amend; git push;
16:58 Aleric And after that the parent, even after a new git add cwm4, is in a state where it refuses to be pushed when recurse-submodules=on-demand (which is by default because of my config).
16:59 Aleric If I turn that off, then of course it pushes the parent.
16:59 Aleric I think this IS a bug in git - and I'd like to know what exactly is going on, so I can report it :/
17:01 pur3eval joined #git
17:01 Aleric Is there an easy way to set up a test repository that uses a remote that isn't on github? Ie, a local directory can be used as remote no? Then I might be able to make a test case.
17:03 MineCoins joined #git
17:04 Ryanar joined #git
17:04 grawity that's pretty much just `git init`
17:04 grawity well, `git init --bare`
17:04 Aleric Oh, a 'bare' can be used as remote?
17:05 jaafar joined #git
17:06 Bizkit joined #git
17:12 ToxicFrog Most repos used as remotes are bare; there are restrictions on pushing to non-bare repos.
17:14 TheOnlyBouncer joined #git
17:15 Yro joined #git
17:16 TheOnlyBouncer Ohai, question, i have a buildbot setup and am using 'git rev-parse --short HEAD' to get the version, but it seems to not get the latest revision, though the repository is on a newer version
17:17 mizu_no_oto joined #git
17:17 otiose joined #git
17:21 TomyLobo joined #git
17:23 ohcibi joined #git
17:25 peepsalot joined #git
17:26 dreiss joined #git
17:27 sea-gull joined #git
17:29 mar77i joined #git
17:29 ecuanaso joined #git
17:31 Nilesh_ joined #git
17:33 peeps[lappy] joined #git
17:33 Murii joined #git
17:35 kappy joined #git
17:36 acetakwas joined #git
17:40 Cabanossi joined #git
17:43 ShapeShifter499 joined #git
17:44 _ikke_ TheOnlyBouncer: It returns whatever HEAD happens to be on
17:45 _ikke_ And HEAD is not necessarily the latest revision
17:45 lungaro joined #git
17:46 kappy joined #git
17:46 ferr1 joined #git
17:50 ozmage joined #git
17:54 parasite_ joined #git
17:54 vktec left #git
17:55 s2013 joined #git
17:56 YuGiOhJCJ joined #git
17:58 Aleric moritz: I wrote a shell script that reproduces the bug/error: http://codepad.org/iHAcFvqM
17:58 MuffinMedic joined #git
17:59 Bizkit joined #git
17:59 mar77i joined #git
17:59 star_pro_ joined #git
18:00 mehola joined #git
18:00 Hudu joined #git
18:00 re1 joined #git
18:01 lindenle joined #git
18:01 Aleric err, I see a bug in my script
18:02 jnewt_ joined #git
18:02 mizu_no_oto joined #git
18:03 Aleric This works: http://codepad.org/DGlAP1Qh
18:03 MuffinMedic joined #git
18:05 DuckMaestro joined #git
18:06 _ikke_ Aleric: Looking at it
18:07 TheOnlyBouncer _ikke_, ah changed to origin/master and seems to work now
18:08 Aleric _ikke_: ok
18:09 Cabanossi joined #git
18:10 MuffinMedic joined #git
18:11 TheOnlyBouncer left #git
18:11 Tobbi joined #git
18:11 acetakwas joined #git
18:11 otiose joined #git
18:13 nckpz joined #git
18:16 pur3eval joined #git
18:17 otiose joined #git
18:17 mizu_no_oto joined #git
18:17 Naan joined #git
18:17 njbair joined #git
18:21 xall joined #git
18:28 parasite_ joined #git
18:29 govg joined #git
18:30 svm_invictvs joined #git
18:31 acetakwas joined #git
18:32 SwiftMatt joined #git
18:32 mizu_no_oto joined #git
18:34 metachr0n joined #git
18:34 a_l_e joined #git
18:34 pypypypy joined #git
18:35 BackEndCoder joined #git
18:35 menip joined #git
18:36 ankit01ojha joined #git
18:37 kulelu88 joined #git
18:38 pypypypy left #git
18:39 manuelschneid3r joined #git
18:44 pypypypypy joined #git
18:44 Ryanar joined #git
18:44 slayerjain joined #git
18:49 kristofferR joined #git
18:53 [0xAA] joined #git
18:59 acetakwas joined #git
19:00 joki- joined #git
19:00 nowhere_man joined #git
19:02 mizu_no_oto joined #git
19:03 acetakwas joined #git
19:03 Atm0spher1c joined #git
19:03 Atemu joined #git
19:04 Aleric _ikke_: nothing?
19:05 ResidentBiscuit joined #git
19:07 ozmage joined #git
19:10 Cabanossi joined #git
19:10 DolphinDream joined #git
19:14 matoro joined #git
19:17 m4sk1n joined #git
19:19 mar77i joined #git
19:19 texasmynsted joined #git
19:26 snowkidind joined #git
19:27 thiago joined #git
19:29 dminuoso joined #git
19:32 mizu_no_oto joined #git
19:33 star_pro_ joined #git
19:33 robotroll joined #git
19:38 acetakwas joined #git
19:41 jsolano joined #git
19:44 griffindy joined #git
19:44 vuoto joined #git
19:46 tribly joined #git
19:47 pur3eval joined #git
19:52 ozmage joined #git
19:53 minikN joined #git
19:54 jstein_ joined #git
19:57 z3t0 joined #git
19:59 aidalgol joined #git
19:59 Bizkit joined #git
20:00 mehola joined #git
20:02 DolphinDream joined #git
20:02 mizu_no_oto joined #git
20:02 mar77i_ joined #git
20:06 ecuanaso joined #git
20:06 pur3eval joined #git
20:08 Fissure joined #git
20:10 SwiftMatt joined #git
20:11 rawburt joined #git
20:11 netj joined #git
20:11 rawburt LOL. Some of my commit messages have periods at the end, some don't. I want to to know if that's easy to tinker with, or requires a lot of work?
20:12 grawity for past commits or future ones?
20:12 rawburt Past
20:12 rawburt Several, actually..
20:12 ResidentBiscuit joined #git
20:12 grawity could edit them with `git rebase -i` but don't bother
20:13 rawburt Because no one cares?
20:13 freimatz joined #git
20:14 matoro joined #git
20:16 grawity they'd care more about your commit IDs suddenly changing
20:16 rawburt And that would happen if I did the rebase?
20:16 grawity yes
20:16 grawity any form of history rewriting causes that
20:16 OMSQ joined #git
20:16 _geoff joined #git
20:17 rawburt Gotcha. So far I'm the only person using the archive, I haven't shared it yet. Is is still a bad idea?
20:17 rawburt err, using the project*
20:17 rawburt repo*
20:17 grawity not really, but ... still a waste of time IMHO
20:17 rawburt Thank you for your help grawity
20:17 grawity there's also `git filter-branch --commit-filter` which can script the rewrites
20:18 otiose joined #git
20:18 kulelu88 joined #git
20:18 rawburt Cool :)
20:19 mSSM joined #git
20:19 nostrora joined #git
20:19 s17 pretend it didn't happen until somplain
20:21 fahadash joined #git
20:22 cr34ton joined #git
20:25 matsaman joined #git
20:25 ecuanaso joined #git
20:27 cdown joined #git
20:27 canuk joined #git
20:28 z3t0 joined #git
20:29 MineCoins joined #git
20:32 mizu_no_oto joined #git
20:32 mar77i joined #git
20:34 star_pro_ joined #git
20:40 Cabanossi joined #git
20:40 ChristopheT joined #git
20:40 ChristopheT left #git
20:45 mikecmpbll joined #git
20:46 causasui joined #git
20:50 mehola joined #git
20:55 jeffreylevesque_ joined #git
20:56 WayToDoor joined #git
20:57 nyo joined #git
21:01 Ascathon| joined #git
21:02 mizu_no_oto joined #git
21:02 mar77i joined #git
21:05 __builtin joined #git
21:05 JSharpe joined #git
21:12 otiose joined #git
21:13 masuberu joined #git
21:13 tmcmahon joined #git
21:14 manuelschneid3r joined #git
21:14 ph88_ is there something like git extensions for linux ?
21:15 grawity for which linux app precisely?
21:18 _28_ria joined #git
21:22 nyo joined #git
21:24 nyo2 joined #git
21:26 Charliechin joined #git
21:27 raijin joined #git
21:32 snowkidind joined #git
21:32 askb joined #git
21:32 LeBlaaanc joined #git
21:32 mizu_no_oto joined #git
21:33 rorro joined #git
21:37 dsdeiz joined #git
21:37 dsdeiz joined #git
21:37 ph88_ grawity, ubuntu
21:39 s17 gitk, git gui
21:39 masuberu joined #git
21:40 tsdev joined #git
21:41 nd joined #git
21:43 s17 readthedocs says you should have mono on your (linux) system
21:43 spacelord_ joined #git
21:46 raedah joined #git
21:46 raedah how do I delete the branches found with  git branch -a   that are under  remotes/origin/
21:47 s17 man git-remote
21:47 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
21:49 kristofferR joined #git
21:50 jstimm joined #git
21:51 multi_io_ joined #git
21:54 multi_io_ left #git
21:56 mehola joined #git
21:56 Atemu joined #git
21:59 blackwind_123 joined #git
21:59 WifiBrain joined #git
22:02 mizu_no_oto joined #git
22:02 spacelord_ joined #git
22:03 masuberu joined #git
22:03 samtheknife joined #git
22:06 otiose joined #git
22:06 mehola joined #git
22:10 Cabanossi joined #git
22:10 amrx joined #git
22:10 theoceaniscool joined #git
22:12 raedah left #git
22:16 kyan joined #git
22:18 pks joined #git
22:22 dreaddymck joined #git
22:22 matoro joined #git
22:23 umpc joined #git
22:27 raijin joined #git
22:30 tsdev_ joined #git
22:32 mizu_no_oto joined #git
22:32 raijin joined #git
22:34 Gsham joined #git
22:38 raijin joined #git
22:38 Noodlewitt joined #git
22:38 mda1 joined #git
22:39 bilb_ono joined #git
22:39 raijin joined #git
22:40 Cabanossi joined #git
22:43 raijin joined #git
22:43 spacelord_ joined #git
22:44 texasmynsted I have not seen anything in the newer features of git, but there is still not a way to provide a detailed description for a branch right?  A note applies to a particular commit . . .
22:45 matsaman path/to/description
22:48 causasui joined #git
22:51 acetakwas joined #git
22:51 xlegoman joined #git
22:52 sunny256 joined #git
22:56 stickperson joined #git
22:57 afuentes joined #git
22:59 om_henners joined #git
23:00 otiose joined #git
23:01 fmeerkoetter joined #git
23:02 mizu_no_oto joined #git
23:03 meLon joined #git
23:06 spacelord_ joined #git
23:07 stevenbenner joined #git
23:08 pur3eval joined #git
23:09 nowhere_man joined #git
23:10 Cabanossi joined #git
23:12 sunny256 joined #git
23:12 Bizkit joined #git
23:14 ozmage joined #git
23:25 dsdeiz joined #git
23:26 mizu_no_oto joined #git
23:26 cbreak texasmynsted: git tag can annotate anything that has a hash
23:26 ash_workz joined #git
23:30 Hudu joined #git
23:31 SerbianBoY joined #git
23:34 z3t0 joined #git
23:35 SerbianBoY left #git
23:36 spacelord_ joined #git
23:37 _geoff joined #git
23:39 Vampire0 cbreak, how would that help? A branch has no hash
23:39 cbreak Vampire0: he wanted to apply the node to a particular commit though
23:42 fuzzybear3965 joined #git
23:43 raijin joined #git
23:43 mda1_ joined #git
23:44 diogenese joined #git
23:44 jorj joined #git
23:44 _28_ria joined #git
23:45 griffindy joined #git
23:46 Vampire0 cbreak, in his last message? he asked there how to attach a description to a branch
23:46 Ojoesinco joined #git
23:47 MrCircuitMatt joined #git
23:47 mizu_no_oto joined #git
23:47 mda1 joined #git
23:48 MrCircuitMatt hello
23:48 gitinfo MrCircuitMatt: 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.
23:48 matsaman oh lord, a bot
23:49 matsaman dear god, where is my /ignore
23:49 matsaman whew, fixed
23:49 kyan Hi! How can I resolve a filename to a format that can be added to .gitattributes? (Like, if my cwd is repo-root/blah/ and I run a hypothetical git-filename-resolve ../foo/bar.txt I'd want to get back, I think, foo/bar.txt)
23:49 tribly joined #git
23:49 kyan !backup
23:49 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
23:49 MrCircuitMatt something went wrong with the rebase I just did. I have just completed a feature branch that I merged into master with --no-ff. This worked well. I then wanted to fix a typo I did in the commit message in one of those feature branch typos
23:50 Vampire0 matsaman, you should not ignore gitinfo if you want to get help here. We often use trigger words that make the bot give helpful information
23:50 MrCircuitMatt This did work, but it kind of linearized my feature branch, as if I had merged without --no-ff. this is the git reflog: http://pastebin.com/kWujMV0d
23:51 MrCircuitMatt HEAD@{15} is where I was happy. The stuff afterwards is the rebase that broke this. I have now checked out the HEAD@{15} again and I'm happy. I'd like to get rid of the stuff after that (i.e. the rebase that broke things). Also I'd like to understand how I messed up
23:51 matsaman Vampire0: been here for months now and only noticed him now
23:51 matsaman don't care for bots that chat unprompted
23:51 Vampire0 MrCircuitMatt, if you did an interactive rebase to fix the commit message, this is expected. Read in man git rebase about --preserve-merges
23:51 gitinfo MrCircuitMatt: the git-rebase manpage is available at http://jk.gs/git-rebase.html
23:52 matsaman ignored forever
23:52 bremner I'm sure the bot is crushed
23:52 kyan I feel like the bot's probably happy as long as some of the people find it helpful
23:52 Vampire0 matsaman, do whatever you like, but do not expect to people help you if you ignore the stuff they tell you by bot triggers ;-)
23:53 matsaman Vampire0: haven't experienced that in all my months here, either, IIRC
23:53 matsaman so should be fine =)
23:53 MrCircuitMatt Vampire0: nice that addresses part two of the question. Thanks a lot for that. Now I'd like to prune the stuff HEAD@{14} to HEAD@{0} in order to do it once more, but right this time. I understand that this is frowned upon
23:53 Vampire0 matsaman, and the bot does only speak if triggered. A "hi" or "hello" without anything else is one of his triggers
23:53 matsaman people do not say 'hello' in an attempt to have a bot speak to them, that's what I call unprompted
23:54 bremner matsaman: ok, we got the point. Could we let it go now?
23:54 blackwind_123 joined #git
23:54 Vampire0 matsaman, I wont disucuss that with you, sry
23:54 matsaman bremner: when Vampire0 stops talking to me about it, I'll stop talking to him about it
23:54 Vampire0 MrCircuitMatt, fowned upon?
23:54 matsaman Vampire0: cool
23:54 otiose joined #git
23:54 bremner don't make me come back there you kid.
23:54 bremner err, you kids.
23:55 Vampire0 MrCircuitMatt, if you want to restore to before the rebase, just reset --hard to the point before you did the faulty interactive rebase and you are fine
23:55 MrCircuitMatt Vampire0: yeah or if not then that's even better. I looked at it as some sort of history rewriting but I'm just pruning stuff. In fact I'm not entirely sure that I would be pruning stuff altogether
23:55 MrCircuitMatt OK, that would be 76a8253 right?
23:55 Vampire0 MrCircuitMatt, yes, you will rewrite the history, even the commit message editing is rewriting history
23:55 Vampire0 MrCircuitMatt, if you didn't push anything this is fine though
23:56 Vampire0 MrCircuitMatt, it just may become a problem after you pushed your chagnes
23:56 MrCircuitMatt OK great I didn't push
23:56 Vampire0 MrCircuitMatt, as long as you didn't push rewriting history to beautify or fix it is perfectly fine and usual workflow
23:56 MrCircuitMatt OK even better in that case
23:58 Vampire0 And yes MrCircuitMatt, I think HEAD@{15} should be where you want to go back to
23:58 dsdeiz joined #git
23:58 dsdeiz joined #git
23:59 otiose joined #git
23:59 e14 joined #git

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