IRCloggy #git 2012-11-19

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2012-11-19

← SBoudrias left00:00
→ iamjarvo joined00:01
→ SBoudrias joined00:01
← etcetera left00:01
← fsvehla left00:02
← TeamColtra left00:02
multi_io thiago: well, I can't find a --directory-filter option, and --subdirectory-filter isn't quite what I intended...00:03
→ Raydiation joined00:03
Raydiation how can i merge one commit from a branch?00:04
thiago Raydiation: only if it's the first one00:04
multi_io: that's the only option00:04
Raydiation i see00:04
ty00:04
thiago multi_io: use the filter, then move to the right directory in one commit, then merge00:04
← gittish left00:05
→ akiress joined00:08
offby1 Raydiation: you can cherry-pick. Strictly speaking it's not a merge, but I'm guessing it's what you want.00:10
→ BSaboia joined00:10
Raydiation offby1: just cherry pick the commit hash from that branch?00:11
offby1 yep00:11
Try It And See™.00:11
Raydiation y00:11
← marhaban left00:11
Raydiation ty*00:12
→ pvt_petey joined00:13
→ JoeAngel_ joined00:13
← SuperrMann left00:13
← meretrix left00:13
← dSebastien left00:15
← dnivio left00:16
→ Vert joined00:18
← icio left00:18
→ icio joined00:19
← daniel_- left00:19
← OOPMan left00:19
→ Davey joined00:20
Raydiation offby1: worked, cherrypick is awesome00:21
→ OOPMan joined00:21
→ eletuchy joined00:22
← matip left00:22
→ jfs joined00:23
→ MarcWeber joined00:23
→ Blue0ctober joined00:24
← Blue0ctober left00:24
→ angelsl joined00:25
→ Blue0ctober joined00:25
← Blue0ctober left00:25
→ Blue0ctober joined00:26
← Blue0ctober left00:26
→ Blue0ctober joined00:26
← Blue0ctober left00:26
→ etcetera joined00:27
→ Blue0ctober joined00:27
← Blue0ctober left00:27
→ Blue0ctober joined00:28
← Blue0ctober left00:28
offby1 \o/00:28
~00:28
/ \00:28
it's easy to overuse, so don't.00:28
← cyd left00:28
nevyn overuses cherrypick it's bad.00:28
→ Blue0ctober joined00:28
← Blue0ctober left00:28
→ Blue0ctober joined00:29
← Blue0ctober left00:29
nevyn tho nobody has adequately explained how cherrypick branch to master and rebase branch to master are any different if branch has a single commit on it.00:29
→ Blue0ctober joined00:30
FauxFaux I'm pretty sure that's semantically identical.00:30
← Blue0ctober left00:30
← gain left00:30
→ Blue0ctober joined00:30
← Blue0ctober left00:30
→ chaiz joined00:31
offby1 yep00:31
→ Blue0ctober joined00:31
← Blue0ctober left00:31
offby1 can't see any reason why they wouldn't be.00:31
→ TeamColtra joined00:31
← eletuchy left00:31
→ DrHouse|E6400 joined00:32
offby1 I cannot think of an experiment that could distinguish one state of affairs from the other :)00:32
→ Blue0ctober joined00:32
← Blue0ctober left00:32
nevyn well if you examined branch it would be obvious00:32
but from the perspective of master I don't think there's any difference00:32
→ Blue0ctober joined00:32
← Blue0ctober left00:32
FauxFaux Well, personally, in most caes I'd prefer cherry-pick to do a 2-way merge and rebase to continue doing the 3-way merge. ;)00:33
→ Blue0ctober joined00:33
← Blue0ctober left00:33
→ Blue0ctober joined00:34
← Blue0ctober left00:34
→ matip joined00:34
→ Blue0ctober joined00:34
← Blue0ctober left00:34
→ Milossh joined00:35
→ Blue0ctober joined00:35
← Blue0ctober left00:35
← AlbireoX left00:35
→ Blue0ctober joined00:36
← Blue0ctober left00:36
→ AlbireoX joined00:36
→ Blue0ctober joined00:36
← Blue0ctober left00:36
→ Blue0ctober joined00:37
← Blue0ctober left00:37
→ Blue0ctober joined00:38
← Blue0ctober left00:38
← kpreid left00:38
→ kpreid joined00:38
→ Blue0ctober joined00:38
← Blue0ctober left00:38
← hyperair left00:39
→ Blue0ctober joined00:39
← Blue0ctober left00:39
← spaceonline left00:40
→ Blue0ctober joined00:40
← Blue0ctober left00:40
← brandonw1 left00:41
→ jcao219 joined00:41
← JoeAngel_ left00:42
MarcWeber THere is no way to check integrity of a particular commit eg after a shallow clone which is why git fsck fetches all history, right?00:43
← Octalot left00:44
← yshh left00:44
→ BadProphet joined00:44
→ hmsimha joined00:45
→ Blue0ctober joined00:45
← Blue0ctober left00:45
thiago MarcWeber: correct00:46
to check the integrity, you need the full history leading to that point00:46
→ Blue0ctober joined00:46
MarcWeber Eg ruby's bundler tool allows to refer to github repos by giving the github url and a commit hash reference.00:46
However for large projects in order to use them it should be enough to verify a particular commit - not fetching all history.00:47
← glennpratt left00:47
MarcWeber Does git provide any command calculating a hash based on the file contents of a particular commit only?00:47
thiago yes, that's the tree hash00:48
← angelsl left00:49
→ daniel_- joined00:50
← gan_ left00:51
← jimmyeatworld left00:52
MarcWeber git ls-tree? thanks. So i guess that tools like rubys bundler should force also specifying that value so that you don't have to fetch all history to verify contents.00:52
thiago Git does not provide a command to verify that the tree hash is correct00:53
however, git reset --hard will check out the commit, which is right already00:53
i.e., assuming that the transport is correct and the database is not corrupted, then the checkout will be correct too00:54
FauxFaux Uh, the scrollback confuses me. A commit ID /is/ enough to verify the tree at that point to the same level of safety as any other operation?00:54
MarcWeber thiago: I may distrust the transport00:54
thiago no00:54
if you don't have the full history, the commit ID cannot be used to verify00:54
MarcWeber: then get the full history00:55
git fsck cannot do its full job unless you get the full history00:55
MarcWeber thiago: I'm going to write to the mailinglist asking whether such a verification option would make sense.00:55
FauxFaux thiago: What advantages does having the full history give?00:55
MarcWeber I don't care about history whet building code, I only care about that commit I'm using.00:55
thiago with a partial history, you can only verify that the contents match the expected contents, but you don't know if the commit ID hasn't been tampered with00:55
MarcWeber If I want to check history, then I can fetch everything.00:55
thiago MarcWeber: false assumption00:55
MarcWeber Why?00:56
thiago do you have a way to verify the commit SHA-1 integrity?00:56
FauxFaux thiago: But there's no point in verifying the history; it's just as modifiable as any current point in history.00:56
thiago an out-of-band way to verify that the commit SHA-1 is a specific expected value?00:56
← pfFred left00:56
← Blue0ctober left00:57
← rchavik left00:57
MarcWeber thiago: I'm thinking about a source description like this: {'type':'git', 'url':'git:///...', 'ref' : 'the commit hash', 'tree-hash': 'output of git ls-tree on a trusted clone'}00:57
thiago MarcWeber: is that transport trusted?00:58
MarcWeber Then using the ls-tree hash it should be possible to verify the file contents of --depth 0 checkouts without getting all history, right?00:58
→ pfFredd joined00:58
→ eletuchy joined00:58
→ dedis joined00:58
MarcWeber thiago: What do you mean by trusted? Do I trust the transport of the source description?00:58
thiago that's --depth 1, of course00:58
yes, do you trust that?00:58
← dedis left00:59
FauxFaux I maintain that git checkout $SHA1 is good enough to get a tree that's unmodified.00:59
MarcWeber I could put it into a git repository, and do the same with it. If the ls-tree hash is fine the source descriptions should be, too.00:59
cirwin FauxFaux: someone might have another commit with the same SHA1!!00:59
← icio left00:59
thiago FauxFaux: that's correct00:59
MarcWeber: you don't need the ls-tree hash00:59
FauxFaux (Even if you don't have any of the history.)00:59
thiago MarcWeber: the commit hash is a checksum already00:59
MarcWeber FauxFaux: You're right. But verifying it may cause a lot of unnecessary traffic to the network - cause you have to fetch all history.01:00
I want to avoid that.01:00
FauxFaux MarcWeber: No, you don't. Just the checkout command is enough.01:00
cirwin: Someone might have broken sha-1, which is a much more serious issue that makes me lose sleep.01:00
ryanneufeld|away → ryanneufeld01:00
thiago FauxFaux: cirwin was being sarcastic :-)01:00
MarcWeber FauxFaux: How can you verify it without history?01:00
thiago MarcWeber: check out again01:01
→ dedis joined01:01
MarcWeber checking out a second time takes time.01:01
thiago MarcWeber: since Git checks out files according to SHA-1, the contents must be right01:01
MarcWeber: sha1sum takes time too01:01
cirwin http://www.schneier.com/blog/archives/2005/02/sha1_broken.html01:01
FauxFaux thiago: Well, unless recieve-pack doesn't check the sha1 as it's writing it to disc.01:01
thiago MarcWeber: you can reconstruct the tree operation to check01:01
→ angelsl joined01:02
thiago MarcWeber: git does not provide that. You need to do it yourself.01:02
MarcWeber: apply sha1sum to each file like Git (which is not on the pure contents), then recreate the tree objects01:02
← Fandekasp left01:02
FauxFaux cirwin: Luckily it's one of those boring attacks that doesn't apply to hmacs, so at least you can put a proper hash of the repo into a tag and it's still secure, even though git's use of retardo versions of gpg breaks non-sha1 gpg signing.01:02
MarcWeber lazy speaking I could cerate a zip file and calculate the hash of that.01:02
thiago MarcWeber: then once you have the root tree SHA-1, you can compare to the one in the commit tree01:02
cirwin FauxFaux: cool01:03
I remember posts on the mailing list a while back about sha-256 in git, did that get anywhere?01:03
thiago would wait for SHA-301:03
FauxFaux SHA3 is out; thiago. Get on with it.01:04
thiago SHA-2 is still secure, but if we're going to change, maybe wait for SHA-301:04
SethRobertson The SHA-3 contest was won about a month ago01:04
FauxFaux cirwin: There's /thousands/ of places in the implementation that assume a digest is 20 bytes or 40 hexes. Literally thousands. It's shocking.01:04
→ yakko joined01:04
cirwin FauxFaux: yay for C and having to specify char[20] to get anything done...01:05
Parhs http://www.papertoilet.com/ lol01:05
← dedis left01:05
FauxFaux Parhs: And years of software engineer training pays off; change the aspect ratio of the window and dragging it is easier. >.>01:06
Parhs lol :P01:07
→ dedis0 joined01:07
MarcWeber http://dpaste.com/833076/ @ thiago So this should be fine?01:07
Parhs nothing happens at end01:07
← eletuchy left01:07
thiago MarcWeber: lines 9-11 are not necessary01:07
→ sgronblom joined01:07
thiago MarcWeber: do you trust the Git command?01:07
FauxFaux I had a reasonable idea what I was going to present to the mailing list as an initial port to sha3, but I was waiting for it to be finalised and haven't had time since.01:07
thiago MarcWeber: git checkout will only check out the correct files01:08
FauxFaux MarcWeber: Using a short ref is absolutely not okay; https://blog.goeswhere.com/2010/12/git-set-commit-id/01:08
MarcWeber FauxFaux: sure, the less chars, the higher the chance for collision.01:09
→ Vampire0 joined01:09
MarcWeber thiago: Given that I trust my local git command, but not the one on the server. How can git ensure its checking out the right files?01:10
→ Fandekasp joined01:10
MarcWeber I mean it can't verify that the root-tree hash and history yields the commit hash, without reading history ?01:10
ryanneufeld → ryanneufeld|away01:12
→ hyperair joined01:13
thiago MarcWeber: by construction01:13
→ yoklov joined01:13
thiago MarcWeber: given a commit's SHA-1, it can verify that it's proper, if you trust (or ignore) the history01:14
← Xizor left01:14
FauxFaux MarcWeber: The commit hash unambigiously and securely refers to an object that contains the root tree hash.01:14
→ revyd joined01:15
thiago but I don't think git rehashes all the content as it checks it out. That's what fsck should be doing.01:15
← flavius left01:15
← dedis0 left01:15
thiago if checkout succeeded and the object DB is not corrupted or compromised, then the checkout command checked out the correct contents01:16
you just need to verify the object DB01:16
FauxFaux Assuming you've just cloned, receev-pack and/or index-pack will do it, won't they?01:16
thiago I don't think so01:16
there might be a mode to enforce verification01:16
receive.fsckObjects and transfer.fsckObjects01:17
→ yshh joined01:18
← Chillance left01:18
→ griotspeak joined01:18
→ Yuuhi``` joined01:21
← Yuuhi`` left01:22
← crocket left01:22
← alee_ left01:22
→ Blue0ctober joined01:22
→ wgl joined01:22
← Blue0ctober left01:22
→ Anders_J joined01:23
← dwmw2_gone left01:23
→ Blue0ctober joined01:23
← Blue0ctober left01:23
← pfFredd left01:24
→ Blue0ctober joined01:24
← Davey left01:24
← Blue0ctober left01:24
→ Blue0ctober joined01:25
← Blue0ctober left01:25
→ Blue0ctober joined01:26
← Blue0ctober left01:26
← crhan left01:26
wgl I needed to trim a host of bad commits in a system with a remote repository and several other nodes. On one of the nodes, I located the point that I wanted to be the new top, and did a --reset hard, then a push. I then did a test in a separate directory doing a clone of that remote repository, and all looked well. So in the other nodes, i did a "git checkout origin/master" and the state of the working directory is fi01:27
ne, but "git status" says that I am in a 'detached HEAD' state. Advice on getting HEAD set correctly?01:27
→ Blue0ctober joined01:27
← Blue0ctober left01:27
→ Blue0ctober joined01:28
← Blue0ctober left01:29
→ Blue0ctober joined01:29
← Blue0ctober left01:29
← m0ltar left01:30
← |Freeman| left01:30
offby1 wgl: "git checkout some-branch-or-other".01:30
→ Blue0ctober joined01:30
offby1 Probably best to create a branch where you are now first, though: "git branch safekeeping"01:31
← Blue0ctober left01:31
offby1 just in case you've made some commits that wouldn't otherwise be reachable.01:31
if you see what I mean.01:31
→ Blue0ctober joined01:32
← Blue0ctober left01:32
→ Davey joined01:32
→ Blue0ctober joined01:32
← revyd left01:33
wgl offby1: Well, repository has no branches other than default.01:33
→ revyd joined01:33
→ eletuchy joined01:34
wgl offby1: Doing "git checkout master" give me branch master, but says "your branch is ahead of origin/master' by 38 commits."01:34
It is those commits that I am trying to trim off.01:34
WakiMiko while on master, do git reset --hard origin/master01:35
← Davey left01:35
→ ISF joined01:36
wgl Ok, did that on first node, then pushed it to remote. I expected that this would pull to second node. So this needs to be done on each node?01:36
WakiMiko i think so. i dont think there is a way to pull and "lose" commits01:38
← revyd left01:38
wgl WakiMiko: Thought there might be, given all the warnings about what hard reset does.01:38
WakiMiko the warnings are there because you WILL LOSE commits01:39
→ Goplat joined01:39
WakiMiko but since this is exactly what you are trying to do, its fine01:39
← jcao219 left01:39
← mapreduce left01:39
wgl So I thought that doing the pull or checkout from the remote would bring that truncation of the commits to the second node.01:40
← Anders_J left01:40
offby1 nope01:40
← chris64 left01:40
→ jdunck joined01:40
offby1 you can arrange a "forced update" though01:40
alas I don't know how01:40
wgl Ok. So this would need to be done for each node wanting the latest true (truncated) history from remote node, it would seem.01:41
WakiMiko yeah it will. its generally a bad thing to change already pushed changes01:42
or delete them01:42
because that will result in conflicts for everyone who cloned the repo01:42
← eletuchy left01:43
← angelsl left01:43
wgl offby1: The "forced update" is what I was looking to accomplish so remotes could just pull from remote and be at the proper place.01:43
← BadProphet left01:46
→ angelsl joined01:46
wgl offby1: WakiMiko: Thanks, looks like it is doing what I want.01:48
offby1 wgl: I think you need to get everyone to edit their .gitconfig, which is even harder than getting them to type "git pull -f" or whatever.01:48
← mdawkins left01:51
← Raydiation left01:53
← daniel_- left01:56
→ jcao219 joined01:56
→ Davey joined01:58
← sluther left02:04
← delinquentme left02:05
→ sluther joined02:06
← jcao219 left02:06
→ david1010 joined02:07
← thinkdev_ left02:08
← david1010 left02:09
→ luc_ joined02:10
→ eletuchy joined02:10
→ BadProphet joined02:10
← gusnan left02:11
→ crhan joined02:16
← sheerun left02:18
→ docai joined02:19
← docai left02:19
DrPoole if i have uncommited files in my branch, do i need to stash before checkout out another branch?02:19
or does stash reset the branch to the master?02:19
→ docai joined02:19
← eletuchy left02:19
← wgl left02:19
→ jdyin joined02:22
SeoZ-work[AWAY] → SeoZ02:24
thiago DrPoole: you don't need to stash02:25
it's up to you02:25
DrPoole but if i dont it will bring my changes to the new branch, correct?02:25
thiago yes02:25
the modified files will stay modified02:25
DrPoole i see, i see. cheers mate.02:25
JoeHazzers silly question, why is the "owner" column on my gitweb projects page empty, but when viewing the individual repository, it is not?02:29
→ notVert joined02:30
→ intripoon joined02:30
← chaiz left02:31
← DrHouse|E6400 left02:31
← cakehero left02:31
← intripoon_ left02:33
← pvt_petey left02:35
← Synthead left02:36
→ infynyxx joined02:40
← BSaboia left02:43
→ tbrock joined02:44
→ sisyphus joined02:44
→ GeertB joined02:45
→ eletuchy joined02:46
← infynyxx left02:49
→ jcao219 joined02:49
→ infynyxx joined02:50
← tbrock left02:50
→ jwmann joined02:51
→ Vampire0_ joined02:51
→ trumpetmic joined02:51
→ tbrock joined02:51
← Blue0ctober left02:51
DrNick JoeHazzers: you should probably ask in a github-related channel/forum02:52
→ BiggFREE joined02:54
← BadProphet left02:54
← Vampire0 left02:54
← BiggFREE left02:54
← eletuchy left02:57
→ JoeAngel_ joined02:58
bremner gitweb != github02:59
← tbrock left03:00
→ syskk joined03:02
syskk I accidentally committed a large file to my repository. Anyway to modify my commit and remove the large file before I publish?03:03
maybe with git rebase?03:03
bremner !fixup03:03
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!03:03
hachque → hachque|EXAMS03:06
← barq left03:06
← Davey left03:07
→ TadekMocarzzzz joined03:11
EugeneKay syskk - if it was the last commit, you can !untrack it and then commit --amend03:13
gitinfo syskk: To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD^ file`03:13
EugeneKay syskk - if it was a previous one you'll need to do somethign a lil fancier, but the same basic idea applies03:13
← akiress left03:14
← sisyphus left03:15
syskk thanks guys, I did a git rebase and "edit" on the commit i wanted to modify03:15
→ BadProphet joined03:15
syskk im just wondering now if the big image is still referenced somewhere03:16
→ chaiz joined03:16
syskk since git rebase actually creates new commit if im correct03:16
i just dont want git clones to take forever because of that file03:17
← griotspeak left03:17
→ tbrock joined03:17
← tdowg12 left03:18
← e66 left03:18
← LekeFly left03:19
← hmsimha left03:19
← etcetera left03:19
← ISF left03:20
← relgar left03:21
← avpx left03:23
→ eletuchy joined03:23
→ LekeFly joined03:23
→ ojacobson joined03:23
← lonewulf` left03:24
← tbrock left03:24
→ kerrick joined03:24
→ tbrock joined03:25
→ vexed joined03:25
TadekMocarzzzz i hate php co,mpany niggers, why they made something that shi,tty like Bi,tch PHP nig,ger03:25
why php company cant be holocausted just like the jews?03:25
that would be great for world, just like holocaust of jews was03:25
u agree?03:25
→ ak5 joined03:25
← kerrick left03:26
→ kerrick joined03:26
ak5 hi, what user does git run as on the gitolite server machine when going through the post-recieve hook03:26
→ Davey joined03:26
TadekMocarzzzz type:03:26
run holocaust03:26
EugeneKay ak5 - as whatever user gitolite is03:26
← ojacobson_ left03:27
ak5 EugeneKay: sorry, how to ge tthat info? It's not running as a daemon03:27
→ hmsimha joined03:27
EugeneKay ak5 - it's.... the user before the @ in your SSH link?03:27
→ Chib joined03:27
vexed If you push, and get back a error in sideband demultiplexer, does that always mean remote server has a corrupted repo ?03:28
ak5 EugeneKay: I see, ok03:28
TadekMocarzzzz HOLOCAUST - whats this?03:28
is holocaust cool or not?03:28
ChanServ set mode: +o03:28
TadekMocarzzzz banhammer03:29
bremner set mode: +q03:29
→ lonewulf` joined03:29
ak5 EugeneKay: I don't understanda why I am getting permission denied then when I do GIT_WORK_TREE=/srv/http/vhosts/book-creation-tool/ git checkout -f03:29
← tbrock left03:29
→ irqq_ joined03:29
ak5 my directory has 775 permissions for http:git03:29
multi_io I did a git rm -rf foo/bar, and now I want to unstage the removal of foo/bar/baz/file.txt (and restore that file in the working dir). How do I do that?03:30
← irqq left03:30
← LekeFly left03:30
multi_io it's neither git reset HEAD foo/bar/baz/file.txt nor git checkout foo/bar/baz/file.txt03:31
→ Imaginativeone joined03:31
multi_io ah, it's git checkout HEAD foo/bar/baz/file.txt03:31
frogonwheels multi_io: git checkout HEAD -- foo/bar/baz/file.txt should work. :|03:31
multi_io frogonwheels: yeah :P03:32
bremner set mode: +b03:32
→ eindoofus joined03:32
bremner kicked TadekMocarzzzz ("Have a nice day")03:33
bremner set mode: -q03:33
→ etcetera joined03:33
eindoofus hi, how can I pull from a remote repo while disregarding changes I made locally? I would normally do "git pull" but locally I changed a file but I no longer care about keeping the changes.03:33
← cody-somerville left03:33
← eletuchy left03:33
ChanServ set mode: -o03:34
vexed eindoofus, git reset --hard HEAD if you want to kill all local changes.03:34
eindoofus thanks03:34
just curious, what does HEAD mean?03:34
vexed the head commit...03:35
ie, last one you pulled.03:35
eindoofus thanks03:35
→ riker2000 joined03:35
← gumnos left03:36
→ ozialien joined03:36
← riker2000_ left03:39
← vexed left03:39
→ tinybluepixel joined03:40
← OOPMan left03:40
→ Tegi joined03:41
← BadProphet left03:44
← kiffer84 left03:44
→ griotspeak joined03:46
← tinybluepixel left03:47
← ozialien left03:47
← orafu left03:51
← infynyxx left03:51
→ orafu joined03:51
→ d2dchat joined03:52
← griotspeak left03:58
← cybersphinx left03:59
→ griotspeak joined03:59
→ eletuchy joined03:59
→ zdk joined04:03
← spyro left04:06
← hellopat left04:07
← Imaginativeone left04:07
→ AlbireoX`Laptop joined04:09
← eletuchy left04:10
→ spyro joined04:10
→ Turicas joined04:12
← AlbireoX left04:12
← AlbireoX`Laptop left04:13
→ dedis joined04:15
← griotspeak left04:15
← dedis left04:16
← madewokherd left04:18
← andrewhl left04:18
→ Imaginativeone joined04:18
→ dedis joined04:23
← Imaginativeone left04:26
→ Raging_Hog joined04:26
← spyro left04:27
← eindoofus left04:28
→ spyro joined04:29
→ sangi joined04:32
← d2dchat left04:32
← x82_nicole left04:32
→ gjaldon joined04:33
→ noyb joined04:35
→ eletuchy joined04:36
← TeamColtra left04:40
→ gmarseliss joined04:42
← project2501b left04:43
→ Zael_ joined04:44
→ BadProphet joined04:44
← Zael_ left04:46
← eletuchy left04:47
← Zael left04:47
← SBoudrias left04:48
← Raging_Hog left04:49
→ pretty_function joined04:52
→ hafeez3000 joined04:56
→ private joined04:56
private → Guest4822104:57
← BadProphet left04:57
← caseymcg left04:58
← luc_ left05:03
← gitnewb left05:04
→ luc_ joined05:04
← hafeez3000 left05:08
→ d2dchat joined05:09
→ syskk_ joined05:10
← syskk_ left05:10
→ syskk_ joined05:10
← SirCmpwn left05:11
→ SirCmpwn joined05:11
→ hafeez3000 joined05:13
← Bass10 left05:13
→ eletuchy joined05:13
← TomWij left05:13
← syskk left05:14
syskk_ → syskk05:14
← yakko left05:16
→ TomWij joined05:16
← gjaldon left05:16
← Araxia left05:17
→ Araxia joined05:18
← m0viefreak left05:20
→ dnivio joined05:21
← irqq_ left05:21
→ OOPMan joined05:21
← Davey left05:22
→ tomvolek joined05:22
tomvolek anybody here has used SourceTree client ?05:23
← eletuchy left05:23
→ subhojit777 joined05:24
→ BadProphet joined05:25
→ gjaldon joined05:29
← dnivio left05:30
→ ecksit joined05:31
ecksit hey, i am trying to rebase my branch and i get the following output - https://gist.github.com/d46f43a74cbe719532a605:31
how can i resolve that?05:32
← isomorphic left05:32
cirwin ecksit: looks like you're passing the wrong arguments to git rebase05:32
what did you ask it to do?05:32
→ tokiya_ joined05:32
ecksit git rebase -i branch-name05:32
→ rurufufuss joined05:33
thiago your current branch is already rebased compared to branch-name05:33
cirwin you want to do git rebase -i master05:33
thiago i.e., your current branch and branch-name are the same05:33
cirwin or find the point at which your branch diverged from master05:33
confusing UI is confusing05:34
→ isomorphic joined05:34
← iamjarvo left05:34
ecksit right05:34
← tokiya left05:35
CrazyGir is it possible to specify a password on the command line or try for ssh then fallback to password, or otherwise avoid entering password interactively?05:36
← BadProphet left05:37
← crhan left05:37
thiago CrazyGir: check your ssh documentation05:37
← Araxia left05:38
→ Araxia joined05:38
→ hotovson joined05:39
cirwin CrazyGir: you probably want to set your ssh up with public-keys (for additional security then password protect your keys and use an ssh-agent) http://www.ece.uci.edu/~chou/ssh-key.html05:40
← jday_ left05:40
→ xiukun joined05:42
← hotovson left05:43
→ syskk_ joined05:44
← syskk_ left05:44
→ syskk_ joined05:44
← syskk left05:44
syskk_ → syskk05:44
← aspotashev left05:44
→ dvide joined05:44
← ecksit left05:45
← trumpetmic left05:46
← jcao219 left05:48
← gjaldon left05:49
→ eletuchy joined05:50
← camt left05:52
→ gjaldon joined05:54
← bgerber left05:55
← philips_ left05:55
ryanneufeld|away → ryanneufeld05:56
ak5 can I get gitolite to write files as different group? I am running httpd as http user and gitolite as git user, runninf postreceive hook that creates files. I need those files to be owned by git:http - can I do that05:57
← gjaldon left05:57
← schmiddy left05:58
milki cant you do that in your postreceive hook?05:58
→ philips_ joined05:59
ak5 milki: what you mean with sudo chown -R :http ? I was hoping there was a cleaner solution than adding git to sudoers files06:00
thiago only root can use groups and users to which it doesn't belong06:00
← eletuchy left06:00
thiago but a regular user can chgrp its files to any group that it belongs to06:00
ak5 I see06:01
so I add http to git's groups?06:01
← yoklov left06:02
→ bgerber joined06:02
thiago that will allow you to save files as http:git06:02
not git:http06:02
→ BadProphet joined06:04
→ JohnBat26 joined06:04
→ revyd joined06:06
sitaram ak5: use the umask setting in the rc file, then adjust groups06:06
→ david2lin joined06:06
← RowsIO left06:06
sitaram ak5: http://sitaramc.github.com/gitolite/rc.html06:06
instructions for older gitolite will be similar but not exactly the same06:07
→ harshpb joined06:07
ak5 ok thanks06:07
← bgerber left06:09
→ longbeach joined06:11
← harshpb left06:12
→ ISF joined06:13
← BadProphet left06:16
→ ben__duyujie joined06:16
→ KKA joined06:16
→ syskk_ joined06:19
← syskk_ left06:19
→ syskk_ joined06:19
← subhojit777 left06:20
→ subhojit777 joined06:20
← syskk left06:20
syskk_ → syskk06:20
→ irqq joined06:20
→ arietis joined06:20
→ imachuchu joined06:21
← GeertB left06:21
← imachuchu left06:21
→ btrask joined06:22
CrazyGir cirwin / thiago : thank you for the suggestion on ssh keys, and apologies on my delay in replying. unfortunately, I am trying to find another solution, separate from the use of keys06:22
← d2dchat left06:22
→ Bilge joined06:24
→ iamjarvo joined06:24
← noyb left06:27
→ eletuchy joined06:27
→ jcao219 joined06:27
thiago the only way to authenticate to SSH without typing the password all the time is to use another authentication mechanism06:28
keys are the easiest06:28
← mnathani left06:28
← edgar-rft left06:29
→ imachuchu joined06:30
← etcetera left06:30
← tomvolek left06:30
← ak5 left06:30
← tewecske left06:31
→ bgerber joined06:33
→ skul joined06:33
← oposomme|away left06:33
→ oposomme joined06:33
→ arex\ joined06:34
← zdk left06:34
→ zdk joined06:35
← jtm left06:35
← Gizmokid2005 left06:35
→ jtm joined06:35
← mgedmin left06:35
→ mgedmin joined06:36
← eletuchy left06:37
→ Gizmokid2005 joined06:37
→ shruggar joined06:37
← unreal left06:39
→ luc__ joined06:41
← luc_ left06:41
→ unreal joined06:42
gitinfo set mode: +v06:42
→ d2dchat joined06:42
→ BadProphet joined06:43
← syskk left06:43
→ syskk joined06:43
EugeneKay sitaram - I would have pointed him at deploy #6 ;-)06:45
← revyd left06:46
sitaram EugeneKay: hmmm... maybe you're right. I read the first few words and assumed "oh, gitweb..."06:47
EugeneKay "EugeneKay is right because EugeneKay is always right."06:47
sitaram didnt read the bit where he says "postreceive hook"06:48
→ hotovson joined06:48
sitaram yeah yeah06:48
EugeneKay Yeah, this guy was asking about GIT_WORK_TREE earlier06:48
ag4ve how do i see what was committed with a change? diff gives me hash to current - how do i get just that patch?06:49
← docai left06:49
EugeneKay ag4ve - git show commit06:49
→ docai joined06:49
cirwin git diff commit^! too06:49
ag4ve thanks06:49
^!?06:50
cirwin man gitrevisions06:51
gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html06:51
→ mishok13 joined06:51
→ maleknet joined06:52
← hotovson left06:52
ag4ve oh cool, i always wondered where things like HEAD~1 were documented06:53
cirwin yeah, it's a pretty handy page06:54
though I wish it had a mode for specifying "that revision I mean"06:54
← BadProphet left06:55
_ikke_ DWIMNWIS06:55
→ revyd joined06:57
← maleknet left06:57
→ laurav joined06:57
← angelsl left06:58
→ gittish joined07:00
← longbeach left07:00
→ hotovson_ joined07:01
→ ben__duyujie_ joined07:02
→ ThomasLocke joined07:03
← ben__duyujie left07:04
→ eletuchy joined07:04
← revyd left07:06
milki fly-by-wire programming07:06
← hotovson_ left07:06
← shruggar left07:06
cirwin https://github.com/AndrewVos/metherd-missing07:06
→ pantsman joined07:06
← pantsman left07:06
→ pantsman joined07:06
_ikke_ milki: ?07:06
milki isnt that how those systems work?07:07
_ikke_ Guess so07:07
milki you say steer left07:07
but you really mean activate all these thrusters in a certain order07:07
in order to go the right direction07:07
er, "left" direction07:07
→ mrtwiddletoes joined07:09
→ soee joined07:09
← gittish left07:10
← mrtwiddletoes left07:12
→ maleknet joined07:13
← eletuchy left07:14
→ cbreak-work joined07:15
← cbreak-work left07:15
→ revyd joined07:15
→ marthinal joined07:15
→ cbreak-work joined07:15
→ a-l-e joined07:16
← subhojit777 left07:16
→ flijten joined07:16
→ jackh joined07:16
← mishok13 left07:17
→ jceb joined07:18
→ dhruvasagar joined07:19
→ cilly joined07:21
→ BadProphet joined07:22
← a-l-e left07:22
→ angelsl joined07:22
→ poolshark joined07:23
→ fsvehla joined07:24
→ ben__duyujie joined07:24
← cilly left07:24
← jceb left07:24
→ papegaaij joined07:26
← syskk left07:26
→ syskk joined07:27
← syskk left07:27
→ syskk joined07:27
← laurav left07:27
← ben__duyujie_ left07:27
→ danmichel joined07:28
← JohnBat26 left07:28
→ hoschi joined07:28
→ shruggar joined07:28
← joshsmith left07:28
← danmichel left07:29
→ hotovson joined07:29
← Gizmokid2005 left07:30
→ Pugnax joined07:31
← hotovson left07:31
← iamjarvo left07:32
← syskk left07:32
← BadProphet left07:34
→ ben__duyujie_ joined07:34
→ Gizmokid2005 joined07:35
← ShadeTornado left07:35
← ben__duyujie left07:35
→ _ramok joined07:36
_ramok hi07:36
FauxFaux _ramok: !hi07:36
gitinfo _ramok: [!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:36
_ramok i'm trying to update my submodules with "git submodule update" . but nothing happens. i see still the old code. if i go into the folder and run "git checkout master" i get "Already on 'master'"07:37
any idea how i can update my submodule?07:37
_ikke_ _ramok: Where do you want to update it to07:37
?\07:37
_ramok _ikke_: it's currently in a project07:37
_ikke_ _ramok: note that git submodule update doesn't mean, get the latest code from upstream07:37
→ dpino joined07:37
_ikke_ _ramok: It means, update the submodule to the commit that is recorded for this submodule07:38
_ramok _ikke_: oh, okay which command is doing that?07:38
→ eletuchy joined07:38
_ikke_ _ramok: Just like you normally would in a repository07:38
→ jceb joined07:38
_ikke_ git fetch in the submodule itself07:38
_ramok hm, okay. let me try this07:38
→ Sigma joined07:38
→ xxc_michael joined07:39
_ramok _ikke_: so i'm now in the folder of the submodule, if i do a git fetch and after that a git merge origin/master it gives me "Already up-to-date", but that's not true07:39
the code is stille the old one07:39
thiago _ramok: I'm pretty sure it is true07:39
it's your expectation that is wrong07:39
→ giallu joined07:40
_ramok thiago: than i didn't get it fully... if i'm looking at the code, i'm missing three parts07:40
→ subhojit777 joined07:40
thiago _ramok: I'm sure there are things missing, but git is also working fine07:40
_ramok: so we must conclude that you told git to do something and it did work perfectly.07:41
_ramok: except that you told it to do something that is not what you wanted07:41
_ramok: where are you seeing those three parts that should be present?07:41
← angelsl left07:41
_ramok if i look into my repository, i see other code than i see in my current local code. what i try to achieve is to get the latest code into this submodule07:42
_ikke_ _ramok: latest code from where?07:42
← MissionCritical left07:42
thiago _ramok: do you have two local repositories?07:42
_ramok: do a git log on both. Is it the same commit at the top?07:43
_ramok _ikke_: from my repository. i have a web gui, and the code i see there for the specific file, looks different than the code on my server07:43
→ blurrr joined07:43
→ adamben joined07:43
← adamben left07:43
→ adamben joined07:43
thiago _ramok: confirm that the URL for the remote is correct in your server07:43
_ikke_ _ramok: did you just do "git fetch"?07:44
thiago _ramok: does it point to the URL for the web UI?07:44
← jcao219 left07:44
thiago and what _ikke_ said07:44
← revyd left07:46
→ mishok13 joined07:46
_ramok thiago: i'm not really sure how to read that git log07:47
thiago does the repository in the server have the correct URL for its remote?07:47
→ aspotashev joined07:47
← kerrick left07:47
→ kerrick joined07:47
_ramok how od i get this URL? git log just show me, the same commits if i'm in my project folder /main and in the submodules folder /main/src/submodule07:47
thiago git remote -v07:48
let's forget submodules for a moment07:48
← d2dchat left07:48
← resmo__ left07:48
thiago there's a repository that contains the code you want. Go to that and type: git remote -v.07:48
is the URL correct?07:48
← hafeez3000 left07:49
_ramok thiago: they are pointing both to the same url.07:49
thiago both? that means there are two repositories07:49
correct?07:49
_ramok no07:50
i have a main project that i checked out07:50
thiago then where did "both" come from?07:50
_ramok this is called /main07:50
thiago ok07:50
← jwmann left07:51
_ramok and if i go to the submodules in /main/src/submodule and do a git remote -v than i get the same url07:51
thiago as I said, forget submodules07:51
there's just one repository: the one that contains the checkout that you want07:51
the one where the "three parts" are missing07:52
_ramok okay07:52
thiago git remote -v in it. Is the URL correct?07:52
_ramok i'm in this folder, but i don't have any .git folders there07:52
no07:52
thiago ok, so we have found a problem07:52
→ jwmann joined07:53
thiago you haven't cloned the repository yet07:53
clone it07:53
_ramok into the same folder?07:53
→ angelsl joined07:53
→ aisbaa joined07:53
thiago is that the folder for the submodule?07:53
_ramok i'm in /main/src/submodule , and i sould do a git clone <git-to-the-submodule-repo>07:54
yes07:54
thiago have you run the git submodule commands that do the cloning?07:54
→ Mission-Critical joined07:54
_ramok you mean git submodule init and git submodule update ?07:54
thiago yes07:54
← thyseus left07:54
_ramok i thought i did...07:54
it's a longer time ago07:54
should i run them again?07:55
thiago yes07:55
← arietis left07:55
_ramok from the folder where i'm currently in? /main/src/submodule07:55
thiago no, from the top of the super module's repository07:55
_ramok yes, it says: You need to run this command from the toplevel of the working tree.07:56
thiago: i did a git submodule init, and after that a git submodule update, and get now: fatal: destination path 'main/src/submodule' already exists and is not an empty directory. Clone of 'xxxx' into submodule path 'main/src/submodule' failed07:57
thiago _ramok: there's your problem07:57
_ramok so should i delete the submodule folder?07:57
→ gjaldon joined07:58
thiago or move it away somewhere else07:58
it's up to you07:58
→ mastro joined07:59
thiago and now I'm off to bed07:59
_ramok thank you07:59
→ thyseus_ joined07:59
→ BadProphet joined08:00
→ suy joined08:02
Mission-Critical → MissionCritical08:02
← jdunck left08:03
← aspotashev left08:03
← Turicas left08:03
← mfn left08:03
← thiago left08:03
→ aBound joined08:04
← mastro left08:05
→ tPl0ch joined08:05
← Goplat left08:05
→ mfn joined08:06
→ whitman_ joined08:07
← aetcore left08:07
aBound Howdy all, where's a good place to learn Git?08:07
jast !doc08:09
gitinfo A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.08:09
← shruggar left08:09
jast plus, of course, we can probably answer any questions that come up08:09
← o] left08:10
aBound !book08:10
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable08:10
aBound jast, I gotcha thanks for the info.08:10
jast good luck! :)08:10
→ o] joined08:11
← BadProphet left08:12
← kerrick left08:12
→ aetcore joined08:13
→ tida joined08:13
→ diegovio1a joined08:13
← Error404NotFound left08:13
→ JohnBat26 joined08:14
← diegoviola left08:14
diegovio1a → diegoviola08:15
← ninegrid left08:15
→ timj joined08:15
aBound :)08:17
← timj1 left08:17
→ mastro joined08:18
→ bux joined08:19
← Pugnax left08:20
→ ninegrid joined08:20
→ jlopez joined08:21
← subhojit777 left08:21
← ninegrid left08:22
→ ninegrid joined08:25
→ Error404NotFound joined08:26
← Cassiel left08:27
← Sigma left08:29
→ laurav joined08:29
← tida left08:29
→ mastroWork joined08:31
→ Sigma joined08:32
← aBound left08:32
→ Xizor joined08:33
← mastro left08:34
→ Katafalkas joined08:34
→ blami_ joined08:34
→ BiggFREE joined08:37
→ BadProphet joined08:38
→ psoo joined08:38
← _ikke_ left08:40
→ rchavik joined08:40
← rchavik left08:40
→ rchavik joined08:40
→ mastro__ joined08:41
→ subhojit777 joined08:41
← mastroWork left08:41
→ _ikke_ joined08:42
→ jkremser joined08:44
← Sky[x] left08:44
→ holden247 joined08:45
← OOPMan left08:46
← pantsman left08:48
→ RaceCondition joined08:49
← BadProphet left08:49
→ hafeez3000 joined08:50
→ kladze joined08:50
→ mastroWork joined08:52
← mastro__ left08:52
→ dsirijus joined08:52
← fsvehla left08:52
→ JDuke128 joined08:53
← JohnBat26 left08:54
→ JohnBat26 joined08:55
JDuke128 hey , how can i combine git commits? i have same project on my windows and mac machine.Both of them have different changes.I want to combine the changes08:56
how*08:56
?08:56
FauxFaux JDuke128: Isn't that what 'pull' does, from the most basic workflow?08:57
← flijten left08:57
JDuke128 i ve same project and same classes on both pc08:57
but if i do push 108:57
another will replace other's codes08:57
FauxFaux That's why I didn't say "push".08:58
JDuke128 i don't want to replace some classes08:58
on other08:58
→ martinjlowm-lapt joined08:58
→ thierryp joined08:58
FauxFaux So, if you cna't even concieve what git is going to do here, it doesn't matter; take backups, do whatever you think you can with git, then fix it afterwards.08:58
→ shruggar joined08:59
→ zeppo joined08:59
JDuke128 how can i backup 1 and other before mix09:00
git stash ?09:00
FauxFaux Well, if you don't trust git, I'd suggest using something that's not git.09:00
← hafeez3000 left09:01
← JohnBat26 left09:02
→ mastro__ joined09:02
→ LimeBlast joined09:02
→ xpen joined09:02
JDuke128 i think my mistake is i edited same files on different machines09:03
right?09:03
it turned into spaghetti09:03
FauxFaux No, that's absolutely perfectly fine and expected.09:03
→ icio joined09:03
JDuke128 edit same codes?09:04
→ kerrick joined09:04
← mastroWork left09:05
FauxFaux Yep.09:05
→ sisyphus joined09:07
→ lausi joined09:07
← dreiss left09:07
→ hafeez3000 joined09:07
→ dc5ala joined09:08
imachuchu JDuke128: so you have 2 commits, that may conflict, between a windows box and a mac box, right?09:08
← maleknet left09:09
→ eijk joined09:11
← matip left09:11
→ matip joined09:11
→ mastroWork joined09:12
← BiggFREE left09:14
→ _Qman joined09:14
← mastro__ left09:15
→ BadProphet joined09:16
→ JohnBat26 joined09:17
→ mikecmpbll joined09:17
← lausi left09:18
→ marhaban joined09:18
→ diget joined09:19
→ xiangfu joined09:19
→ klj613 joined09:20
← sisyphus left09:21
→ mastro__ joined09:22
← mastroWork left09:22
→ zenx joined09:24
The-Compiler Can I somehow automatically prepend a string to all commit messages I've ever made in a repo?09:24
_ikke_ The-Compiler: look at man git filter-branch09:25
gitinfo The-Compiler: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html09:25
The-Compiler gah, I guess I need to get sed first, since this is a windows system09:27
FauxFaux I think git ships with some sed implementation.09:28
← BadProphet left09:28
The-Compiler just noticed as well, just wasn't in my PATH09:28
→ AdrienBrault joined09:29
→ robotmay joined09:31
← xnox left09:32
→ fsvehla joined09:33
→ maleknet joined09:34
← JDuke128 left09:34
→ herdingcat joined09:37
→ AlexC_ joined09:37
→ mystMan joined09:38
AlexC_ G'morning09:38
→ evildmp joined09:38
mystMan Morning09:38
→ jargon joined09:38
AlexC_ I'm a little confused regarding .gitattributes and line endings. We want to ensure that all text files (php,html,css etc etc) all have LF line endings. Am I correct in thinking that "*.php text=auto" is what we need?09:38
→ flijten joined09:38
mystMan I have a shared repo at ##.##.##.###:/repos/repo.git and I want to add a local project to that repo. How do I add a local repo to the bare repo on the server09:39
_ikke_ AlexC_: yes09:40
AlexC_ Thanks _ikke_ :)09:40
→ mastroWork joined09:41
← PaulCapestany left09:41
→ Hounddog joined09:42
← aetcore left09:43
← mastro__ left09:44
→ achadwick joined09:44
← fsvehla left09:46
→ jsegura joined09:47
→ fsvehla joined09:48
← narfnarfnarf left09:49
← Sigma left09:50
SeoZ → SeoZ-work[AWAY]09:50
→ chussenot joined09:51
→ Sigma joined09:52
→ oo_miguel joined09:52
oo_miguel Can I somehow revert doing "git fetch"09:52
← sluther left09:52
FauxFaux Which of the operations that it does would you like reverted?09:52
oo_miguel the merge09:53
FauxFaux git fetch doesn't merge.09:53
← jackh left09:53
oo_miguel so what does it do?09:53
→ narfnarfnarf joined09:53
oo_miguel I thought it pulls the remote branch and merges it with the current one09:53
FauxFaux Update remote tracking branches, and ensure you have the related data.09:53
jast it updates the remote-tracking branches in remotes/<name of remote>09:53
FauxFaux You must be thinking of 'pull'.09:54
oo_miguel oh sorry09:54
jast pull is fetch+merge. fetch is pull-merge :)09:54
→ mastro__ joined09:54
→ Desproges joined09:54
oo_miguel so I did a pull and want to reverse the merge :)09:54
→ Element9 joined09:54
oo_miguel sorry for confusion09:54
jast have you pushed the merge yet?09:54
oo_miguel I did but it was rejected09:55
jast oh, good09:55
→ BadProphet joined09:55
jast reverting a merge that has been published is messy business09:55
→ reenignEesreveR joined09:55
jast did you commit anything else after the merge completed?09:55
oo_miguel "non-fast-forward" updates were rrejected09:55
no09:55
jast right09:56
reenignEesreveR in my repo i have a utils.py file. On a cloned repo i dont have the utils.py. when i do a "git pull", it says "already updated" but doesn't pull utils.py file. what am i doing wrong?09:56
jast do you have any uncomdo you have any uncommitted changes?09:56
(whoops)09:56
← mastroWork left09:56
oo_miguel I have 9 uncommited changes and 1 unmerged path09:56
after the merge09:57
jast reenignEesreveR: probably utils.py was never added/committed to the repository09:57
oo_miguel: that indicates the merge never actually completed09:57
reenignEesreveR jast, i can see it on the web interface of bitbucket09:57
jast so you're still in a semi-broken merge in progress09:57
reenignEesreveR: is the repo public?09:57
oo_miguel Can I somehow abort the process?09:58
reenignEesreveR jast, no. the repo is private09:58
jast oo_miguel: yes, but some of your uncommitted changes might disappear... git merge --abort09:58
oo_miguel I have a direcotry that I never commit, that is in my tree (With some user-generated-content)09:58
will this dissappear?09:58
→ ak5 joined09:59
ak5 any way to checkout a tag without creating a branch?09:59
jast oo_miguel: untracked dirs should be fine10:00
lb ak5: git checkout <tag>10:00
← BlindOracle left10:01
← herdingcat left10:01
← xpen left10:01
→ BlindOracle joined10:01
reenignEesreveR what happens if i do a "rm somefile; git pull" ... will i get back somefile?10:01
← fsvehla left10:01
oo_miguel Its fine, thank you jast, however It seems I have an outdated version of git, since I hat do user git reset --merge. Still it worked, thank you very much10:02
→ mastroWork joined10:02
jast reenignEesreveR: no10:02
← hafeez3000 left10:02
jast reenignEesreveR: 'git status' would tell you how to get the file back10:02
← maleknet left10:03
← riker2000 left10:03
→ fsvehla joined10:03
reenignEesreveR thanks jast :)10:03
→ riker2000 joined10:04
← chaiz left10:04
← cirwin left10:04
The-Compiler I have a big project in an SVN repo on our company SVN server, and a local, linear git-repo with a smaller project. Now I'd like to move the smaller project to the SVN server in a subfolder of the bigger project, while also having the whole git history converted to svn. Is this possible? I tried using git-svn but it did ignore the older commits10:05
← mastro__ left10:05
← imachuchu left10:06
← riker2000 left10:06
cbreak-work The-Compiler: yes, it is possible10:06
→ strk joined10:06
cbreak-work make a directory in svn10:07
then git svn clone it10:07
→ riker2000 joined10:07
cbreak-work then rebase your git history onto that commit10:07
strk can I merge remote/something to something without changing current working tree ?10:07
cbreak-work and git svn dcommit it10:07
strk (how)10:07
cbreak-work strk: no, obviously not10:07
← BadProphet left10:07
cbreak-work unless you use -s ours10:07
→ mastro__ joined10:07
cbreak-work which is not really a merge10:07
← riker2000 left10:08
← mastroWork left10:08
← hyperair left10:08
strk I've a repo A that has upstream as remotes, and repo B being a clone from A10:08
basically I want to get changes in B without changing A's checked out sources10:08
maybe I don't really need a merge10:09
just a way to reference A's remote-tracking branches from B10:09
to fetch from10:09
cbreak-work fetching doesn't change working dirs10:09
oposomme → oposomme|away10:09
← Industrial left10:10
strk to complicate the thing the "remote" in A is an SVN repo10:10
← fsvehla left10:10
← david2lin left10:10
← netj left10:11
cbreak-work git svn fetch10:11
→ netj joined10:11
strk that part is done10:11
cbreak-work that will update A10:11
then fetch A in B10:11
you'll probably have to fetch explicitly10:12
strk --all didn't bring in anything new10:12
cbreak-work of course not10:12
← rednaks left10:12
cbreak-work as I said: you have to fetch explicitly10:12
strk uhm10:12
git fetch origin svn-1.510:12
cbreak-work if you want to fetch remote tracking branches10:13
strk it seems it has worked10:13
cbreak-work git ls-remote origin10:13
those are the things you can fetch10:13
only things that start with /refs/heads are local branches and are fetched normally10:13
if you want something else you have to do it yourself10:14
strk refs/remotes/1.5 <--- sounds like this one is the remote (svn-bound)10:14
→ fsvehla joined10:14
strk git-svn could have choosen a better name for an svn-tracking branch :/10:14
cbreak-work (you can also change the fetch spec of the remote in .git/config)10:14
it did10:14
→ hafeez3000 joined10:15
cbreak-work it should be remotes/trunk or so10:15
strk yeah, for trunk, but for the "2.0" branch, it is "remotes/2.0"10:15
cbreak-work well... blame the person who picked that name10:16
← sgronblom left10:16
→ maleknet joined10:17
→ LekeFly joined10:18
← docai left10:20
→ JDuke128 joined10:20
→ mastroWork joined10:21
→ tsdh joined10:21
→ daniel_- joined10:22
← zenx left10:22
→ the_cybersphinx joined10:23
← mastro__ left10:23
← maleknet left10:24
ak5 lb: thanks for that. I am now doing git checkout -f <mytag>, but then I want to switch back to whatever was HEAD before, can I do that?10:24
← ak5 left10:26
← fsvehla left10:26
→ fsvehla joined10:27
→ riker2000 joined10:28
← reenignEesreveR left10:29
→ berserkr joined10:30
← jdyin left10:31
→ glennpratt joined10:33
→ BadProphet joined10:33
→ zenx joined10:36
← luc__ left10:38
← fsvehla left10:39
→ fsvehla joined10:41
cbreak-work ak5: just check out a branch10:42
→ PaulCapestany joined10:42
← BadProphet left10:44
← bmcorser_ left10:44
→ ravenzz joined10:44
ravenzz hello10:44
→ bmcorser joined10:45
→ Innocentus joined10:46
ravenzz how do I merge a subbranch?10:47
lb ravenzz: what it a subbranch10:47
s*10:47
ravenzz a branch of a branch10:47
like I have master -> foo -> bar10:48
FauxFaux Exactly the same way as any other branch.10:48
ravenzz I want to merge bar10:48
eheh that's what I thought10:48
lb ravenzz: git checkout master; git merge bar10:48
ravenzz but after the rebase, I can't see the commits on bar10:49
when I do git glog10:49
lb ravenzz: so your question is not how to merge, rather than where is my stuff after a rebase?10:49
→ devsharpen joined10:49
FauxFaux You've just said three different things; try again, this time without saying "merge" when you mean "rebase", and "bar" when you mean "master".10:49
lb ravenzz: please !repro10:49
gitinfo ravenzz: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.10:49
ravenzz http://pastie.org/540052910:50
the next step would have been git merge bar (from foo)10:51
co is an alias of checkout obviously10:52
← PaulCapestany left10:52
← fsvehla left10:52
→ pfFredd joined10:54
→ fsvehla joined10:54
esc what would be the best way to check if something is a git repo?10:55
git rev-parse w/o args?10:55
FauxFaux ls-remote it.10:55
← rchavik left10:55
esc FauxFaux: need local10:56
_ikke_ git rev-parse --is-inside-work-tree?10:56
→ volta joined10:57
esc _ikke_: I suppose, but things like git log will work also if you are not in the work-tree10:58
← fisted left11:00
→ fisted joined11:01
→ xiukun_ joined11:01
→ echo-area joined11:02
← xiukun left11:02
← eletuchy left11:02
→ rednaks joined11:02
_ikke_ There are more options11:03
→ nelk joined11:03
→ tinti joined11:04
esc i reckon the rev-parse w/o args and options will be fine11:05
→ maleknet joined11:06
← zdk left11:08
← fsvehla left11:09
← boombatower left11:10
→ fsvehla joined11:11
→ BadProphet joined11:12
→ pfFred joined11:13
← fsvehla left11:13
← pfFredd left11:14
→ afuentes joined11:15
← mva left11:15
← jargon left11:17
← mikecmpbll left11:17
→ mikecmpbll joined11:18
_ikke_ That would give an error when not in a repo11:18
→ PaulCapestany joined11:18
← mgedmin left11:19
→ mgedmin joined11:19
→ tiglog joined11:19
→ hotovson joined11:19
← AlexC_ left11:20
→ mastro__ joined11:22
→ flavius joined11:23
← BadProphet left11:23
→ dougsland joined11:23
→ pfFreddd joined11:25
→ caddoo joined11:25
← mastroWork left11:25
← juvenal left11:26
← Xizor left11:27
← pfFred left11:27
→ juvenal joined11:29
← PaulCapestany left11:29
→ ampz joined11:29
← ravenzz left11:29
← ampz left11:30
lb is it possible to override the git pull command on a local git installation? like an alias or something?11:30
gitinfo set mode: +v11:31
_ikke_ lb: Not within git itself11:31
FauxFaux Not really. Technically you could replace the binary in the exec dir.11:31
If you just want to turn rebase on, there's a setting.11:31
→ pfFredd joined11:31
lb so i could move the binary to something else and create a symlink there instead?11:31
FauxFaux: i want to forbid using git pull :D11:31
FauxFaux Why?11:32
← Chib left11:32
→ eletuchy joined11:32
→ pfFred joined11:33
→ mklappstuhl joined11:33
lb because my co-worker messed up twice using it. i wanna FORCE him to use git fetch and merge manually11:33
_ikke_ remove the executable bit of the push binary11:33
lb _ikke_: oh that's a nice solution ;)11:34
but you meant pull right? ;)11:34
_ikke_ yeah11:34
← pfFreddd left11:34
lb ok thanks11:35
← pfFredd left11:36
← gjaldon left11:37
→ mastroWork joined11:38
← matip left11:39
→ bauruine joined11:39
← oposomme|away left11:40
→ oposomme joined11:40
← dsirijus left11:41
← mastro__ left11:41
→ fsvehla joined11:45
→ canttouchthis joined11:48
canttouchthis to not track anything under /dist i just add /dist in .gitignore right?11:48
FauxFaux Yes. Which you obviously tried. And it didn't work. So what now?11:48
_ikke_ That only prevents things like git status to show them as untraced, and git add to add the accidentally11:48
untracked*11:49
canttouchthis so how do I really ignore it11:49
FauxFaux !config11:49
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas11:49
canttouchthis how do I gitignore a directory?11:50
← hafeez3000 left11:50
FauxFaux The same way as files. But, gitignore does not, cannot, never will, and shouldn't apply to tracked files.11:50
→ BadProphet joined11:50
_ikke_ You either care about them, and track them, you you don't care about them, and don't track them11:53
→ griotspeak joined11:54
→ chaiz joined11:55
→ PaulCapestany joined11:55
→ Ryback_ joined11:55
← fsvehla left11:56
→ hafeez3000 joined11:58
→ hyperair joined11:58
→ fsvehla joined11:59
→ pfFreddd joined12:00
→ fsvehla_ joined12:00
→ OOPMan joined12:01
← BadProphet left12:02
→ tvw joined12:02
← pfFred left12:03
← maleknet left12:03
← fsvehla left12:03
→ pfFredd joined12:04
← sangi left12:04
← pfFreddd left12:04
→ dvsharp joined12:05
← devsharpen left12:05
← fsvehla_ left12:05
→ leandrosansilva joined12:05
← PaulCapestany left12:06
← chussenot left12:06
→ fsvehla joined12:07
→ gavin_huang joined12:07
← oposomme left12:08
→ jargon joined12:09
→ fsvehla_ joined12:10
→ ben__duyujie joined12:10
← AdrienBrault left12:10
→ hinst joined12:12
cinderblock → cinderblock_away12:12
← fsvehla left12:12
fsvehla_ → fsvehla12:12
→ mva joined12:13
← ben__duyujie_ left12:14
← hmsimha left12:15
← shruggar left12:15
→ crocket joined12:15
→ maleknet joined12:16
← fsvehla left12:17
← hyperair left12:17
→ barq joined12:18
→ fsvehla joined12:18
→ TeamColtra joined12:19
← griotspeak left12:19
← JDuke128 left12:20
← liquid-silence left12:20
← fsvehla left12:23
→ fireglow joined12:25
→ ben__duyujie_ joined12:26
← ben__duyujie left12:27
→ gusnan joined12:28
→ dnivio joined12:28
← glennpratt left12:28
→ mentero joined12:28
← ben__duyujie_ left12:28
→ BadProphet joined12:28
→ picoguy joined12:29
→ AdrienBrault joined12:29
→ fsvehla joined12:29
→ infynyxx joined12:30
→ PaulCapestany joined12:32
← daniel_- left12:34
← ojacobson left12:34
← pfFredd left12:37
→ Anubisss_ joined12:37
← dhruvasagar left12:38
← mikecmpbll left12:39
← BadProphet left12:40
← Anubisss left12:40
→ mikecmpbll joined12:40
← fsvehla left12:41
→ riker2000_ joined12:41
→ Moult joined12:42
← PaulCapestany left12:42
Moult hey all - i work with a team of architects and I'm considering introducing some form of version control. has anybody had any experience using git with (large, very large) binary projects?12:43
← marthinal left12:45
← riker2000 left12:45
→ daniel_- joined12:45
→ chimay joined12:45
_ikke_ Moult: git is not very suited for large binary files12:46
← babilen left12:47
← dropdrive left12:47
_ikke_ If the binaries aren't too big, and the size of the repo is not really a concern, it might be doable12:47
← jgoss left12:47
← mastroWork left12:48
Moult nah, we regularly work with stuff which can easily grow to several hundred MB.12:48
← kukks left12:48
_ikke_ The biggest problem is the packing part12:50
→ babilen joined12:50
_ikke_ With large files, memory can get a problem12:50
→ JDuke128 joined12:51
→ marthinal joined12:51
→ hyperair joined12:52
→ dropdrive joined12:52
← marhaban left12:52
→ Anders_J joined12:53
→ iamjarvo joined12:54
Moult _ikke_: it's a pity :(12:54
← daniel_- left12:54
m1sc Moult: !large12:54
gitinfo Moult: [!large_repos] Git can be slow in the face of large repositories. There are git-config options which can help. pack.threads=1; pack.deltaCacheSize=1; pack.windowMemory=512m; core.packedGitWindowSize=16m; core.packedGitLimit=128m. Other likely ones exist.12:54
m1sc Moult: also !annex12:55
gitinfo Moult: git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media12:55
_ikke_ but annex doesn't versions files iirc12:55
→ glennpratt joined12:57
→ cannonball joined12:57
← tplaner_ left12:57
→ shruggar joined12:58
← Esa_1 left12:58
→ JaredMiller joined12:59
← psoo left12:59
→ |Freeman| joined12:59
→ geekbri joined13:01
← glennpratt left13:03
← flijten left13:03
Moult _ikke_: hmm, what do you mean by "doesn't version files"?13:03
→ mastroWork joined13:05
→ glennpratt joined13:05
→ Imaginativeone joined13:06
→ BadProphet joined13:07
→ cedeon joined13:07
→ kukks joined13:07
← kukks left13:07
→ kukks joined13:07
_ikke_ "With git-annex, git is instead "a stupid filename and metadata" tracker."13:08
→ sisyphus joined13:08
← sisyphus left13:09
→ PaulCapestany joined13:09
_ikke_ But I could be wrong13:09
← flavius left13:09
← robbyoconnor left13:09
← notVert left13:10
→ lilleman joined13:10
lilleman When I get this:13:10
# Your branch and 'origin/master' have diverged,13:10
# and have 1 and 1 different commit(s) each, respectively.13:10
How can I force my local to use the remotes commit and scrap the local one?13:11
FauxFaux git stash && git checkout -B master 'master@{u}'13:11
← xiukun_ left13:11
← pretty_function left13:11
→ jpjacobs joined13:11
→ rath-work joined13:11
Moult _ikke_: yes, which is completely fine for binaries.13:12
well, git-annex looks very, very cool. i'm going to try it out13:12
jast depends on your use case13:12
jpjacobs Hi! Is there an oposite to git diff, I'd like something to show correspondances instead of differences...13:12
→ cakehero joined13:12
← canttouchthis left13:13
← JDuke128 left13:13
FauxFaux jpjacobs: That's a very odd request.13:13
(Please explain further.)13:14
→ chussenot joined13:14
jpjacobs So I have 2 versions of a piece of code (horribly written in a horrible language)13:14
And I'd like what stayed the same between 2 branches13:14
or commits, whatever13:15
FauxFaux If it's all in the same file, you can use git diff -99999913:15
← mastroWork left13:15
lilleman FauxFaux: error: unknown switch `B'13:15
jpjacobs hmmm i'll give it a try13:15
thanks13:15
← mikecmpbll left13:15
FauxFaux git diff -U 9999 apparently13:15
lilleman: You must have a ludicrously outdated version of git.13:16
lilleman git version 1.7.2.513:16
→ storrgie joined13:16
_ikke_ Yup, outdated13:16
→ phaidros joined13:16
← mgedmin left13:16
jast here's an alternative, assuming the stash command already went through: git reset --hard '@{u}'13:17
FauxFaux Mmm, I'd've guessed it was available by then.13:17
← iamjarvo left13:17
phaidros how come a git clone seems always g-w? and, is there a standard way to fix that for all those who want a default g+w permission? (applies only to the top directory of the git repo it seems)13:17
FauxFaux phaidros: man git init --shared13:17
gitinfo phaidros: the git-init manpage is available at http://jk.gs/git-init.html13:17
lilleman FauxFaux: I'm running Debian 6, and use apt-get to install and maintain git. I guess they're a bit paranoid :)13:17
phaidros FauxFaux: yeha, thanx.13:18
← BadProphet left13:18
← hafeez3000 left13:18
_ikke_ lilleman: debian is very conservative with updated versions13:18
updating*13:18
That versions is two years old13:18
lilleman _ikke_ and FauxFaux: Thanks! git reset --hard '@{u}' worked13:19
now, what does '@{u}' actually mean?13:19
and yeah, debian isnt fastest... but its stable :)13:19
← infynyxx left13:19
← PaulCapestany left13:19
FauxFaux lilleman: man git rev-parse13:20
gitinfo lilleman: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html13:20
_ikke_ @{upstream}13:20
→ infynyxx joined13:20
FauxFaux lilleman: A usable version is in backports. :)13:20
lilleman Thanks guys!13:20
← meLon left13:20
lilleman while I have you on the line13:20
Is there a way to force git not to compress before sending/receiving?13:21
I have a very slow ARM-box I'd like to use13:21
but its to slow for some large repos13:21
(3Watts power usage \o/ )13:21
← storrgie left13:21
_ikke_ raspberry pi?13:21
lilleman no, a bubba from excito13:21
_ikke_ oh ok13:21
lilleman its super awsome in all ways.. except raw CPU power13:22
← bauruine left13:22
← alunduil left13:22
← LekeFly left13:24
← echo-area left13:25
→ luc_ joined13:25
← ergZay left13:26
→ hafeez3000 joined13:26
→ sgambino joined13:27
→ mastroWork joined13:28
→ tewecske joined13:30
→ elsewho joined13:31
← mklappstuhl left13:32
← JaredMiller left13:34
→ storrgie joined13:35
→ griotspeak joined13:35
→ JaredMiller joined13:36
← rurufufuss left13:36
← angelsl left13:36
→ angelsl joined13:36
→ xiukun joined13:37
→ m0ltar joined13:37
← Imaginativeone left13:40
← subhojit777 left13:40
← martinjlowm-lapt left13:40
→ daniel_- joined13:41
← intripoon left13:42
→ revagomes joined13:43
← mastroWork left13:43
→ intripoon joined13:43
→ sq-one joined13:43
← barq left13:44
→ mklappstuhl joined13:45
→ ojacobson joined13:46
→ PaulCapestany joined13:46
→ mikecmpbll joined13:47
← xiukun left13:48
← mentero left13:49
→ near joined13:49
→ flijten joined13:51
← hyperair left13:52
← hafeez3000 left13:54
← JSharpe_ left13:54
→ JSharpe_ joined13:55
→ hyperair joined13:55
→ skyf joined13:55
→ mastroWork joined13:56
← griotspeak left13:56
→ oposomme joined13:56
← PaulCapestany left13:57
→ Bass10 joined13:57
← near left13:57
→ sideone joined13:57
→ freeed joined13:57
← polaco left13:58
← Bass10 left13:58
→ hellopat joined13:58
→ Bass10 joined13:58
→ pandeiro joined13:59
← OOPMan left14:01
← skul left14:03
← mastroWork left14:05
← strk left14:06
→ mastroWork joined14:07
→ griotspeak joined14:07
← luc_ left14:08
← heytrav left14:09
← blurrr left14:09
→ rmr joined14:09
← DofLeFou left14:09
→ macabre joined14:10
← narfnarfnarf left14:11
→ mastro__ joined14:14
← mastroWork left14:14
→ d2dchat joined14:15
← kladze left14:16
→ rmr_ joined14:16
← RaceCondition left14:16
← rmr left14:16
→ cmn joined14:17
→ bauruine joined14:18
← notfunk left14:18
→ alunduil joined14:18
→ notfunk joined14:18
→ hafeez3000 joined14:19
→ martinjlowm-lapt joined14:20
← alunduil left14:20
→ alunduil joined14:20
→ AaronMT joined14:22
→ PaulCapestany joined14:23
→ schmiddy joined14:23
→ senior75151 joined14:24
→ mastroWork joined14:25
← senior75151 left14:25
→ flavius joined14:26
→ rotated8 joined14:26
← rotated8 left14:26
← mastro__ left14:28
→ asaaki joined14:29
← asaaki left14:29
→ invariant joined14:30
→ asaaki joined14:30
← asaaki left14:30
invariant After a git clone <url> and cd ing to the directory and then doing git status shows there are a lot of 'Modified ' files. I have never seen it do that.14:31
_ikke_ invariant: Most likely line ending problems14:31
→ asaaki joined14:31
← asaaki left14:31
→ jatt joined14:31
invariant _ikke_, is there any solution to that?14:32
← rmr_ left14:32
← jceb left14:33
_ikke_ first check if it's true14:33
what does git diff show14:34
← PaulCapestany left14:34
→ pfFredd joined14:34
invariant _ikke_, yes, that's it.14:34
_ikke_, so, what I want is on clone for files for certain file types, it should simply convert from whatever upstream has to my native representation and when sending patches out, it should convert to the upstream version.14:35
← fireglow left14:35
→ Goles joined14:35
_ikke_ invariant: Look at man gitattributes14:35
gitinfo invariant: the gitattributes manpage is available at http://jk.gs/gitattributes.html14:35
_ikke_ invariant: the text attribute14:36
Goles Hey guys, I'm getting this message on a repo submodule, 'fatal: reference is not a tree: d4a9143245d80db0eebeecefca0ed38d39ceb88f' , what could be going on here ? ( The folder of the submodule appears to be empty)14:36
invariant _ikke_, and which setting do I want to have?14:37
_ikke_ Goles: It means the repo doesn't have that 'tree'14:37
Goles: Someone forgot to push changes to the submodule14:37
invariant: auto14:37
Goles _ikke_: I think I foun out how to solve the issue14:37
→ polaco joined14:38
→ jceb joined14:38
← surfdue left14:39
_ikke_ Goles: good14:39
→ Neptu joined14:39
→ surfdue joined14:40
← martinjlowm-lapt left14:40
→ Davey joined14:40
→ Aartsie joined14:41
Aartsie Are here some dutch git users who can help me ?14:41
← macabre left14:41
ryanneufeld → ryanneufeld|away14:41
invariant _ikke_, I added in the [core] section text=auto14:42
→ JDuke128 joined14:42
invariant _ikke_, this had no observable effect.14:42
_ikke_, after another clone.14:42
_ikke_, or rather, before.14:42
_ikke_ invariant: gitattributes is something different14:43
invariant: It's a separate file14:43
← jceb left14:43
← frogonwheels left14:43
_ikke_ namely, .gitattributes14:43
invariant _ikke_, it wasn't simple enough to use it?14:43
→ bartek joined14:44
_ikke_ invariant: what?14:44
invariant _ikke_, I just don't understand how anyone could have implemented a clone command that modifies data.14:45
_ikke_, what were they thinking?14:45
← Antisoche left14:45
→ Antisoche joined14:46
→ chuckharmston joined14:46
_ikke_ It's not modified on clone, but on checkout14:46
← AdrienBrault left14:46
invariant _ikke_, I did a clone and I see that there are modifications.14:46
← elsewho left14:46
_ikke_ Yes14:46
invariant: clone does a checkout ;)14:47
The problem is mixed case in the repo14:47
← bartek left14:47
→ bartek joined14:47
→ asaaki joined14:47
← chuckharmston left14:47
← maleknet left14:47
→ chuckharmston joined14:47
invariant _ikke_, how can I fix this once and for all?14:48
_ikke_, so, not just for one repo?14:48
→ m0viefreak joined14:48
_ikke_ invariant: fix all line endings and commit that, use a gitattributes file to make the setting the same for all users14:48
← tiglog left14:48
_ikke_ invariant: Problems occur when people use different settings14:48
invariant _ikke_, you are suggesting that I should commit something upstream which will modify all of the files?14:49
→ x82_nicole joined14:49
invariant _ikke_, it's likely a person who works on Windows. Do you really think that he/she is going to accept UNIX line endings?14:49
→ TeckniX joined14:49
_ikke_ invariant: Either that, or disable normalisation at all14:49
→ AdrienBrault joined14:50
← soee left14:50
_ikke_ see also core.autocrlf14:51
in man git config14:51
gitinfo the git-config manpage is available at http://jk.gs/git-config.html14:51
→ newbie999|3 joined14:51
← newbie999 left14:52
← marthinal left14:52
→ syskk_ joined14:54
← syskk_ left14:54
→ syskk_ joined14:54
→ narfnarfnarf joined14:54
← Sigma left14:54
→ macabre joined14:54
← Goles left14:55
→ BadProphet joined14:55
invariant _ikke_, I already had that set.14:55
_ikke_, it has now become a guessing game.14:56
→ jceb joined14:56
invariant _ikke_, I asked how I can get git clone foo to get me in a state where a subsequent git status will not show any modifications.14:56
_ikke_ invariant: unset that and do a git reset --hard14:57
syskk_ → syskk14:57
← oposomme left14:57
← BadProphet left14:57
→ Imaginativeone joined14:58
invariant _ikke_, it looks like there was already a .gitattributes file in the repo.14:58
_ikke_, if there is this auto modification, why does git status list it as a difference?14:59
_ikke_, it's supposed to be an equivalence relation.14:59
As such, git status should return no output.14:59
← Tegi left15:00
→ BadProphet joined15:00
→ mastro__ joined15:00
→ PaulCapestany joined15:00
_ikke_ Because there is a difference between what git checks out, and what git expects to be checked out15:01
(different settings conflicting basically)15:02
→ mgedmin joined15:02
mgedmin git has the most awesome command-line UI ever15:02
(in case you didn't know)15:02
invariant mgedmin, awesomely bad?15:02
_ikke_ mgedmin: Not all people agree to you15:02
^^15:03
invariant mgedmin, please explain why I need to care about line endings in the output of git status after a git clone.15:03
← mastroWork left15:03
invariant mgedmin, I don't want to care about that.15:03
Nobody on this planet wants to care about that.15:03
← bartek left15:03
→ bartek joined15:04
_ikke_ invariant: git sees a difference, so it reports that15:04
invariant _ikke_, but it's told in the configuration that it should auto convert.15:04
← Imaginativeone left15:04
invariant _ikke_, as such it should use this equivalence relation.15:04
← Araxia left15:04
mgedmin hey, don't take my joy in autopaging and colorization away from me15:04
invariant Or at least any guy who isn't brain dead would have designed it like that.15:05
Yes, I picked those words on purpose :)15:05
→ Araxia joined15:05
_ikke_ invariant: I guess you are very narrow minded and only looking at it from your perspective15:05
→ GeertB joined15:05
_ikke_ It all looks too easy from the outside15:06
until you need to implement things15:06
invariant _ikke_, that's because it is.15:06
_ikke_, I implemented enough and much more complex things.15:06
_ikke_, git is a trivial program.15:07
_ikke_ invariant: eol conversion is a constructive operation15:07
destructive*15:07
meaning it can't be inverted15:07
invariant _ikke_, and who said it had to be implemented like that?15:07
_ikke_, it's just bad design.15:07
→ erichynds joined15:07
_ikke_ invariant: It is setting you can opt-in for15:07
invariant The git code is also rather bad.15:07
→ andrewhl joined15:07
invariant I am sure that it is fast.15:07
It's however not meant to be understood by others.15:08
→ fletch` joined15:08
← jpjacobs left15:08
_ikke_ git is complex system15:08
invariant The command line tools also do not check what effect they have on the world.15:08
_ikke_ It's not expected that it's easily understood15:08
invariant Example, I had 3 times15:08
[core] in my configuration file.15:08
→ mikepack joined15:08
← mikepack left15:09
invariant These are, I assume, completely useless.15:09
← hakunin left15:09
lb invariant: http://www.youtube.com/watch?v=4XpnKHJAok8 < linus on git15:09
_ikke_ oh and, !refund applies15:09
gitinfo If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.15:09
← Araxia left15:09
invariant lb, I had seen it and I am not impressed, sorry.15:09
→ witul joined15:09
→ hakunin joined15:09
invariant lb, the world moved on.15:09
lb, git was fun when svn was still being used.15:09
lb invariant: you shouldn't be. he does not intended to make the source good looking15:09
→ OOPMan joined15:10
→ Araxia joined15:10
← witul left15:10
invariant lb, that's ok, but then I can say that I am not overly impressed with the program.15:10
→ tdowg12 joined15:10
→ joshsmith joined15:10
lb invariant: of course. but what do YOU intend with that?15:10
← PaulCapestany left15:10
← tdowg12 left15:10
_ikke_ invariant: I don't think very much people care about you being impressed15:11
invariant lb, someone was saying that git had the best UI ever or something like that.15:11
→ chaiz_ joined15:11
→ jday_ joined15:11
→ tdowg12 joined15:11
_ikke_ invariant: And that person is entitled to that opinions15:11
-s15:11
invariant _ikke_, sure15:12
← chaiz left15:12
→ h0bbit joined15:12
→ Destos joined15:12
→ axl_ joined15:13
← hakunin left15:13
→ Sigma joined15:14
← banghouse3 left15:14
→ marhaban joined15:15
_ikke_ invariant: You said you had an example with config$?15:15
?15:15
→ v0n joined15:15
invariant _ikke_, I have no idea what you are talking about.15:15
_ikke_ invariant | Example, I had 3 times15:16
invariant _ikke_, the configuration file contained 3 empty [core] sections.15:16
_ikke_ And do you have a clue what you did that it got there?15:17
as git is software, it's not without bugs15:18
→ etcetera joined15:18
→ martinjlowm-lapt joined15:19
FauxFaux The proxy configuration script going around here just appends to the .gitconfig each time you run proxyOn or proxyOff. /o\15:19
_ikke_ lol15:20
FauxFaux personally just rewrites all urls to .ssh/config handled things.15:20
← h0bbit left15:21
← Innocentus left15:21
← sakkemo left15:23
→ sakkemo joined15:23
→ rgrau joined15:24
← sakkemo left15:25
→ sakkemo joined15:25
← xiangfu left15:26
invariant _ikke_, if someone is going to tell the rest of the world is fucking stupid, they should better deliver something which isn't fucking stupid themselves.15:26
← pfFredd left15:26
cmn you should tell that to whoever said it15:26
rgrau hi. I just found out that "git checkout -" will mimic shells' "cd -", which is great. My question is: is there a way to see which is the branch that "git checkout -" will bring you to, without moving there?15:27
→ e66 joined15:27
→ chaiz__ joined15:27
← lilleman left15:27
rgrau It'd be great for smarter autocompletion15:27
_ikke_ rgrau: man git reflog probably15:28
gitinfo rgrau: the git-reflog manpage is available at http://jk.gs/git-reflog.html15:28
→ dreiss joined15:28
rgrau aha, yup, makes sense. thanks!15:29
← chaiz_ left15:29
→ rmr joined15:30
← chaiz__ left15:30
← Bass10 left15:30
→ chaiz joined15:30
rgrau yay, something like => %git reflog | grep 'moving from' | head -n1 | sed -e 's/.*moving from .* to \(.*\)$/\1/'15:32
:)15:32
→ mastroWork joined15:32
rgrau blerh, but capturing the other one (¬¬)15:33
← TeckniX left15:33
→ TeckniX joined15:34
← d2dchat left15:34
← daniel_- left15:34
→ chrisgeorge joined15:35
← mastro__ left15:35
→ dnstbr joined15:36
← poolshark left15:37
→ PaulCapestany joined15:37
→ thiago_ joined15:37
← TeckniX left15:38
→ Imaginativeone joined15:38
→ defts joined15:38
← m0ltar left15:40
→ TeckniX joined15:41
← m0viefreak left15:42
← Anders_J left15:43
← griotspeak left15:45
← dreiss left15:46
→ dreiss joined15:46
← |Freeman| left15:46
← mikecmpbll left15:47
← PaulCapestany left15:48
← JDuke128 left15:48
← joshsmith left15:49
← syskk left15:51
← kermit left15:51
← evildmp left15:51
→ JDuke128 joined15:51
← hafeez3000 left15:52
← tg left15:52
← _ramok left15:53
→ kermit joined15:53
← Error404NotFound left15:54
→ d2dchat joined15:54
→ Err404NotFound joined15:54
← zoned left15:54
→ zoned joined15:55
← adamben left15:55
← renan_sa` left15:56
→ joshsmith joined15:57
← TeckniX left15:57
→ TeckniX joined15:58
← martinjlowm-lapt left15:58
→ ejd joined15:58
← friskd left15:59
→ a_ok joined15:59
→ leandrosansilva_ joined15:59
← leandrosansilva left16:00
→ hafeez3000 joined16:00
← whitman_ left16:00
→ PaulCapestany joined16:00
→ rmr_ joined16:00
→ ergZay joined16:00
← rmr left16:01
a_ok I am maintaining some JS for two separate content management systems. How do I merge changes from one into the other without overwriting the CMS specific stuff?16:01
→ axl__ joined16:01
→ R_Macy joined16:01
→ tg joined16:01
→ maleknet joined16:01
_ikke_ a_ok: !config16:01
gitinfo a_ok: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas16:01
← giallu left16:02
→ mastro__ joined16:02
→ p3rror joined16:02
← axl_ left16:03
← bauruine left16:04
→ gittish joined16:04
← mastroWork left16:05
← ergZay left16:05
→ axl_ joined16:05
← flijten left16:05
← Neptu left16:06
→ Goles joined16:06
← axl__ left16:06
← sq-one left16:06
← tg left16:06
thiago_ → thiago16:07
a_ok _ikke_: It is not a config file it is code that is similar but has quite some differences. Not commiting the changes is not an option16:07
→ chrisgeorge_ joined16:07
→ conner_bw joined16:07
→ guampa joined16:08
_ikke_ a_ok: And having per site different files that overrides default settings?16:08
a_ok nope16:08
Ow there are different settings but they are not in git16:09
← gavin_huang left16:10
← chrisgeorge left16:10
a_ok there are different DOM elements etc the js has to work on etc.16:10
← axl_ left16:10
← xxc_michael left16:10
→ liquid-silence joined16:11
← liquid-silence left16:11
→ liquid-silence joined16:11
← Katafalkas left16:11
← papegaaij left16:11
→ axl_ joined16:11
a_ok I already had it covert pretty much by setting up the most basic version first and than branch of the other CMS. but as soon as I change a line in the more basic version that is different in the complex version I can't merge the changes anymore16:12
_ikke_ I would really recommend to put such changes in different untracked files16:12
← sgambino left16:12
← liquid-silence left16:12
→ ehsan joined16:12
→ sgambino joined16:12
← Milossh left16:12
← cbreak-work left16:13
→ Milossh joined16:13
→ elsewho joined16:13
→ tg joined16:14
elsewho hello16:14
can i undo the last pull?16:14
cmn !fixup16:14
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!16:14
← angelsl left16:14
→ angelsl joined16:14
→ iamjarvo joined16:14
a_ok Don't think that is an option. That would be the same as having two completely diferent codebases. Guess I just can't merge my differences anymore unless16:14
→ liquid-silence joined16:16
← liquid-silence left16:16
→ liquid-silence joined16:16
← laurav left16:16
← conner_bw left16:16
← axl_ left16:16
← jargon left16:17
← liquid-silence left16:17
← tsdh left16:18
→ alexwaters joined16:19
← oo_miguel left16:19
→ friskd joined16:19
→ reenignEesreveR joined16:19
← Imaginativeone left16:20
← maleknet left16:20
← Aartsie left16:20
← gittish left16:21
← philips_ left16:22
→ senior75151 joined16:22
→ blurrr joined16:22
→ axl_ joined16:22
← senior75151 left16:22
→ chaiz_ joined16:22
← fisted left16:23
← jokajak left16:24
← chaiz left16:24
→ maletor joined16:24
→ jokajak joined16:25
← jceb left16:26
→ philips_ joined16:26
← Hounddog left16:26
← hyperair left16:27
← jatt left16:28
← Goles left16:28
← maletor left16:28
← chaiz_ left16:29
→ chaiz_ joined16:30
→ axl__ joined16:30
← volta left16:31
→ ergZay joined16:31
← axl_ left16:31
axl__ → axl_16:31
→ torjus_ joined16:31
→ brtdv joined16:32
← rath-work left16:32
← schmiddy left16:33
→ schmiddy joined16:34
→ Anubisss__ joined16:34
← TomWij left16:34
→ intripoon_ joined16:34
frew wishes github supported gitolite style wildrepos16:35
→ renoc__ joined16:35
→ TomWij_ joined16:35
← JSharpe_ left16:35
← diegoviola left16:35
frew git clone gh:frioux/new-repo # win!16:35
← chaiz_ left16:35
← the_cybersphinx left16:35
→ the_cybersphinx joined16:35
→ chaiz_ joined16:36
← AdrienBrault left16:36
← tinti left16:36
← intripoon left16:36
← thiago left16:37
→ tinti joined16:37
← Anubisss_ left16:37
← storrgie left16:39
← reenignEesreveR left16:40
→ jhutson456_ joined16:40
jhutson456_ I seem to be frozen and need some advice. I was following the guide here: http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup16:41
cinderblock_away → cinderblock16:41
jhutson456_ correction, here: http://git-scm.com/book/en/Getting-Started-Installing-Git16:41
→ LekeFly joined16:41
← mastro__ left16:41
← SamB_MacG5 left16:42
← chaiz_ left16:42
jhutson456_ I got git 1.8.0 built from the source tar ball16:42
→ giallu joined16:42
← jlopez left16:43
→ SamB_MacG5 joined16:43
→ Xizor joined16:43
jhutson456_ then cloned the git source and attempted to build from the git cloned repo to make sure I was on the newest version out there and saw this "If you're willing to trade off (much) longer build time for a later16:43
faster git you can also do a profile feedback build with" then the appropriate commands16:43
← angelsl left16:43
jhutson456_ I decided that that would be a good trade off for me, and issued the first command of the two: $ make prefix=/usr PROFILE=BUILD all16:44
wereHamster jhutson456_: there is usually no reason to build git from the git repo. Just use the release tarballs16:44
jhutson456_ ok16:45
→ RaceCondition joined16:45
← axl_ left16:46
jhutson456_ well, the question is, it ran that command for a while, probably 30 minutes (tar build in about 30 seconds) and then stopped here "ok 106 - README.html with non-ASCII characters (utf-8)"16:46
→ axl_ joined16:46
jhutson456_ and has had the "blinking cursor" terminal for about 20-30 minutes now16:46
← mishok13 left16:46
→ chaiz_ joined16:46
wereHamster which guide did tell you to run make PROFILE=.. all ?16:47
jhutson456_ that's in the INSTALL file in the / of the git repo16:47
→ daniel_- joined16:48
jhutson456_ http://pastebin.com/NenGGPZ416:48
there is the relevant (so far as I can tell) info from the install file16:48
← torjus_ left16:48
→ john_anderson joined16:49
← ergZay left16:49
jhutson456_ I just thought it'd make for a cool feature, if I can cut down build times even a bit using a longer one time method, cool, ya know? but at the same time, if it is a known negative, I'll just stick with the source tar16:50
← cenuij left16:50
← boichev left16:50
jhutson456_ but it seemed off to be stuck there for so long with no indication that it is done or continuing...16:50
→ fobban joined16:51
wereHamster jhutson456_: you're not cutting down build times if you profile16:52
just run 'make install PREFIX=/wharever/you/want'16:52
jhutson456_ hmm, what then is the advantage?16:53
wereHamster if you don't understand it, you probably shouldn't try it.16:53
ryanneufeld|away → ryanneufeld16:53
jhutson456_ fair enough16:53
→ lresende joined16:53
→ jceb joined16:54
jhutson456_ i thought the beginning info "trade off longer build for later faster git" implied that it built in a manner which resulted in faster builds.16:54
← defts left16:54
→ adamben joined16:54
← adamben left16:54
→ adamben joined16:54
← john_anderson left16:55
← joshsmith left16:55
← kukks left16:56
→ Imaginativeone joined16:56
← dsantiago left16:56
→ Hounddog joined16:56
→ kukks joined16:56
jhutson456_ thank you for the info wereHamster , it's appreciated :-)16:56
→ john_anderson joined16:56
jhutson456_ redoing with the traditional "make" "make install" simple method16:57
← dc5ala left16:57
→ rehat joined16:58
→ joshsmith joined16:58
← jceb left16:58
→ dsantiago joined16:59
jhutson456_ yep, that worked lightening fast, thanks again16:59
→ knapper_tech joined16:59
← irqq left16:59
← JDuke128 left16:59
knapper_tech does checking out a branch have the same effect of checking out an individual file when it comes to deleting files?17:00
← chaiz_ left17:00
← RaceCondition left17:00
→ heytrav joined17:00
knapper_tech morning typing...17:01
← schmiddy left17:01
knapper_tech does checking out a branch revert changes to the branch?17:01
→ _iron joined17:01
← d2dchat left17:01
jast if you use 'git checkout branch', n17:01
o17:01
→ hyperair joined17:01
knapper_tech i did a pull and a lot of south migration files went missing17:01
← icio left17:02
knapper_tech i'll go ask on south17:02
← infynyxx left17:02
← axl_ left17:04
← cedeon left17:04
← variousnefarious left17:04
wereHamster pull will never delete untracked files, nor destroy uncommitted changes17:05
knapper_tech yeah....that's what i'm confused about17:05
after i pulled, i was in the other branch somehow17:05
checked out both branches17:05
no migrations17:06
→ variousnefarious joined17:06
knapper_tech had 0037-0046... in the folder. at most I had committed them but not pushed them.17:06
← alexwaters left17:06
← zeppo left17:07
→ axl_ joined17:08
→ d2dchat joined17:08
→ mentero joined17:08
← d2dchat left17:09
→ barq joined17:09
→ boombatower joined17:09
← dnstbr left17:10
← aisbaa left17:10
→ d2dchat joined17:10
→ flijten joined17:11
→ fisted joined17:12
fisted → Guest1387617:12
→ jceb joined17:12
← friskd left17:12
→ tbrock joined17:13
← d2dchat left17:13
← albel727 left17:13
← ThomasLocke left17:13
→ albel727 joined17:13
→ attila_work joined17:14
→ LeMike joined17:14
← LeMike left17:14
→ LeMike joined17:14
← LeMike left17:14
→ LeMike joined17:15
← LeMike left17:15
← Guest13876 left17:15
← john_anderson left17:15
→ infynyxx joined17:16
→ bitkiller joined17:16
→ john_anderson joined17:17
→ dnstbr joined17:17
→ aantix joined17:18
→ LeMike joined17:18
knapper_tech nm, i had a fresh pull of the repo i was working with and everything was safe and lost17:18
→ maletor joined17:18
→ fisted_ joined17:18
→ Bass10 joined17:19
→ friskd joined17:19
→ volta joined17:20
← tbrock left17:21
→ ergZay joined17:22
← TeckniX left17:22
jhutson456_ ok, one more question before bed. If I clone a repo, and start making edits to it to make it how I like, then the parent project updates something, I'm able to pull those changes into my project correct?17:22
← tPl0ch left17:23
jhutson456_ (still terribly new to git, and reading through git pro but not yet that far and need to know)17:23
← chussenot left17:23
EugeneKay jhutson456_ - you're able to merge them in, yes.17:23
→ laurav joined17:24
→ d2dchat joined17:24
EugeneKay If there are conflicts between their changes and yours you will need to resolve them17:24
jhutson456_ thank you EugeneKay17:24
← flavius left17:24
→ TeckniX joined17:25
← fobban left17:26
← laurav left17:26
jhutson456_ is there a "Git Pro" type resource for "repo" (used with the Android code)17:26
→ laurav joined17:26
→ rampantmonkey joined17:27
→ gregm joined17:27
→ Shusshu joined17:28
bremner I don't think so. Whatever there is would be from google, at a guess.17:28
← Shusshu left17:28
← rampantmonkey left17:28
EugeneKay No, docs for repo are poor at best.17:28
jhutson456_ bummer, thank you17:28
← Layke left17:29
→ spaceonline joined17:29
← LimeBlast left17:30
← afuentes left17:31
→ bauruine joined17:31
→ rakm joined17:31
← rakm left17:31
← klj613 left17:32
→ rakm joined17:32
← rakm left17:32
→ rakm joined17:33
← rakm left17:33
→ rakm joined17:33
← rakm left17:33
→ rakm joined17:34
← john_anderson left17:34
→ ShadeTornado joined17:34
→ TheJH joined17:34
→ pfFredd joined17:34
→ jn_ joined17:34
← bartek left17:35
→ brettster joined17:35
→ bartek joined17:35
← ShadeTornado left17:35
→ ShadeTornado joined17:35
← lresende left17:36
← ShadeTornado left17:37
→ Sarah joined17:37
→ ShadeTornado joined17:37
→ irqq joined17:37
→ john_anderson joined17:37
→ Synthead joined17:38
← Synthead left17:39
→ chaiz joined17:39
→ Synthead joined17:39
← infynyxx left17:40
→ nbari joined17:40
→ rob_w joined17:41
→ infynyxx joined17:41
→ sfalcon joined17:41
→ hakunin joined17:41
→ maleknet joined17:41
→ irqq_ joined17:41
← rakm left17:42
→ arietis joined17:43
→ leeN joined17:43
→ hobodave joined17:43
→ camt joined17:43
← jsegura left17:44
← dnivio left17:44
← irqq left17:44
← suy left17:46
→ torjus_ joined17:46
← d2dchat left17:46
← attila_work left17:46
→ friskd_ joined17:47
kermit how is it that diff origin has differences, yet ive pushed and pulled?17:47
Sarah Hello, I've been having some problems with setting up a git repository on my server. All I have to do is "git init", then, on the client-side, just follow this ( https://help.github.com/articles/create-a-repo ), right? FOllowing that, I get this weird error: http://pastebin.com/6pb5iFMu , and I have no idea where it comes from, nor what it means. Any help would be appreciated.17:48
kermit oh origin defaults to a different branch?17:48
← mentero left17:49
FauxFaux origin probably means origin/HEAD; nobody really uses it so I don't know what it means. Consider '@{u}'.17:49
← friskd left17:49
friskd_ → friskd17:49
← cyphase left17:50
← blami_ left17:51
← ergZay left17:51
← bux left17:52
← maleknet left17:53
→ opus joined17:53
→ legumbre_ joined17:53
→ ShooterMG joined17:54
← asaaki left17:54
→ thiago_ joined17:55
← Desproges left17:55
→ lresende joined17:56
← tvw left17:58
← nbari left17:59
← john_anderson left17:59
→ john_anderson joined18:00
→ jcao219 joined18:01
← jkremser left18:01
→ revyd joined18:02
→ AdrienBrault joined18:03
← Vert left18:05
← rmr_ left18:05
← friskd left18:06
→ henryC joined18:07
→ friskd joined18:07
← friskd left18:07
→ cyphase joined18:08
← arvind_khadri left18:08
← shruggar left18:08
henryC I just migrated my sites and my repos from fedora to ubuntu, and in the process, my remotes that I called "hub" are now called "origin". This is fine but can someone help me understand what really happened then?18:09
cmn you cloned...18:09
← jwmann left18:09
→ jwmann joined18:09
← bgerber left18:09
← dnstbr left18:09
→ ergZay joined18:09
→ robustus joined18:10
henryC so since I cloned on a new machine, fresh git install, it took "origin" as default I guess?18:10
_ikke_ henryC: yes18:10
henryC thanks18:10
_ikke_ Has nothing to do with fresh git install though18:10
just clone18:10
henryC oh18:10
_ikke_ The remotes are stored in .git/config18:11
and they don't get copied on clone18:11
← ninegrid left18:11
henryC I see that's what I was trying to figure out / learn... thanks18:11
→ bgerber joined18:12
← gmarseliss left18:13
→ project2501b joined18:13
→ ninegrid joined18:14
← Hounddog left18:17
← torjus_ left18:17
← LeMike left18:17
→ m0ltar joined18:18
← holden247 left18:18
← JohnBat26 left18:19
→ marthinal joined18:20
→ mishok13 joined18:22
→ JSharpe_ joined18:24
← ninegrid left18:25
Vampire0_ → Vampire018:28
← renoc__ left18:28
→ lresende_ joined18:28
thiago_ → thiago18:29
← achadwick left18:30
← lresende left18:31
→ JohnBat26 joined18:31
→ axl__ joined18:32
← lresende_ left18:32
→ floppyears joined18:32
→ ninegrid joined18:33
→ robbyoconnor joined18:33
← JohnBat26 left18:34
← axl_ left18:34
axl__ → axl_18:34
← JoeAngel_ left18:35
→ siert joined18:35
← chaiz left18:35
← bauruine left18:36
← siert left18:36
← eletuchy left18:36
← hafeez3000 left18:36
← bitkiller left18:37
→ Chillance joined18:37
→ pfFred joined18:37
← robbyoconnor left18:37
cinderblock → cinderblock_away18:37
→ swiety joined18:38
← timj left18:38
→ minusthetiger joined18:38
→ shruggar joined18:39
→ rvl joined18:39
← a_ok left18:39
← irqq_ left18:40
← thierryp left18:40
← pfFredd left18:40
← ShooterMG left18:40
← tavisto left18:41
→ jdunck joined18:42
← Imaginativeone left18:42
← pfFred left18:42
→ cviebrock joined18:42
→ pfFred joined18:43
← elsewho left18:44
← shruggar left18:45
→ cebor joined18:46
← bgerber left18:47
→ bux joined18:47
← flijten left18:48
← daniel_- left18:49
← cviebrock left18:50
→ Dreamer3 joined18:51
← marhaban left18:51
→ bgerber joined18:51
→ Goplat joined18:53
← berserkr left18:54
← zenx left18:55
→ icio joined18:56
← TheJH left18:56
→ TheJH joined18:56
→ d2dchat joined18:56
→ shruggar joined18:58
→ rgsteele joined18:58
→ daniel_- joined18:58
← OOPMan left18:59
← fletch` left19:01
→ cenuij joined19:01
← cenuij left19:01
→ cenuij joined19:01
← d2dchat left19:02
→ TML joined19:02
→ ShooterMG joined19:03
← shruggar left19:04
← chimay left19:05
→ afuentes joined19:05
← Ryback_ left19:05
→ flijten joined19:06
→ hafeez3000 joined19:06
→ bauruine joined19:08
← john_anderson left19:08
→ Sky[x] joined19:08
→ john_anderson joined19:10
→ berserkr joined19:10
→ mentero joined19:10
→ dnivio joined19:11
← sideone left19:12
→ lresende joined19:12
← TML left19:13
→ Sonderblade joined19:13
→ Neptu joined19:14
EugeneKay Sarah - the error message means exactly what it says: the remote repository is a non-bare one, so it won't let you push into the checked-out branch.19:15
→ lresende_ joined19:15
← lresende left19:15
lresende_ → lresende19:15
→ OOPMan joined19:15
EugeneKay Sarah - what you want to do, on your server, is 'git init --bare'. Note that if you're trying to !deploy there is some extra work19:16
gitinfo Sarah: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html19:16
→ pfFreddd joined19:16
EugeneKay henryC - 'origin' is the default remote name, in the same way that the default branch is called 'master'. I recommend using meaningful names for both of these instead(eg, 'github' and 'stable')19:17
→ dangerousdave joined19:17
← BadProphet left19:17
Sarah EugeneKay, yup, I got it to work, thanks.19:17
← bux left19:18
← pfFred left19:18
← e66 left19:19
→ BadProph_ joined19:19
→ pfFred joined19:21
← pfFreddd left19:21
← flijten left19:23
← jcao219 left19:23
henryC EugeneKay: Thanks. I'll have to give the naming some more thought.19:23
ryanneufeld is there such thing as a recursive push?19:24
→ alexim joined19:24
_ikke_ nope19:24
← cebor left19:24
← sirdancealot left19:27
→ pfFreddd joined19:27
→ mastro joined19:27
→ elixer joined19:27
← BadProph_ left19:27
→ bowikaxu_ joined19:28
→ irqq joined19:29
← pfFred left19:30
→ dnstbr joined19:30
→ pogo joined19:30
← bowikaxu_ left19:30
→ eletuchy joined19:31
→ tm512 joined19:32
→ dsantiag_ joined19:34
← dpino left19:34
← brettster left19:35
← dsantiago left19:35
← volta left19:35
→ sluther joined19:36
→ hwrd|work joined19:36
→ tenmilestereo joined19:37
→ Korrakoj joined19:37
← etcetera left19:37
CareBear\ man gitweb19:38
gitinfo the gitweb manpage is available at http://jk.gs/gitweb.html19:38
→ etcetera joined19:38
← TomWij_ left19:39
→ TomWij joined19:39
← dnivio left19:39
← leandrosansilva_ left19:40
← caddoo left19:40
CareBear\ Single URL for gitweb and for fetching says that /HEAD /info /objects /refs need to not go into gitweb, for single URL gitweb+fetch19:41
no objections to that?19:42
← pfFreddd left19:42
→ dnivio joined19:43
→ rayrod2030 joined19:44
rayrod2030 when doing a git svn rebase/git pull origin master/git push origin master how do you avoid a often occurring push spamming the github commit logs?19:45
so of course I'm planning on running this rebase and pull/push on a cron timer.19:46
← blurrr left19:46
→ blurrr joined19:47
← hotovson left19:48
→ arnihr joined19:49
milki just doesnt pay attention to the public history19:50
arnihr I'm seeing weird behavior, I'm executing something like this: ssh user@remote "cd repo; git fetch; git reset --hard origin/master"19:51
FauxFaux arnihr: !deploy19:51
gitinfo arnihr: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html19:51
arnihr and it's creating a repo/local in which the origin/master code is located19:51
→ friskd joined19:51
→ shruggar joined19:51
FauxFaux arnihr: And you don't think there's a "local" folder in the master branch?19:52
arnihr FauxFaux: there isn't one19:52
FauxFaux Oh yes there is!19:52
→ |Freeman| joined19:52
arnihr I'm lost. How so?19:52
the entire tree will reside inside the "local" folder19:52
no such folder exists in the remote19:52
FauxFaux The command you've written looks fine, which normally means that git is right. :)19:53
arnihr haha19:53
I know :)19:53
I've done this before19:53
and it worked just fine19:53
now however...19:53
I love this deployment page, thanks for that :-)19:53
I just don't understand why it's doing this19:54
doesn't matter if I reset --hard or checkout -f19:54
the updated code will always be in "repo/local"19:55
instead of just in the repo19:55
← maletor left19:56
→ Iuz joined19:57
arnihr now my command looks like this: cd repo; unset GIT_DIR; git fetch; git reset --hard origin/master19:57
← warthog9 left19:57
arnihr and local folder has symlinks into the folder below19:57
→ maletor joined19:57
arnihr it's quite bizarre19:57
→ eletuchy_ joined19:58
← lresende left19:58
→ timj joined19:59
ojacobson this is a fascinating documentary about cargo-cult debugging20:00
how about shelling into the remote host and running a few commands? 'git fetch; git show-ref' and 'git status' are probably good starts.20:00
→ warthog9 joined20:00
ojacobson (And pasting the results in eg. gist.github.com for us to see -- verbatim, if possible)20:00
← eletuchy left20:01
← Sigma left20:02
→ aetcore joined20:02
← narfnarfnarf left20:04
← tinti left20:04
→ Mode-M_ joined20:04
← erichynds left20:05
← blurrr left20:05
→ m0viefreak joined20:09
← o] left20:10
→ alee___ joined20:10
→ sg83 joined20:10
→ epicfail joined20:11
→ o] joined20:11
← epicfail left20:13
← JPeterson left20:13
→ ihateyouall joined20:13
ihateyouall hi, how do i say to git "screw all i changed and overwrite it with the newest origin master" ?20:14
← axl_ left20:14
ciaranm reset --hard20:14
_ikke_ ihateyouall: git reset --hard origin/master20:14
← hellopat left20:15
← sg83 left20:15
→ hellopat joined20:16
→ sirdancealot joined20:16
← camt left20:17
ihateyouall _ikke_, i changed files i never committed. after the reset --hard my local changes are gone?20:17
_ikke_ ihateyouall: yes20:18
ihateyouall: That's what you said you wanted20:18
→ gtrak joined20:18
FauxFaux And this, children, is why I tell people to run git stash && git checkout -B master origin/master20:18
Because then you can never fuck it up. Please stop recommending reset.20:18
Ever.20:18
→ thelodger joined20:18
ihateyouall _ikke_, it was what i wanted. Worked! thx man20:19
← chuckharmston left20:19
jast I always explain exactly what'll happen whenever I recommend some form of reset20:19
plus, as we discovered today, git in debian stable doesn't have -B20:19
wereHamster FauxFaux: if someone wants to screw all his changes, then reset --hard *is* the right command20:20
_ikke_ checkout -B?20:20
ihateyouall FauxFaux, git reset was EXACTLY what i wanted20:20
← prettyrobots left20:20
FauxFaux Totally not worth the risk.20:21
ihateyouall FauxFaux, i committed the changes i wanted permanent and the rest i just restted after20:21
→ camt joined20:21
← m0ltar left20:21
FauxFaux I still strongly recommend using stash in that case.20:21
jast stash is way overused IMO20:21
I use it maybe once every few months20:22
the only thing that occasionally forces it on me is rebase20:22
← aetcore left20:23
ihateyouall FauxFaux, i understand why u recommend git stash but in this case => im a noob and i need it as simple as possible20:23
so reset20:23
ojacobson ihateyouall: you're a noob, so you need to be kept from blowing your feet off on our advice if we misunderstood what you wanted :)20:23
jast the only relevant difference at this point is that stashing things can be undone20:24
ojacobson we're all lucky this time around but honestly the stash solution means we can get your changes back if you didn't actually want what we heard you say you want20:24
→ aspotashev joined20:24
→ rampantmonkey joined20:24
→ prettyrobots joined20:24
ihateyouall jast, i understand that20:24
well in my case i changed 1 line of code i wanted to be permanent (the one i committed before) so there would not be much harm20:25
→ doc|work joined20:25
jast note that you said you wanted to have everything overwritten with the origin's master? that would entail destroying your commit, too, would it not?20:26
← polaco left20:26
← hinst left20:26
jast 'git reset --hard origin/master' says: throw away all uncommitted changes, make the current branch exactly the same (i.e. same commit history) as origin/master, and gimme the corresponding files20:27
← rampantmonkey left20:27
→ polaco joined20:27
ihateyouall jast, arr sry wrong word... i pushed the line before i used git reset --hard20:27
jast now, throwing away uncommitted changes is usually not undoable, but even if you made a mistake and eliminated a few commits by accident, we can still get them back for quite a while20:28
ihateyouall so my changed line WAS the master20:28
jast right :)20:28
← infynyxx left20:28
jast just a friendly little reminder that misunderstandings can, in fact, happen :)20:28
← zoned left20:29
jast but really, the important thing here is that --hard irrevocably destroys uncommitted stuff and most other things are pretty safe, for a certain time at least20:29
→ zoned joined20:29
← rgsteele left20:29
ihateyouall i know to be careful when i wish to delete something and maybe backup it before but i can understand (and aprechiate) that u guys try to protect not so careful users from themself20:29
← rayrod2030 left20:30
jast well, I don't recommend the stash+checkout thing. so I kind of hand out medium-risk solutions. ;)20:30
→ resmo_ joined20:31
← tm512 left20:33
ihateyouall since i am here, the channel is empty and ur so helpful: cann u save me from rtfm and tell me how to open an new branch and copy the master in it?20:33
→ infynyxx joined20:33
← hafeez3000 left20:33
ihateyouall git branch 'name' and 'git checkout' is as far as i remember20:34
→ thierryp joined20:34
cmn you pass an extra argument to tell it the base20:34
ihateyouall git checkout 'name' sure20:34
cmn which you can read from the top 10 lines on either manpage20:34
ihateyouall and after git pull origin master?20:35
cmn after what?20:35
ojacobson ihateyouall: you almost certainly want 'git fetch' followed by 'git checkout origin/master -b your-new-branch'20:35
jast all you need is: git checkout -b newbranchname20:35
← eightyeight left20:35
ojacobson or if you want to use local master rather than origin's master, skip the fetch and 'git checkout master -b your-new-branch'20:35
← Xizor left20:36
jast (if you're on master right now, that is)20:36
→ JPeterson joined20:36
jast but my lucky guess says you are ;)20:36
← hwrd|work left20:36
→ oposomme joined20:36
← ShooterMG left20:37
oposomme hi I would reset to an old revision and apply some commit between the old revision and the HEAD what is the correct workflow ?20:37
← dnstbr left20:37
jast oposomme: so basically you want to throw away all commits from back then until now, save one?20:37
← prettyrobots left20:38
ihateyouall jast, what does -b ?20:38
→ kjellski joined20:38
jast ihateyouall: creates a new branch. as explained in the manpage. :}20:39
← juvenal left20:39
→ sq-one joined20:39
← m1sc left20:39
oposomme jast: I would come back to an earlier revision but I would keep some commits between the earlier revision and now :)20:39
→ juvenal joined20:40
← juvenal left20:40
jast there are several ways. one is: git rebase -i <old base commit>; then remove all the commits you want to get rid of from the list, save and quit. safety advisory: !rewriting20:40
gitinfo [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to jump through hoops (and you have to tell them to), so it's infinitely better to just move on without rewriting. That said, you can use `git push -f` to force your new history through (may get rejected, though). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstream_rebase20:40
→ juvenal joined20:41
→ hwrd|work joined20:41
ihateyouall jast, and the origin master is copied in my new branch after?20:41
→ prettyrobots joined20:41
oposomme jast: it seems easy like this I have never use git rebase I will try thx20:41
→ m1sc joined20:41
jast ihateyouall: no, your current master is. you can choose origin/master like this: git checkout -b mynewbranch origin/master but note that git will now assume you want to merge from origin/master when you run 'git pull' without args in that branch20:42
by the way, that's quite a statement you've got there in your nickname ;)20:42
← barq left20:43
→ barq joined20:44
→ eijk_ joined20:45
← tenmilestereo left20:45
→ schlumpi joined20:45
ihateyouall jast, thats why i allways make sure that my master is the origin master before i even try to open a branch20:45
jast, my nick... yeah... guess not the rest of the world has a problem. Its me who has a problem xD20:46
← john_anderson left20:46
← m1sc left20:46
jast ihateyouall: or maybe the all that you know is not quite the same all that some of us have found20:47
→ hmsimha joined20:47
→ m1sc joined20:47
← pandeiro left20:47
← eijk left20:47
← dangerousdave left20:47
oposomme jast: I have done git rebase -i <old revision> and it doesn't seems to do a lot but I would know how do I get rid of uwanted revision?20:48
→ john_anderson joined20:48
jast oposomme: it should start an editor in which you can reorder or remove commits or do a whole bunch of other crazy things20:48
→ Imaginativeone joined20:48
jast if it didn't, I'm going to need more details as to what happened20:48
→ eightyeight joined20:49
oposomme jast: Ah ok I have just quit the editor lol ok I will kill the correct line20:49
ihateyouall jast, thx for ur help. i will continue progamming now20:49
← Imaginativeone left20:49
← Neptu left20:49
→ pantsman joined20:50
← pantsman left20:50
→ pantsman joined20:50
→ srayner joined20:50
← etcetera left20:51
oposomme jast: the job is done it's magic20:51
← dnivio left20:51
← dedis left20:52
oposomme it seems that git doesn't take care of empty directory why?20:53
cmn because it has nothing inside it20:54
→ Imaginativeone joined20:54
← ihateyouall left20:54
oposomme cmn: ok20:55
→ etcetera joined20:56
→ JEEB joined20:56
← berserkr left20:56
← marthinal left20:56
→ zivester_ joined20:56
← Sarah left20:57
→ smoothbutta joined20:59
← _iron left20:59
← zivester left20:59
→ diegoviola joined21:00
→ cebor joined21:00
← ehsan left21:00
← dsantiag_ left21:01
→ diegovio1a joined21:01
→ samuel02 joined21:02
→ Neptu joined21:03
→ Shade_Tornado joined21:04
→ ehsan joined21:04
← schlumpi left21:04
→ aBound joined21:04
← m1sc left21:05
← aBound left21:05
← kermit left21:06
→ m1sc joined21:06
← diegovio1a left21:06
→ blurrr joined21:06
→ diegovio1a joined21:06
→ martinjlowm-lapt joined21:07
← ShadeTornado left21:07
← diegoviola left21:07
alee___ → alee-21:08
← revagomes left21:08
→ ShadeTornado joined21:08
← Imaginativeone left21:08
→ aBound joined21:09
→ schlumpi joined21:10
← etcetera left21:10
← Shade_Tornado left21:10
← diegovio1a left21:11
→ axl_ joined21:11
→ berserkr joined21:11
→ yoklov joined21:13
← macabre left21:13
→ Shade_Tornado joined21:15
← Dreamer3 left21:16
← yshh left21:16
← antivert left21:16
← aBound left21:17
← geekbri left21:17
← ShadeTornado left21:18
→ etcetera joined21:18
← alee- left21:18
→ marhaban joined21:18
→ Dreamer3 joined21:19
← picoguy left21:19
→ macabre joined21:19
← mishok13 left21:20
→ alee- joined21:20
← rob_w left21:20
→ mishok13 joined21:21
→ vyvup joined21:22
← elixer left21:22
← infynyxx left21:22
← vyvup left21:23
→ Chaser joined21:23
→ infynyxx joined21:23
→ vyvup joined21:23
→ griotspeak joined21:23
← vyvup left21:23
← _Qman left21:24
← netj left21:24
→ netj joined21:24
→ tm512 joined21:26
→ kermit joined21:27
← Shade_Tornado left21:27
→ revagomes joined21:27
→ samholmes joined21:29
samholmes why do I have to enter my RSA passphrase everytime I want to push?21:29
jast well, git uses SSH for transport. if you're not using ssh-agent or anything like that, nothing remembers it for you. that's a security trade-off.21:29
if you want ssh to remember your passphrase, set up ssh-agent21:30
← cebor left21:30
jast or whatever comparable thing your platform has21:30
← skyf left21:30
→ dsantiago joined21:30
← legumbre_ left21:30
← arietis left21:30
→ nioncode joined21:31
← hwrd|work left21:31
→ vyvup joined21:31
← GeertB left21:34
→ ShadeTornado joined21:34
→ hwrd|work joined21:34
← p3rror left21:34
← Mode-M_ left21:36
← ShadeTornado left21:36
→ ShadeTornado joined21:37
mel- (or setup gpg-agent, it support the ssh-agent protocol too and has certain advantages)21:37
← Tommy[D] left21:37
→ dnivio joined21:38
← asakura left21:41
← ojacobson left21:41
→ Innocentus joined21:41
← eletuchy_ left21:42
← hoschi left21:42
← cyphase left21:47
← afuentes left21:47
→ c_melder joined21:47
← henryC left21:48
← j416 left21:48
→ Akufen joined21:48
← Akufen left21:48
→ Akufen joined21:48
← c_melder left21:49
→ melder joined21:49
melder i'm getting whitespace errors when rebasing which causes it to fail. any way to get around that?21:49
→ Tommy[D] joined21:49
← dnivio left21:50
→ rukin5197 joined21:50
→ yshh joined21:51
→ fsvehla joined21:52
← Xethron left21:54
← jtm left21:54
→ jtm joined21:54
← blurrr left21:55
← sq-one left21:55
→ cyphase joined21:55
← pantsman left21:56
→ kjellski_ joined21:56
→ asakura joined21:57
← AaronMT left21:57
← riker2000_ left21:58
→ madewokherd joined21:59
← WinstonSmith left21:59
→ riker2000 joined21:59
← kjellski left22:00
← martinjlowm-lapt left22:00
→ henryC joined22:00
← hellopat left22:01
→ arvind_khadri joined22:01
← freeed left22:01
→ martinjlowm-lapt joined22:01
← Goplat left22:01
→ leitz joined22:02
→ codeFiend joined22:02
→ WinstonSmith joined22:02
leitz Noob question. I've started a repo on github and tried to commit the added files with git commit -am "Notes". I get an error that my branch is 2 revisions ahead of the origin/master but I'm not sure what to do about that.22:03
← eightyeight left22:03
← robustus left22:04
FauxFaux leitz: That's not an error, that's information.22:04
→ Xethron joined22:05
samholmes jast: I have ssh-agent running. What do I need to do?22:06
I'm running Git Bash22:06
jast have you added your ssh key to the agent yet? try: ssh-add22:06
FauxFaux Lots of people have problems with ssh-agent on Windows.22:07
← etcetera left22:07
leitz FauxFaux, if it won't put my files up on the repo, that seems to be an error. :)22:07
FauxFaux leitz: commit doesn't put files into a remote repo, it puts them into the local repo. !book man everyday22:07
gitinfo leitz: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable22:07
leitz: the everyday manpage is available at http://jk.gs/everyday.html22:07
→ nejucomo joined22:07
eijk_ → eijk22:07
← eijk left22:10
← jceb left22:10
← cannonball left22:11
→ dangerousdave joined22:12
→ eightyeight joined22:12
← martinjlowm-lapt left22:13
← leeN left22:13
→ guillaum joined22:14
← oposomme left22:16
eightyeight sorry for the recent noise22:17
→ eletuchy joined22:17
→ drizzd joined22:17
← revagomes left22:18
→ martinjlowm-lapt joined22:19
← guillaum left22:20
→ snearch joined22:21
← eightyeight left22:21
← martinjlowm-lapt left22:23
← icio left22:23
leitz Okay, with some github help pages, changing from https to ssh, and no small amount of frustration, the git push now works. Thanks!22:23
← iamjarvo left22:24
← eqs left22:25
→ EgS joined22:25
← minusthetiger left22:25
← maletor left22:26
→ icio joined22:26
→ aetcore joined22:27
← mentero left22:28
← hwrd|work left22:28
→ drizzd_ joined22:29
→ hwrd|work joined22:30
← Element9 left22:32
→ eightyeight joined22:33
→ axl__ joined22:34
→ reenignEesreveR joined22:36
← bartek left22:36
← axl_ left22:37
axl__ → axl_22:37
→ etcetera joined22:38
← mishok13 left22:38
→ maletor joined22:38
← thierryp left22:40
← reenignEesreveR left22:40
← srayner left22:41
→ MB_Mobile joined22:41
← kvothe left22:41
← MB_Mobile left22:42
→ MB_Mobile joined22:42
MB_Mobile What is that website which helps with resetting repos? it's set up in a Q/A format22:42
mmattice stackexchange?22:43
← aetcore left22:43
MB_Mobile mmattice, no it's specific to git. I've seen it referenced here before.22:43
← swiety left22:44
→ ampz joined22:44
milki MB_Mobile: !fixup22:44
gitinfo MB_Mobile: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!22:44
MB_Mobile Thanks milki!22:44
← macabre left22:46
→ imrobert joined22:46
← MB_Mobile left22:47
→ thierryp joined22:48
← etcetera left22:48
← marhaban left22:48
← R_Macy left22:50
← ampz left22:51
← TheJH left22:51
→ p3rror joined22:51
→ etcetera joined22:53
← dangerousdave left22:53
← fsvehla left22:53
→ marhaban joined22:55
← opus left22:55
← snearch left22:57
← eletuchy left22:58
→ eletuchy joined22:58
→ Blue0ctober joined22:59
← fisted_ left23:00
← etcetera left23:00
→ FernandoBasso joined23:00
← drizzd_ left23:00
→ dnivio joined23:00
→ fisted joined23:00
→ lausi joined23:02
← lausi left23:02
← eletuchy left23:02
← cakehero left23:03
← Guest48221 left23:03
← dnivio left23:04
← v0n left23:05
← alunduil left23:05
→ ojacobson joined23:05
→ etcetera joined23:06
← kermit left23:07
← jcromartie left23:07
← infynyxx left23:10
← xp_prg left23:10
← glennpratt left23:10
→ Vile joined23:11
← dvsharp left23:11
→ fsvehla joined23:12
← TeckniX left23:14
← thierryp left23:14
← Destos left23:15
→ kermit joined23:17
← laurav left23:17
← jn_ left23:17
→ apok joined23:18
← mklappstuhl left23:19
→ eletuchy joined23:21
→ Destos joined23:23
← tm512 left23:24
← griotspeak left23:24
← bapa left23:24
→ tm512 joined23:25
→ relipse joined23:25
← ninegrid left23:25
← dvide left23:25
relipse i'm using windows23:25
wereHamster you poor soul23:26
relipse I made a folder a repo23:26
my localhost website23:26
← fsvehla left23:27
← knapper_tech left23:27
FauxFaux And?23:27
relipse now is it possible to make my other folder a copy of that repo23:27
and then pull changes from the main folder23:27
FauxFaux Isn't that what clone does?23:28
→ fsvehla joined23:28
relipse that way I can ftp it after I pull the changes?23:28
ok but the problem is the config files are different for both versions23:28
but every other file is the same23:28
do I need a branch for that?23:28
wereHamster relipse: !deploy23:29
gitinfo relipse: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html23:29
wereHamster relipse: and !config23:29
gitinfo relipse: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas23:29
→ hotovson_ joined23:29
← samuel02 left23:29
relipse umm23:29
can you help me23:29
i was thinking i can have 2 branches23:30
a localhost trunk, and a web branch23:30
← Destos left23:32
← shruggar left23:34
→ ninegrid joined23:34
→ cakehero joined23:35
← TomWij left23:38
→ avpx joined23:39
← hobodave left23:40
→ Destos joined23:40
→ TomWij joined23:41
← chrisgeorge_ left23:42
← adamben left23:42
← rukin5197 left23:43
→ hellopat joined23:44
← Xethron left23:44
→ syskk joined23:44
← syskk left23:44
→ syskk joined23:44
← dsantiago left23:44
→ Zael joined23:44
← tewecske left23:47
→ dsantiago joined23:49
→ Vert joined23:49
← hwrd|work left23:50
← ergZay left23:50
← nioncode left23:51
← cakehero left23:51
← axl_ left23:52
← jfs left23:53
← rednaks left23:53
→ cakehero joined23:53
← gtrak left23:54
← ninegrid left23:56
← x82_nicole left23:56
← fsvehla left23:58
→ theBrettman joined23:58
→ jcromartie joined23:58
→ Goplat joined23:58

Logs Search ←Prev date Next date→ Channels Documentation