| 2013-02-01 |
| → john_anderson joined | 00:00 |
| ← wongon left | 00:01 |
| → wongon joined | 00:02 |
| ← Dooom left | 00:03 |
| ← jackyalcine left | 00:03 |
| → tinocos joined | 00:03 |
| ← ehsan_ left | 00:05 |
| ← tevfik left | 00:05 |
| ← kristofers left | 00:06 |
| ← Ziggy` left | 00:06 |
| ← john_anderson left | 00:06 |
| → noisewaterphd_ joined | 00:07 |
| → marhaban joined | 00:08 |
| ← paradigm left | 00:08 |
|
xiong
| Okay, I've fixed the immediate issue with global user.name and user.email. Thanks. | 00:09 |
| → lresende_ joined | 00:09 |
| ← noisewaterphd left | 00:09 |
| noisewaterphd_ → noisewaterphd | 00:09 |
| ← thiago left | 00:09 |
| → samuel02 joined | 00:10 |
| → thiago joined | 00:10 |
| ← macabre left | 00:10 |
| ← Grum left | 00:11 |
| → Noldorin joined | 00:11 |
| → jackyalcine joined | 00:13 |
| ← dankest left | 00:13 |
| ← lresende left | 00:13 |
| → Grum joined | 00:13 |
| ← lresende_ left | 00:13 |
| ← Dactyl left | 00:14 |
| → sebuba joined | 00:14 |
| → Khisanth joined | 00:17 |
| → MacWinner joined | 00:18 |
| → rchavik joined | 00:18 |
| → breakingthings joined | 00:18 |
| ← giallu left | 00:18 |
| ← sgambino left | 00:19 |
| ← TheFuzzball left | 00:21 |
| → b2jrock joined | 00:21 |
| ← tewecske left | 00:21 |
| ← FernandoBasso left | 00:21 |
| ← Khisanth left | 00:22 |
| → dvide joined | 00:22 |
| → kermit joined | 00:22 |
| ← MacWinner left | 00:22 |
| → jcromartie joined | 00:25 |
| ← ozette left | 00:25 |
| ← snql left | 00:25 |
| ← eletuchy left | 00:28 |
| ← baneM left | 00:29 |
| → domargan joined | 00:29 |
| → cakehero joined | 00:29 |
| ← thiago left | 00:29 |
| → CodeShark joined | 00:30 |
| → v0n joined | 00:30 |
| ← jcromartie left | 00:30 |
| ← opus left | 00:30 |
| ← chisler left | 00:30 |
| ← domargan left | 00:30 |
| → Khisanth joined | 00:30 |
| → nicoo joined | 00:31 |
|
nicoo
| Hi | 00:31 |
|
gitinfo
| nicoo: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 00:31 |
| ← marhaban left | 00:31 |
|
nicoo
| I'm working on a repository, and I have two branches, master and foo | 00:31 |
| → Ziggy` joined | 00:32 |
|
nicoo
| In foo, I used git checkout -b to branch into foobar, and in foobar, I rebased all commits from master into foobar | 00:32 |
| ← hyperair left | 00:32 |
|
Fall
| am I able to stash changes in master, then change to another branch and apply them there? | 00:32 |
|
nicoo
| What is the proper way to make foobar « be » the new foo branch | 00:33 |
|
| ? | 00:33 |
| ← AnimeCYC left | 00:33 |
|
nicoo
| Fall: git cherry-pick | 00:33 |
|
| I can be used to apply a commit in another branch | 00:33 |
|
ojacobson
| Fall: yes; git stash apply and git stash pop will apply the diffs, not just the contents | 00:33 |
| ← joeytwiddle left | 00:33 |
|
Fall
| ojacobson: thank you very much | 00:33 |
|
ojacobson
| Fall: git branch -F, git reset --hard, and a few other options | 00:33 |
|
| er | 00:33 |
|
nicoo
| Ah, ok,~; staged | 00:33 |
|
ojacobson
| nicoo: ^ | 00:33 |
|
nicoo
| stashed* | 00:33 |
|
| ojacobson: I misread his question | 00:34 |
| ← boombatower left | 00:34 |
| → joeytwiddle joined | 00:34 |
|
nicoo
| ojacobson: Ok, second line was for me | 00:34 |
|
| Thanks; will read the man about git branch -F | 00:35 |
|
Fall
| thanks ojacobson, that worked. | 00:35 |
|
nicoo
| ojacobson: Will this break people that follow the foo branch ? | 00:35 |
| ← abcdefg_ left | 00:35 |
| ← michaelmartinez left | 00:36 |
| ← iSaleK left | 00:36 |
| → davidbanham joined | 00:36 |
| ← davidbanham left | 00:36 |
|
nicoo
| And did you mean « -f » ? I don't see the uppercase switch in the manpage | 00:36 |
| → davidbanham joined | 00:37 |
| ← hwrd|work left | 00:37 |
| ← lavaman left | 00:39 |
| ← edoceo left | 00:39 |
| → mrkotfw joined | 00:39 |
| ← mrkotfw left | 00:40 |
| → mrkotfw joined | 00:40 |
|
mrkotfw
| Hello everyone | 00:40 |
|
gitinfo
| mrkotfw: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 00:40 |
| → eletuchy joined | 00:40 |
| → michaelmartinez joined | 00:41 |
|
mrkotfw
| So I have a repository with a lot of commit messages that I wanted to rewrite -- don't worry, I'm the only committer. I changed the HEAD to the commit I wanted to change, I amended, then replaced that commit | 00:41 |
|
| I did that for all of them | 00:41 |
|
| When I do git log, it shows up just fine but none of that is reflected when I clone a fresh copy of the repository | 00:41 |
| ← robotmay left | 00:42 |
|
mrkotfw
| This is on GitHub, so I permanently deleted the repository, re-created it and then pushed the branch (master) to the new repository expecting all my commits that were changed to be in the remote branch | 00:43 |
|
| But it doesn't seem to work | 00:43 |
|
| Anyone know how I can go about this? | 00:43 |
| ← eletuchy left | 00:44 |
| ← Khisanth left | 00:44 |
| → yshh joined | 00:45 |
| ← x82_nicole left | 00:45 |
| ← svetlyak40wt left | 00:45 |
|
nicoo
| ojacobson: ? | 00:46 |
|
| !backup | 00:46 |
|
gitinfo
| Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups | 00:46 |
| ← lethjakman_lapto left | 00:46 |
| ← pfFredd left | 00:46 |
| → eletuchy joined | 00:46 |
| → baneM joined | 00:47 |
| ← cakehero left | 00:47 |
|
grawity
| Hmm. Why isn't `tar` listed first there?... | 00:49 |
| ← AdrienBrault left | 00:49 |
| → MacWinner joined | 00:49 |
| ← sebuba left | 00:53 |
| → timj joined | 00:54 |
| → juvenal joined | 00:54 |
|
mrkotfw
| git-rebase and forcing a git-push helps... | 00:54 |
|
| I have about 50 commits to fix... | 00:54 |
| → yshh_ joined | 00:55 |
|
nicoo
| mrkotfw: You mean you want to reword 50 commits ? | 00:55 |
| → dankest joined | 00:56 |
| ← yshh left | 00:57 |
| ← michaelmartinez left | 00:57 |
| → lresende joined | 00:57 |
| → pity joined | 00:57 |
| → Khisanth joined | 00:59 |
| ← bauruine left | 01:01 |
| ← ejd1 left | 01:01 |
| ← maestrojed left | 01:01 |
| → opus joined | 01:02 |
| → bauruine joined | 01:03 |
| ← daniel_- left | 01:03 |
| ← Khisanth left | 01:03 |
| ← opus left | 01:03 |
| → lonewulf` joined | 01:04 |
| ← lonewulf` left | 01:05 |
| → lonewulf` joined | 01:05 |
| ← imarcusthis left | 01:06 |
| ← osse left | 01:06 |
| → bakers joined | 01:06 |
| ← SamB_ left | 01:08 |
|
bakers
| I forked a repo on github. The did a git pull on my form, updated some code and did a git push request. How do I update my fork to be a copy of the original as it is today, instead of last week when I did the fork | 01:08 |
| → Khisanth joined | 01:08 |
| → SamB_ joined | 01:08 |
| → osse joined | 01:08 |
|
mrkotfw
| nicoo: Yeah, I did that. What I ended up doing was forcing a rebase and a force push | 01:09 |
|
nicoo
| bakers: Add the original as a new remote, git fetch, then git rebase <original>/<branch> | 01:09 |
|
mrkotfw
| nicoo: That did the trick | 01:09 |
| → imarcusthis joined | 01:09 |
| ← Grum left | 01:09 |
|
nicoo
| mrkotfw: It sounds like a job for rebase -i (but you will have to force push anyways) | 01:09 |
| ← yshh_ left | 01:11 |
| → Grum joined | 01:11 |
| ← _iron left | 01:11 |
| → seniorsassycat joined | 01:11 |
| → avpx joined | 01:11 |
|
seniorsassycat
| Is there a command to untrack files that match patterns in the .gitignore? | 01:11 |
| → hyperair joined | 01:12 |
| → lresende_ joined | 01:12 |
|
RandalSchwartz
| it'll make merging hard | 01:13 |
|
| since the prior commits had those tracked | 01:13 |
|
| so think hard before you type "git rm --cached" | 01:13 |
|
| doing it globally would be a bit scary | 01:13 |
| ← lresende left | 01:13 |
| lresende_ → lresende | 01:13 |
|
RandalSchwartz
| are you trying to untrack config files? | 01:14 |
| ← danishkhan left | 01:14 |
| ← Goles_ left | 01:14 |
| → tplaner joined | 01:15 |
| → cmmagid joined | 01:15 |
| ← cmmagid left | 01:15 |
| → cmmagid joined | 01:16 |
|
mrkotfw
| nicoo: That's exactly what I did | 01:17 |
| ← Grum left | 01:17 |
| ← \rs left | 01:18 |
| → Grum joined | 01:19 |
| franck → Guest97097 | 01:21 |
| → x82_nicole joined | 01:21 |
| → Parhs joined | 01:22 |
| ← Parhs left | 01:22 |
| → Parhs joined | 01:22 |
| ← howlymowly left | 01:22 |
| ← bil` left | 01:22 |
|
seniorsassycat
| It's a new repo, I made one commit before adding a .gitignore | 01:22 |
|
| The commit has log/* tracked, I'd like to stop tracking those files in the future | 01:23 |
|
ojacobson
| !untrack | 01:23 |
|
gitinfo
| 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` | 01:23 |
|
RandalSchwartz
| yeah like that | 01:23 |
|
b2jrock
| I've run a tree-filter on a large repo with many branches that took several days. In the mean time, the original repo has been changing. Is there any way to apply the same filter to the delta and append it to my filtered repo so that I get a current filtered repo? | 01:23 |
| ← Grum left | 01:24 |
|
ojacobson
| if you've made one commit _and not yet published it_ you can git commit --amend away the original addition, too :) | 01:24 |
| ← normanrichards left | 01:26 |
| → ryez joined | 01:26 |
| → danishkhan joined | 01:27 |
| → Grum joined | 01:27 |
|
ryez
| regarding things in .git/objects/pack, would 'git gc' always zip everything in only one pack after I run it? | 01:27 |
| → ezrafree joined | 01:27 |
| ← nioncode left | 01:27 |
| ← tplaner left | 01:30 |
| → Sky[x] joined | 01:30 |
| → yshh joined | 01:31 |
| ← MacWinner left | 01:31 |
| ← danishkhan left | 01:31 |
| → lethjakman_lapto joined | 01:32 |
| ← ojacobson left | 01:34 |
| → cspray joined | 01:34 |
| → m0viefreak joined | 01:35 |
| ← m0viefreak left | 01:35 |
| → m0viefreak joined | 01:35 |
| ← Xunie left | 01:35 |
| → Xunie joined | 01:36 |
| Xunie → Guest77033 | 01:36 |
| → pppaul joined | 01:37 |
| ← berserkr left | 01:39 |
| phlipper → phlipper_ | 01:40 |
|
pigeon
| is there something like git branch --contains but for looking for a particular filename? | 01:41 |
| → ojacobson joined | 01:43 |
| ← youf left | 01:45 |
|
ryez
| pigeon: with a little tweak to git log you can see all the related commits with tags/branches displayed | 01:45 |
|
| like this * 7ef1135 (HEAD, origin/master, origin/HEAD, master) | 01:46 |
| ← abf left | 01:47 |
|
ryez
| try `git log --decorate --oneline` | 01:48 |
| ← dankest left | 01:50 |
| → aartist joined | 01:52 |
| ← goshawk left | 01:52 |
| ← kimico left | 01:55 |
| → kimico joined | 01:55 |
| ← Targen left | 01:57 |
| ← dvide left | 01:57 |
| ← hiroyuki left | 01:57 |
| ← adamben left | 01:57 |
| → raspy_freenode joined | 01:57 |
| ← raspy_freenode left | 01:57 |
| → jcromartie joined | 01:57 |
| → jesfre joined | 01:57 |
| → hiroyuki joined | 01:57 |
| → Targen joined | 01:57 |
| ← eijk left | 01:58 |
| → WorkeD joined | 01:58 |
| ← guide left | 01:58 |
| → raspy_freenode joined | 01:58 |
| ← raspy_freenode left | 01:58 |
| ← timj left | 01:58 |
| → guide joined | 01:59 |
| ← main_ left | 01:59 |
| ← fletch` left | 01:59 |
| → raspy_freenode joined | 02:00 |
| ← raspy_freenode left | 02:00 |
| ← amccloud left | 02:00 |
| ← glebd left | 02:00 |
| → glebd joined | 02:00 |
| → alunduil joined | 02:01 |
| → raspy_freenode joined | 02:02 |
| ← lyang0 left | 02:04 |
| ← tinti_ left | 02:05 |
| ← Davey left | 02:05 |
| ← maletor left | 02:07 |
| ← pppaul left | 02:09 |
| ← Grum left | 02:10 |
| → maletor joined | 02:10 |
| ← ErKa left | 02:10 |
| → dvide_ joined | 02:11 |
| ← rakl left | 02:11 |
| → Goplat joined | 02:11 |
| → Grum joined | 02:11 |
| → greenfire joined | 02:12 |
| ← towski left | 02:12 |
| ← nardev left | 02:13 |
| → Davey joined | 02:13 |
| ← seniorsassycat left | 02:14 |
| ← matthias_dev left | 02:14 |
| ← dvide_ left | 02:14 |
| ← Bombe left | 02:16 |
| ← scorphus left | 02:16 |
| → jdyin joined | 02:17 |
| → Vampire0_ joined | 02:17 |
| ← fisted left | 02:18 |
| ← jackyalcine left | 02:18 |
| ← maletor left | 02:19 |
| → fisted joined | 02:19 |
| → weiyang joined | 02:19 |
| → erkules_ joined | 02:20 |
| ← Vampire0 left | 02:20 |
| ← tanath left | 02:21 |
| ← ankurankan left | 02:21 |
| ← erkules left | 02:22 |
| ← notfunk left | 02:22 |
| → jackyalcine joined | 02:22 |
| ← fisted left | 02:23 |
| ← catsup left | 02:23 |
| → catsup joined | 02:23 |
| ← markalanevans left | 02:23 |
| ← techlife left | 02:24 |
| ← mrkotfw left | 02:25 |
| → dvide_ joined | 02:25 |
| → fisted joined | 02:25 |
| → eijk joined | 02:25 |
| → miso1337 joined | 02:27 |
| ← Khisanth left | 02:27 |
| → tjbiddle_ joined | 02:27 |
| ← pivonroll left | 02:27 |
| → Bombe joined | 02:27 |
| ← catsup left | 02:28 |
| → catsup joined | 02:29 |
| ← jaequery left | 02:30 |
| ← oreth left | 02:30 |
| → techlife joined | 02:30 |
| ← tjbiddle left | 02:30 |
| → pppaul joined | 02:31 |
| ← aartist left | 02:31 |
| ← tjbiddle_ left | 02:31 |
| ← prudnikov left | 02:31 |
| ← jdyin left | 02:31 |
| ← eletuchy left | 02:34 |
| ← pppaul left | 02:34 |
| ← sayd left | 02:37 |
| ← Bosox20051 left | 02:38 |
| ← Droolio left | 02:39 |
| ← bootstrapper left | 02:39 |
| ← TLGreg left | 02:39 |
| → Khisanth joined | 02:40 |
| → dragon3_ joined | 02:41 |
| ← jackyalcine left | 02:42 |
| ← Grum left | 02:43 |
| → jackyalcine joined | 02:44 |
| ← frogonwheels left | 02:45 |
| → Grum joined | 02:45 |
| → stliu joined | 02:48 |
| ← gusnan left | 02:51 |
| ← Hounddog left | 02:51 |
| → Hounddog joined | 02:51 |
| ← fisted left | 02:52 |
| ← jesfre left | 02:52 |
| → fisted joined | 02:52 |
| → Progster joined | 02:54 |
| ← Khisanth left | 02:55 |
| ← babilen left | 02:56 |
| ← ojacobson left | 03:00 |
| → scenefinale-SATs joined | 03:01 |
| → bmac joined | 03:02 |
| → techhelp joined | 03:02 |
| → babilen joined | 03:03 |
| → eletuchy joined | 03:04 |
| ← x82_nicole left | 03:07 |
| ← njbair left | 03:09 |
| ← apok left | 03:10 |
| → amccloud joined | 03:10 |
| ← bmac left | 03:11 |
| ← amccloud left | 03:14 |
| ← eletuchy left | 03:14 |
|
scenefinale-SATs
| Question if someone has a minute | 03:15 |
| → normanrichards joined | 03:15 |
| → basmoura joined | 03:16 |
|
scenefinale-SATs
| in the git tutorial I'm reading it says git status puts files into one of three categories | 03:16 |
| ← akiress left | 03:16 |
|
scenefinale-SATs
| "Files are put in one of three categories: new files that haven’t been added (with git add), modified files that haven’t been added, and files that have been added" | 03:17 |
| → michaelmartinez joined | 03:17 |
| ← apachebeard1 left | 03:17 |
|
mehwork
| yeah | 03:17 |
| ← davidbanham left | 03:17 |
|
scenefinale-SATs
| so the categories I see are tracked and untracked... What is the third to which they are referring? | 03:17 |
| → jaequery joined | 03:17 |
|
mehwork
| staged | 03:17 |
| ← Noldorin left | 03:18 |
|
scenefinale-SATs
| ahhh | 03:18 |
|
mehwork
| in between committed and untracked | 03:18 |
|
scenefinale-SATs
| thanks mehwork | 03:18 |
|
mehwork
| to oversimplify it | 03:18 |
| → Khisanth joined | 03:18 |
| → notfunk joined | 03:19 |
| → john_anderson joined | 03:22 |
| ← miso1337 left | 03:22 |
| → davidbanham joined | 03:27 |
| → pppaul joined | 03:28 |
| ← kermit left | 03:30 |
| ← v0n left | 03:30 |
| ← infynyxx left | 03:31 |
| → miso1337 joined | 03:31 |
| ← kpreid left | 03:31 |
| → kpreid joined | 03:31 |
| → eletuchy joined | 03:33 |
| ← jdunck left | 03:33 |
| → Nibato joined | 03:38 |
| → tukkol joined | 03:42 |
| ← Progster left | 03:42 |
| ← anderse left | 03:43 |
| ← john_anderson left | 03:44 |
| ← d2dchat left | 03:44 |
| → [KinG]_Edson joined | 03:44 |
| ← avpx left | 03:44 |
| ← tukkol_ left | 03:45 |
| ← samuel02 left | 03:47 |
| → `Quote` joined | 03:47 |
|
`Quote`
| so when i'm merging and there are conflicts | 03:47 |
|
| what's the fastest way to say 'just use the file from the branch I'm merging with' | 03:47 |
| → john_anderson joined | 03:47 |
| ← techhelp left | 03:48 |
| ← Khisanth left | 03:48 |
| ← Grum left | 03:49 |
| → bootstrapper joined | 03:50 |
| → lyang0 joined | 03:50 |
| ← cmmagid left | 03:50 |
|
lyang0
| I have a file named foo.c in tree, I find it's delete now, how could I know which commit done this ? | 03:51 |
|
engla
| --ours and --theirs flags to git checkout, `Quote` | 03:51 |
| ← [KinG]_Edson left | 03:51 |
| → hacker216 joined | 03:51 |
|
EugeneKay
| The whole file? checkout. To attempt to fix the conflict sanely to begin with? man git-merge; see -Xtheirs | 03:52 |
|
gitinfo
| the git-merge manpage is available at http://jk.gs/git-merge.html | 03:52 |
| → Grum joined | 03:52 |
| → hacker592 joined | 03:53 |
| → hacker742 joined | 03:53 |
| ← bootstrapper left | 03:54 |
| → kcj joined | 03:55 |
| → ojacobson joined | 03:56 |
| → bmac joined | 03:56 |
|
`Quote`
| thanks engla | 03:57 |
| ← kcj left | 03:57 |
|
`Quote`
| and EugeneKay | 03:57 |
| → Kulrak joined | 03:58 |
| ← Kulrak left | 03:58 |
| → Kulrak joined | 03:58 |
| → infynyxx joined | 03:59 |
| ← beneggett left | 03:59 |
| → sangi joined | 03:59 |
| ← yshh left | 03:59 |
| ← infynyxx left | 04:00 |
| ← eijk left | 04:01 |
| → infynyxx joined | 04:01 |
| → Khisanth joined | 04:04 |
| ← offby1` left | 04:05 |
| → subhojit777 joined | 04:05 |
| → offby1 joined | 04:05 |
|
offby1
| Yikes! I only just now realized that, in gitk, 'j' and 'k' do exactly the opposite of what I expect. | 04:05 |
| phlipper_ → phlipper | 04:05 |
|
offby1
| Yikes, I say. | 04:05 |
| ← ojacobson left | 04:07 |
| ← lethjakman_lapto left | 04:09 |
| ← preflex left | 04:09 |
| → beautifulmind joined | 04:11 |
| ← guampa left | 04:11 |
| ← eletuchy left | 04:11 |
| → preflex joined | 04:12 |
| → eletuchy joined | 04:12 |
| ← stliu left | 04:12 |
| ← dvide_ left | 04:15 |
| ← Bankzilla left | 04:15 |
| ← eletuchy left | 04:16 |
| ← Khisanth left | 04:16 |
| ← engla left | 04:16 |
| → blorbx``` joined | 04:16 |
| ← miso1337 left | 04:17 |
| → JeremyWei joined | 04:17 |
| → ChangChong joined | 04:18 |
| → hays_ joined | 04:19 |
| → hachque_ joined | 04:19 |
| → Zeelot3k joined | 04:19 |
| ← Orbitrix left | 04:20 |
| ← WorkeD left | 04:20 |
| ← cehteh left | 04:20 |
| ← hachque left | 04:20 |
| ← Pagan left | 04:20 |
| → sjefen6_ joined | 04:20 |
| ← Zeelot left | 04:20 |
| → cehteh joined | 04:20 |
| → WorkeD joined | 04:20 |
| ← SeySayux left | 04:20 |
| ← sjefen6 left | 04:20 |
| ← txomon|home left | 04:20 |
| ← fasta left | 04:20 |
| ← skoop left | 04:20 |
| ← blorbx`` left | 04:20 |
| ← hays left | 04:20 |
| → fasta joined | 04:20 |
| → Pagan joined | 04:21 |
| → SeySayux joined | 04:21 |
| → txomon|home joined | 04:21 |
| → towski joined | 04:21 |
| ← infynyxx left | 04:21 |
| ← Hounddog left | 04:21 |
| → LuxuryMode joined | 04:21 |
| → Hounddog joined | 04:21 |
| ← JeremyWei left | 04:22 |
| ← bmac left | 04:22 |
|
`Quote`
| is there a way to get git to sync all changes | 04:22 |
|
| all branches* | 04:22 |
| → miso1337 joined | 04:23 |
| → skoopty joined | 04:24 |
| → bmac joined | 04:24 |
| ← pppaul left | 04:26 |
| → tiglog joined | 04:30 |
| ← kpreid left | 04:30 |
| → engla joined | 04:30 |
| ← OOPMan left | 04:30 |
| → kpreid joined | 04:30 |
| → v0n joined | 04:30 |
| ← SBoudrias left | 04:32 |
|
Infiltrator
| `Quote`: git fetch? | 04:32 |
|
| `Quote`: Or git remote update? | 04:32 |
|
`Quote`
| like git push | 04:33 |
|
| but with all branches. preferably with the github client | 04:33 |
|
| but git cli is fine too | 04:33 |
|
Infiltrator
| Um... git push --all? | 04:33 |
|
| I have no idea about the github client, though. | 04:33 |
| ← weiyang left | 04:34 |
| → beneggett joined | 04:35 |
|
`Quote`
| maybe it's in the configuration options | 04:35 |
| → Khisanth joined | 04:35 |
| ← redrocket left | 04:35 |
| → archdori joined | 04:37 |
| ← babilen left | 04:37 |
| → hwrd|work joined | 04:37 |
| ← Fandekasp left | 04:39 |
| → eletuchy joined | 04:42 |
| ← jcao219 left | 04:44 |
| → xiangfu joined | 04:47 |
| → bootstrapper joined | 04:50 |
| → pretty_function joined | 04:50 |
| ← bmac left | 04:53 |
| ← m0ltar left | 04:54 |
| ← eletuchy left | 04:54 |
| → techhelp joined | 04:55 |
| → gamja9e joined | 04:55 |
| ← bootstrapper left | 04:56 |
| ← the_cybersphinx left | 04:56 |
| ← gamja9e left | 04:59 |
| → gamja9e joined | 04:59 |
| → eletuchy joined | 04:59 |
| ← Grum left | 05:00 |
| ← john_anderson left | 05:00 |
| → Grum joined | 05:01 |
| ← bakers left | 05:02 |
| → goshawk joined | 05:03 |
| ChangChong → Orbitrix | 05:03 |
| Orbitrix → Orbitrix2 | 05:04 |
| Orbitrix2 → Orbitrix | 05:04 |
| → irqq joined | 05:04 |
| → TDJACR joined | 05:05 |
| ← skorgon left | 05:05 |
| → frogonwheels joined | 05:07 |
| ← Khisanth left | 05:08 |
| ← cspray left | 05:11 |
| ← catsup left | 05:12 |
| ← cilly left | 05:14 |
| → redrocket joined | 05:15 |
| → cilly joined | 05:15 |
| → pppaul joined | 05:15 |
| ← basmoura left | 05:17 |
| ← techhelp left | 05:17 |
| → imaginationac joined | 05:17 |
| → kcj joined | 05:18 |
| ← Error404NotFound left | 05:18 |
| → skorgon joined | 05:19 |
| → Fuuzetsu joined | 05:21 |
| ← Fuuzetsu left | 05:21 |
| → Fuuzetsu joined | 05:21 |
| → Khisanth joined | 05:22 |
| → yshh joined | 05:23 |
| ← eletuchy left | 05:23 |
| → eletuchy joined | 05:24 |
| → ErKa joined | 05:25 |
| → eletuchy_ joined | 05:25 |
| ← Khisanth left | 05:27 |
| → stliu joined | 05:28 |
| ← eletuchy left | 05:28 |
| → Error404NotFound joined | 05:30 |
| → bootstrapper joined | 05:31 |
| → karptonite joined | 05:32 |
| ← bootstrapper left | 05:33 |
| ← karptonite left | 05:35 |
| ← techlife left | 05:35 |
| → karptonite joined | 05:36 |
| ← karptonite left | 05:36 |
| ← jcromartie left | 05:37 |
| → karptonite joined | 05:37 |
| → johnkary joined | 05:37 |
| → smirn0v joined | 05:38 |
| ← yshh left | 05:38 |
|
karptonite
| How can I add a remote branch to an existing local branch in a local repository? I want to be able to fetch from it into the existing local branch, but I don't want to automatically pull. | 05:39 |
|
| (the remote branch is a framework I'm using) | 05:39 |
| ← breakingthings left | 05:39 |
|
milki
| karptonite: that doesnt quite make sense. do you mean you want your existing local branch to track a remote branch? | 05:40 |
| → LeMike joined | 05:40 |
| → catsup joined | 05:40 |
| ← engla left | 05:41 |
| → techlife joined | 05:41 |
|
karptonite
| I downloaded a framework from a zip file, and did a git init to create my local repository, and have that the tracking branch set to a branch on bitbucket. However, I want to also be able to fetch changes to the framework from the framework's git repository. | 05:42 |
|
| (I should have done a git clone from the repository to begin with) | 05:42 |
|
milki
| karptonite: then you can the repo as a new remote and setup the tracking branches | 05:43 |
|
| karptonite: man git remote add and man git branch --set-upstream-to | 05:43 |
|
gitinfo
| karptonite: the git-remote manpage is available at http://jk.gs/git-remote.html | 05:43 |
|
| karptonite: the git-branch manpage is available at http://jk.gs/git-branch.html | 05:43 |
| ← irqq left | 05:43 |
| → tjbiddle joined | 05:44 |
| → Khisanth joined | 05:45 |
| → ankurankan1 joined | 05:45 |
|
karptonite
| milki:if I do set-upstream-to, won't it automatically pull changes from that branch when I do a git pull with no arguments? I still want my remote on bitbucket to be where I pull and push from. | 05:45 |
|
| I just want to be able to fetch and merge changes from the framework as well. | 05:45 |
| → tjbiddle_ joined | 05:46 |
| → leen^| joined | 05:46 |
|
karptonite
| I guess I could do --set-upstream --no-track? | 05:46 |
| ← Jahm left | 05:47 |
| → Jahm joined | 05:47 |
| ← smirn0v left | 05:47 |
| ← tjbiddle left | 05:48 |
| tjbiddle_ → tjbiddle | 05:48 |
| → Hounddog_ joined | 05:49 |
| ← Hounddog left | 05:49 |
| ← archdori left | 05:50 |
| ← Khisanth left | 05:50 |
| ← raspy_freenode left | 05:50 |
|
milki
| karptonite: o, then dont do e set-upstream | 05:52 |
|
| just fetch the remote and manually do the merges | 05:52 |
|
| dont do any tracking | 05:53 |
| → raspy_freenode joined | 05:53 |
| ← hwrd|work left | 05:54 |
| → hwrd|work joined | 05:56 |
| ← davidbanham left | 05:57 |
| → ehsan joined | 05:57 |
| → dhruvasagar joined | 05:58 |
| → jdyin joined | 05:58 |
| ← greenfire left | 06:01 |
| ← ISF left | 06:04 |
| → negaduck joined | 06:05 |
| ← subhojit777 left | 06:05 |
| → Khisanth joined | 06:06 |
| ← ankurankan1 left | 06:06 |
| ← v0n left | 06:06 |
| → itanoss joined | 06:08 |
| → hafeez3000 joined | 06:08 |
| → JohnBat26 joined | 06:09 |
| ← ckoch786 left | 06:09 |
| ← Grum left | 06:10 |
| ← itanoss left | 06:10 |
| → lresende_ joined | 06:11 |
| → osmosis joined | 06:12 |
| → Grum joined | 06:13 |
| ← jackyalcine left | 06:14 |
| ← lresende left | 06:15 |
| → maletor joined | 06:15 |
| ← lresende_ left | 06:16 |
| ← Khisanth left | 06:16 |
| → jab416171 joined | 06:17 |
| ← osmosis left | 06:17 |
| ← tinocos left | 06:18 |
| → robbyoconnor joined | 06:18 |
| ← Jahm left | 06:18 |
| → rgr joined | 06:19 |
| → guns joined | 06:19 |
| → Cromulent joined | 06:19 |
| ← dhruvasagar left | 06:19 |
| → subhojit777 joined | 06:20 |
| → ckoch786 joined | 06:21 |
| → Khisanth joined | 06:21 |
| → dhruvasagar joined | 06:21 |
| ← o] left | 06:24 |
| → o] joined | 06:24 |
| → arvind_khadri joined | 06:25 |
| → infynyxx joined | 06:25 |
| ← Sky[x] left | 06:26 |
| ← negaduck left | 06:27 |
| ← infynyxx left | 06:27 |
| ← rgr left | 06:27 |
| ← untaken left | 06:28 |
| → luc__ joined | 06:28 |
| → untaken joined | 06:28 |
| → khmarbaise_ joined | 06:28 |
| ← dhruvasagar left | 06:28 |
| → davidbanham joined | 06:28 |
| → dhruvasagar joined | 06:29 |
| ← michaelmartinez left | 06:29 |
| ← khmarbaise left | 06:30 |
| khmarbaise_ → khmarbaise | 06:30 |
| → Jahm joined | 06:30 |
| ← ilteris_ left | 06:31 |
| ← jdyin left | 06:32 |
| → BiggFREE joined | 06:33 |
| ← guns left | 06:33 |
| ← cilly left | 06:34 |
| → dhruvasa1ar joined | 06:34 |
| → archdori joined | 06:35 |
| ← `Quote` left | 06:38 |
| ← Goplat left | 06:38 |
| ← karptonite left | 06:43 |
| → h0bbit joined | 06:44 |
| ← hwrd|work left | 06:45 |
| ← davidbanham left | 06:45 |
| ← Jahm left | 06:46 |
| → svetlyak40wt joined | 06:46 |
| → leechradio joined | 06:46 |
| → aberrant joined | 06:50 |
| ← svetlyak40wt left | 06:51 |
| ← tiglog left | 06:51 |
| → n1x joined | 06:52 |
| ← n1x left | 06:54 |
| → x82_nicole joined | 06:55 |
| → ozette joined | 06:55 |
| → rockfruit joined | 06:56 |
| → Jahm joined | 06:56 |
| → n1x joined | 06:56 |
| → dc5ala joined | 06:57 |
| → thehandler joined | 06:57 |
| ← kcj left | 06:57 |
| ← beneggett left | 07:00 |
| → TonyM joined | 07:00 |
| → PapaSierra_ joined | 07:00 |
| → jnavila joined | 07:00 |
| ← khmarbaise left | 07:00 |
| → whowantstolivefo joined | 07:01 |
| → samio joined | 07:01 |
|
PapaSierra_
| morning. i have set up a template project which is sitting in bitbucket. i would now like to use that template in a real project. should i fork? or should i clone and then change the remote repo urls? | 07:02 |
| → peppyheppy_ joined | 07:04 |
| ← peppyheppy left | 07:07 |
| → tevfik joined | 07:07 |
| → ThomasLocke joined | 07:08 |
| ← peppyheppy_ left | 07:09 |
|
milki
| PapaSierra_: cloning good enough | 07:10 |
|
| PapaSierra_: forking is only a concept if you plan to contribute to the template from your new project, which i doubt is the case | 07:11 |
| → foofoobar joined | 07:11 |
|
PapaSierra_
| ok. i figure forking via bitbucket was pretty convenient. but i'm worried about the upstream concept | 07:11 |
|
| yeah | 07:11 |
|
| cool, thanks, understood | 07:11 |
|
| though, technically what is a fork? isn't it just a cloned repo that happens to have some remote paths set? | 07:12 |
|
milki
| no, a fork doesnt need any remotes set at all | 07:13 |
|
| all clones can be considered a fork | 07:14 |
|
| a simple copy of the repo can be a fork | 07:14 |
|
| the fork from these online git services adds some sort of reference to the original repo to make certain operations easier | 07:15 |
|
PapaSierra_
| oh i see. i guess my question was "what are these special references"? | 07:15 |
|
| is it valid git? or is it some extra magic? | 07:15 |
|
milki
| thats an implementation question | 07:16 |
|
| yes, extra magic | 07:16 |
| → davidbanham joined | 07:16 |
|
PapaSierra_
| i see | 07:16 |
|
Nevik
| PapaSierra_: pure git knows nothing about forks | 07:16 |
|
| it only knows clones | 07:16 |
|
PapaSierra_
| cool, well i think i get it. thanks | 07:16 |
|
Nevik
| :) | 07:16 |
|
PapaSierra_
| well, i once did start a new project by forking the template. anything bad going to happen? | 07:16 |
| → GeertV joined | 07:17 |
|
milki
| no, but you might be annoyed if bitbucket keeps telling you its a fork | 07:17 |
| → howlymowly joined | 07:17 |
|
milki
| dont be ocd, and you'll be fine | 07:17 |
|
| alternitively, you might be able to ask them to remove the fork reference | 07:18 |
| ← robustus left | 07:18 |
|
PapaSierra_
| ok, understood. | 07:18 |
| ← sluther left | 07:19 |
|
PapaSierra_
| thanks so much :) | 07:19 |
| → hafeez3000_ joined | 07:19 |
| → robustus joined | 07:19 |
| → Sky[x] joined | 07:19 |
| → peppyheppy joined | 07:19 |
| ← hafeez3000 left | 07:20 |
| hafeez3000_ → hafeez3000 | 07:20 |
| ← ErKa left | 07:21 |
| → negaduck joined | 07:21 |
| ← maletor left | 07:22 |
| → cbreak-work joined | 07:22 |
| → hoschi joined | 07:22 |
| ← x82_nicole left | 07:23 |
| → tvw joined | 07:24 |
| ← davidbanham left | 07:24 |
| ← leen^| left | 07:25 |
| ← LeMike left | 07:25 |
| ← aberrant left | 07:25 |
| ← huoxito left | 07:26 |
| → yshh joined | 07:27 |
| → hwrd|work joined | 07:29 |
| → flijten joined | 07:30 |
| ← miso1337 left | 07:30 |
| ← kerrick left | 07:33 |
| → kerrick_ joined | 07:33 |
| ← beautifulmind left | 07:33 |
| ← whowantstolivefo left | 07:34 |
| ← fisted left | 07:34 |
| → fisted joined | 07:34 |
| → whowantstolivefo joined | 07:34 |
| ← Grum left | 07:35 |
| → giallu joined | 07:35 |
| → Grum joined | 07:36 |
| → fisted_ joined | 07:36 |
| ← fisted left | 07:36 |
| ← mmitchell left | 07:36 |
| fisted_ → fisted | 07:37 |
| → mmitchell joined | 07:37 |
| ← Davey left | 07:37 |
| → exoon joined | 07:39 |
| ← subhojit777 left | 07:39 |
| → Davey joined | 07:39 |
| → netiul joined | 07:40 |
| ← yshh left | 07:40 |
| → LeMike joined | 07:43 |
| ← pppaul left | 07:43 |
| kerrick_ → kerrick | 07:44 |
| → eletuchy joined | 07:44 |
| → yshh joined | 07:45 |
| → marthinal joined | 07:46 |
| ← goshawk left | 07:46 |
| → smirn0v joined | 07:46 |
| ← eletuchy_ left | 07:48 |
| → ankurankan joined | 07:48 |
| ← raspy_freenode left | 07:50 |
| ← Cromulent left | 07:50 |
| → subhojit777 joined | 07:51 |
| → bestform joined | 07:52 |
| ← kerrick left | 07:52 |
| ← primitive left | 07:52 |
| → kerrick joined | 07:52 |
| → primitive joined | 07:52 |
| → raspy_freenode joined | 07:53 |
| ← ankurankan left | 07:54 |
| → gerryvdm_mbp joined | 07:56 |
| ← Chryyz left | 07:56 |
| ← foofoobar left | 07:57 |
| ← kenperkins left | 07:57 |
| → samuel02 joined | 07:59 |
| ← hwrd|work left | 07:59 |
| → laurav joined | 08:00 |
| → anderse joined | 08:00 |
| ← LeMike left | 08:00 |
| ← robbyoconnor left | 08:00 |
| ← skoopty left | 08:00 |
| → skoop joined | 08:01 |
| → mishok13 joined | 08:01 |
| → ankurankan joined | 08:01 |
| ← archdori left | 08:02 |
| → tbosua joined | 08:02 |
| → pantsman joined | 08:02 |
| ← pantsman left | 08:02 |
| → pantsman joined | 08:02 |
| ← hyperboreean left | 08:02 |
| ← hafeez3000 left | 08:02 |
| → OOPMan joined | 08:03 |
| → Nimesh joined | 08:03 |
| ← rchavik left | 08:04 |
| → sobhan joined | 08:04 |
| → markalanevans joined | 08:04 |
| → papegaaij joined | 08:04 |
| ← markalanevans left | 08:04 |
| ← Nimesh left | 08:05 |
| → Nimesh9867 joined | 08:05 |
| → suy joined | 08:05 |
| ← corimarisol left | 08:06 |
| → corimarisol joined | 08:06 |
| ← corimarisol left | 08:06 |
| → corimarisol joined | 08:06 |
| ← Nimesh9867 left | 08:06 |
| → nimesh_accenture joined | 08:07 |
|
nimesh_accenture
| hi | 08:07 |
|
gitinfo
| nimesh_accenture: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 08:07 |
|
nimesh_accenture
| how do I get a version of a file with a particular change id | 08:07 |
|
milki
| this sounds like gerrit | 08:07 |
|
| nimesh_accenture: does change id refer to a commit? | 08:08 |
| → tasslehoff joined | 08:08 |
| ← towski left | 08:09 |
|
tasslehoff
| I forgot the local repo in my command, and typed "git branch --set-upstream origin/master". How do I undo this? It says that origin/master is setup to track my local branch. | 08:09 |
|
milki
| hmmm | 08:10 |
| → hyperboreean joined | 08:10 |
|
canton7
| if it does, git checkout <commit> -- <path/to/file> to check it out into the same location in your working directory, or git show <commit>:<path/to/file> to cat it (from where you can redirect it somewhere else if you want) | 08:10 |
| → maleknet joined | 08:10 |
|
milki
| tasslehoff: man git branch --unset-upstream | 08:10 |
|
gitinfo
| tasslehoff: the git-branch manpage is available at http://jk.gs/git-branch.html | 08:10 |
|
canton7
| tasslehoff, just type it again with the correct upstream | 08:10 |
|
cbreak-work
| tasslehoff: just delete the origin/master branch | 08:10 |
|
canton7
| and yeah, get rid of that branch you created | 08:11 |
|
milki
| o ya, sincei t creates the branch | 08:11 |
|
| lol | 08:11 |
|
| cbreak wins | 08:11 |
| ← sobhan left | 08:11 |
| ← nimesh_accenture left | 08:12 |
| ← LuxuryMode left | 08:12 |
| → AdrienBrault joined | 08:13 |
|
cbreak-work
| yay... :) | 08:13 |
| ← ozette left | 08:14 |
|
tasslehoff
| deleted the origin/master, but now I need to fix that I suspect | 08:14 |
|
| since I want my *real* origin/master back :) | 08:15 |
|
cbreak-work
| you should still have that one | 08:15 |
|
| git branch -r | 08:15 |
| ← maleknet left | 08:15 |
|
tasslehoff
| ah, that just worked. | 08:16 |
|
| cbreak-work: yep | 08:16 |
|
PapaSierra_
| i've added a submodule, but somehow it's got screwed up. the dir has been created for it by git, and it's empty. if i do git status it doesn't show up as a change. if i do submodule update it doesn't even realise it's there | 08:16 |
| → davidbanham joined | 08:16 |
|
cbreak-work
| PapaSierra_: git submodule update --init | 08:16 |
| ← davidbanham left | 08:16 |
| → xxc_michael joined | 08:16 |
| → davidbanham joined | 08:17 |
|
PapaSierra_
| cbreak-work sure, but in the output it simply doesn't show up | 08:17 |
| → rchavik joined | 08:18 |
|
cbreak-work
| PapaSierra_: is the submodule in the repository root? | 08:18 |
|
| if so, pastebin git cat-file -p HEAD: | 08:18 |
| ← bauruine left | 08:19 |
|
cbreak-work
| hmm... git ls-tree HEAD is probably more user friendly :D | 08:19 |
| ← exoon left | 08:20 |
| → Fandekasp joined | 08:20 |
| → wasanzy joined | 08:21 |
|
PapaSierra_
| cbreak it's actually under application/vendor/<mysubmodule> | 08:21 |
| → alorence joined | 08:21 |
|
cbreak-work
| then do a git ls-tree HEAD application/vendor | 08:21 |
| → hwrd|work joined | 08:21 |
|
PapaSierra_
| right, it's missing from that output | 08:21 |
|
| i see my other submodules but not this one | 08:21 |
| → LeMike joined | 08:22 |
|
cbreak-work
| then it's not a submodule | 08:22 |
|
| submodules must be listed there with a commit entry | 08:22 |
|
PapaSierra_
| (i'm going to reboot my vm because sometimes things get screwed up) | 08:22 |
|
cbreak-work
| (there being the tree) | 08:22 |
| ← hoschi left | 08:22 |
| ← setmeaway left | 08:23 |
|
PapaSierra_
| yeah i know. but that's what's amazing. i did "git submodule add <xyz> application/vendor/xyz". git was able to create the folder for me. but git wasn't able to enter it into it's submodules. this happens about 5% of the time for me using submodules | 08:23 |
| ← davidbanham left | 08:25 |
| → hoschi joined | 08:25 |
| → lb1a joined | 08:25 |
| ← lb1a left | 08:25 |
| → lb1a joined | 08:25 |
| ← superfred left | 08:26 |
| → maleknet joined | 08:28 |
| → fRAiLtY- joined | 08:28 |
| → asaf joined | 08:29 |
| ← dhruvasa1ar left | 08:30 |
| ← dhruvasagar left | 08:30 |
| → miso1337 joined | 08:30 |
| ← PapaSierra_ left | 08:30 |
| → exoon joined | 08:30 |
| → dhruvasagar joined | 08:31 |
| → dhruvasa1ar joined | 08:31 |
| → davidbanham joined | 08:32 |
| ← davidbanham left | 08:32 |
| → beliveyourdream joined | 08:32 |
| → davidbanham joined | 08:33 |
| ← Fandekasp left | 08:33 |
| ← alexwhitman left | 08:33 |
| → PapaSierra_ joined | 08:34 |
| ← yshh left | 08:35 |
| → alexwhitman joined | 08:35 |
| → Fandekasp joined | 08:35 |
| → rath joined | 08:35 |
| ← marc_kdab_ left | 08:36 |
| → marc_kdab_ joined | 08:36 |
| → anish[1] joined | 08:37 |
|
PapaSierra_
| cbreak-work this is serious messed up. i have completely removed the submodule. then i add it from scratch. it creates the folder. beyond that it simply will not recognise it as a submodule | 08:37 |
|
cbreak-work
| can you clone it yourself? | 08:38 |
|
anish[1]
| i have a main branch and now I have checked out the other branch.Just now I synced up my main branch.Now I want to apply the latest patches which I have got in my main branch to the other branch which I checked out. | 08:38 |
|
| how do i do it? | 08:38 |
| → EugenA joined | 08:38 |
| ← asaf left | 08:38 |
| → mnx| joined | 08:38 |
|
PapaSierra_
| cbreak-work i have a clone of the sub repo, yes | 08:39 |
|
cbreak-work
| can you copy it to that location? | 08:39 |
| → yshh joined | 08:39 |
|
PapaSierra_
| so i copy the cloned sub repo contents into the git created folder? | 08:40 |
|
anish[1]
| kind of my checkout branch is behind my main branch.So i want to update my checkout branch with main branch. | 08:40 |
|
milki
| anish[1]: you can merge the branch or cherry-pick the commits | 08:40 |
| ← davidbanham left | 08:40 |
|
anish[1]
| milki: git merge | 08:40 |
|
| ? | 08:40 |
|
milki
| anish[1]: man git merge | 08:40 |
|
gitinfo
| anish[1]: the git-merge manpage is available at http://jk.gs/git-merge.html | 08:40 |
|
PapaSierra_
| cbreak-work in the git created dir there is a .git file. if i copy/paste contents into that dir the .git file will be replaced. what should i do? | 08:41 |
|
EugenA
| i have ftp access to git bare repo, if i try to clone it, i get error: error: RETR response: 550 while accessing /info/refs | 08:42 |
|
| there is no "refs" in info | 08:42 |
|
PapaSierra_
| cbreak-work i've done what you said. but now git just sees the contents of that directory as untracked files, not as a submodule | 08:45 |
| → maxmanders joined | 08:45 |
|
cbreak-work
| PapaSierra_: is it a submodule or not? | 08:46 |
| ← miso1337 left | 08:46 |
|
cbreak-work
| if it's not a submodule, delete it | 08:46 |
|
| the whole directory | 08:46 |
|
| and add it again after you copied in the clone | 08:46 |
|
| it is my theory that the cloning failed | 08:46 |
| → kristofers joined | 08:47 |
|
cbreak-work
| EugenA: just download the whole thing | 08:47 |
|
| EugenA: FTP is dumb | 08:47 |
|
| EugenA: it probably needs the same index as dumb HTTP | 08:47 |
|
| EugenA: see man git-update-server-info | 08:47 |
|
gitinfo
| EugenA: the git-update-server-info manpage is available at http://jk.gs/git-update-server-info.html | 08:47 |
| ← Jahm left | 08:47 |
| → Jahm joined | 08:47 |
| ← hwrd|work left | 08:50 |
| → psoo joined | 08:50 |
| → RET joined | 08:50 |
|
PapaSierra_
| cbreak-work please rephrase "is it a submodule or not?", i don't get it. in repo A i have added a submodule (repo B). repo A has created a folder called repo-b but refuses to see it as a submodule. independently i am able to clone repo B elsewhere. if i copy paste the contents of repo B into the repo A/repo-b folder then of course repo A just sees those files as untracked changes, which is not what i want. sorry if i'm a little slow understanding | 08:50 |
|
cbreak-work
| PapaSierra_: does it have a commit entry in the tree? | 08:50 |
|
PapaSierra_
| no | 08:51 |
|
cbreak-work
| if it has, then it's a submodule. If it does not have, then it's not. | 08:51 |
|
RET
| after removing some old binary files from my repo with help of http://dound.com/2009/04/git-forever-remove-files-or-folders-from-history/ , the size did not decreased. why? | 08:51 |
|
cbreak-work
| PapaSierra_: then do what I said above | 08:51 |
|
| it should work | 08:51 |
|
| PapaSierra_: and try to find out why the cloning failed | 08:51 |
|
| (and wether my theory that it failed is correct) | 08:52 |
|
| RET: man git-filter-branch | 08:52 |
|
gitinfo
| RET: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html | 08:52 |
| → buibex joined | 08:52 |
|
cbreak-work
| RET: read the last section | 08:52 |
| ← buibex left | 08:52 |
|
PapaSierra_
| cbreak-work cloning into a totally different folder, elsewhere on my hard drive completely worked. it's the next steps that you're suggesting that i'm not clear on | 08:52 |
| → engla joined | 08:52 |
|
cbreak-work
| PapaSierra_: move/copy it where you want the submodule | 08:52 |
|
RET
| mhm k | 08:52 |
|
cbreak-work
| PapaSierra_: then git submodule add | 08:52 |
| ← Grum left | 08:53 |
|
PapaSierra_
| ok. i've never used this technique. what should the git submodule add params look like? | 08:53 |
| → Nmesh_accenture joined | 08:53 |
| → main_ joined | 08:54 |
| ← Nmesh_accenture left | 08:54 |
| → adamben joined | 08:54 |
| → soee joined | 08:54 |
| → Nimesh_accenture joined | 08:54 |
|
Nimesh_accenture
| how do i pick the verdion of a file witha change id? | 08:54 |
|
| without merging | 08:55 |
| → Grum joined | 08:55 |
|
cbreak-work
| PapaSierra_: the same | 08:55 |
|
| PapaSierra_: if there is already a clone, submodule add will use it | 08:55 |
|
epta
| M | 08:56 |
|
cbreak-work
| Nimesh_accenture: git doesn't have change IDs | 08:56 |
|
epta
| Are the hooks from ~/.git/hooks/ directory will be available for all git repos? | 08:56 |
| → Dreamer3 joined | 08:56 |
| → miso1337 joined | 08:57 |
| → soc42 joined | 08:58 |
|
PapaSierra_
| cbreak-work interesting. i never knew that (obviously). here's what i get Adding existing repo at 'application/vendor/xyz' to the index | 08:58 |
|
cbreak-work
| epta: no. Just to that git repository | 08:58 |
| ← adamben left | 08:58 |
| → tjbiddle_ joined | 08:58 |
| ← tjbiddle_ left | 08:58 |
|
PapaSierra_
| cbreak-work now in my staging area i see "modified: .gitmodules" and then "new file: application/vendor/xyz". does that look right to you? | 08:59 |
|
cbreak-work
| PapaSierra_: looks ok... | 08:59 |
| → hakunin_ joined | 08:59 |
| ← hakunin left | 08:59 |
|
PapaSierra_
| interestingly, with other submodules i get a .git FILE in the submodule dir. with this one, since i did copy/paste, i get a .git DIR | 08:59 |
|
cbreak-work
| can't say why it failed before though, but it seems to be related with cloning. | 09:00 |
|
| PapaSierra_: yes, new git just put a redirect into the submodule | 09:00 |
| ← luc__ left | 09:00 |
|
cbreak-work
| that way you can switch branches without having leftovers | 09:00 |
|
| (branches in which the submodule does not exist) | 09:00 |
| → luc__ joined | 09:00 |
|
cbreak-work
| I've never seen those new ones myself though | 09:00 |
|
PapaSierra_
| ok. so having the .git dir is actually ok? | 09:01 |
| ← tjbiddle left | 09:02 |
|
cbreak-work
| yeah. Old school. | 09:03 |
|
| as long as you don't have any branches :D | 09:03 |
|
PapaSierra_
| well, i do and will have branches | 09:03 |
| → luc___ joined | 09:03 |
| ← jnavila left | 09:04 |
|
PapaSierra_
| cbreak-work that was very bizarre and the most confusing this was: even if the clone did fail once, why, when i [successfully?] removed the submodule and then re-added it, did git not respect that? | 09:04 |
|
cbreak-work
| it did | 09:05 |
|
| didn't you just said it worked? | 09:05 |
|
PapaSierra_
| only via the copy/paste work around | 09:05 |
| ← luc__ left | 09:06 |
|
PapaSierra_
| typically i would cleanly remove the submodule and then re-add and everything would work fine. this time even after cleanly removing it still just repeated the fail | 09:06 |
|
| and, as you say, i can't use branches | 09:06 |
|
cbreak-work
| you can use them | 09:06 |
|
| it'll just have those submodules as leftovers | 09:06 |
|
PapaSierra_
| so i think i need to remove repo-A (with it's ghost in the machine) and start over, would that fix it? | 09:07 |
|
cbreak-work
| no idea. | 09:08 |
|
| my crystal ball is cloudy | 09:08 |
| → Sonderblade joined | 09:09 |
| → robotmay joined | 09:10 |
| → jargon joined | 09:10 |
| ← yshh left | 09:11 |
| → AndHeiberg joined | 09:11 |
| → yshh joined | 09:12 |
| ← hoschi left | 09:12 |
|
PapaSierra_
| cbreak-work, yeah, this is really screwy. theoretically i should be able to remove a submodule and then re-add it right? | 09:12 |
|
untaken
| Is there a command to see information about a commit id? The commit could be on any tag/branch | 09:13 |
|
AndHeiberg
| I'm new to git. I was suggested to do the following workflow http://pastie.org/6006877 Thought I would install Tower for OSX to make it a little less daunting. I tried to follow this workflow, but on line 5 your linking your local repo with a github repo. I however would like to do this local only for now. How would I go about it? | 09:14 |
| → hafeez3000 joined | 09:15 |
|
PapaSierra_
| cbreak-work i've had a breakthrough. i went right back to what i know. adding submodules the normal way. then i cd-ed into the offending submodule dir and did git branch. it came back as null. i did git checkout develop and suddenly all the files appears. so it must have been that the submodule add command was looking to pin it to master or something? | 09:15 |
| ← Jahm left | 09:16 |
|
RET
| cbreak-work: thanks for hint to the last paragraph @shrinking repo: cloning did the trick | 09:16 |
| ← tvw left | 09:17 |
| → Jahm joined | 09:17 |
| → sobhan joined | 09:17 |
|
cbreak-work
| PapaSierra_: it should go by remote HEAD | 09:17 |
|
| PapaSierra_: do a git ls-remote of the remote you tried to clone from | 09:17 |
|
| maybe it's weird | 09:17 |
| → svetlyak40wt joined | 09:17 |
| → alkino joined | 09:17 |
| ← sjefen6_ left | 09:17 |
| → Noel_ joined | 09:17 |
|
cbreak-work
| RET: yep, it's the easiest way. Don't forget to copy your settings and your other local only things over into the new one | 09:18 |
| → sebuba joined | 09:18 |
|
RET
| yea | 09:18 |
|
PapaSierra_
| cbreak-work be95d4cbae14f3d6e9bf914c0b134846f3202e1d HEAD and be95d4cbae14f3d6e9bf914c0b134846f3202e1d refs/heads/develop | 09:18 |
| → jkremser joined | 09:19 |
| → bauruine joined | 09:19 |
| ← yshh left | 09:19 |
| ← johnkary left | 09:21 |
|
cbreak-work
| PapaSierra_: weird... that looks reasonable | 09:21 |
| ← svetlyak40wt left | 09:21 |
| ← RET left | 09:21 |
| ← Jahm left | 09:23 |
| → Jahm_ joined | 09:23 |
|
EugenA
| now i can clone over ftp, but i'm getting error while cloning: error: Server denied you to change to the given directory (curl_result = 9, http_code = 550, sha1 = .... ) | 09:23 |
| → jlopez joined | 09:24 |
|
PapaSierra_
| cbreak-work my worries are not over :( i did a git add . and then git status and it's listed all the files in the submodule! | 09:24 |
|
EugenA
| why? how can i get more information? if i login using ftp client, i'm in my ftp root.. my clone command is: git clone ftp://user:pass@myserver/ . | 09:24 |
|
cbreak-work
| PapaSierra_: weird. It should not go into directories with a .git | 09:25 |
|
PapaSierra_
| cbreak-work i agree. i have a .git file which contains gitdir: ../../../.git/modules/application/vendor/xyz | 09:26 |
| → timj joined | 09:27 |
| → johnkary joined | 09:27 |
| ← johnkary left | 09:27 |
| → asaf joined | 09:28 |
| ← stliu left | 09:29 |
|
PapaSierra_
| cbreak-work amazing. the submodule has mysteriously dropped off the git ls-tree HEAD list again. if i cd into the submodule it feels like a regular repo. | 09:29 |
| → negaduck_ joined | 09:30 |
| ← ankurankan left | 09:30 |
| ← negaduck left | 09:32 |
| negaduck_ → negaduck | 09:32 |
| → thiago joined | 09:32 |
| → chisler joined | 09:33 |
| ← hakunin_ left | 09:33 |
| ← WorkeD left | 09:33 |
|
PapaSierra_
| cbreak-work and, git rm --cached application/vendor/repo-b gives fatal: pathspec 'application/vendor/repo-b' did not match any files | 09:34 |
| → hakunin joined | 09:34 |
|
untaken
| Is there a command to see information about a commit id? The commit could be on any tag/branch | 09:36 |
| → SonderbladeWork joined | 09:36 |
| ← SonderbladeWork left | 09:36 |
|
cmn
| git show will tell you most of what you want to know about a commit | 09:37 |
|
jast
| _ikke_: the source code for gitinfo is on github | 09:39 |
|
AndHeiberg
| any thoughts on how to solve my problem? | 09:39 |
|
PapaSierra_
| cbreak-work ok. fixed. i think. i removed the submodule completely and then did git submodule add <url> <path> -b develop | 09:39 |
|
untaken
| cmn: thanks | 09:39 |
| ← wasanzy left | 09:39 |
| ← maleknet left | 09:40 |
| → hoschi joined | 09:42 |
| ← xiangfu left | 09:42 |
| ← giallu left | 09:42 |
|
EugenA
| i've cloned over ftp, but if i push, it says: fatal: git-http-push failed | 09:43 |
| → asaf1 joined | 09:43 |
| ← asaf left | 09:43 |
| → memoryleak joined | 09:43 |
| → yshh joined | 09:44 |
| ← TomWij left | 09:46 |
| → Sigma joined | 09:46 |
| → TomWij joined | 09:46 |
| ← GeertV left | 09:47 |
| ← nafg left | 09:48 |
|
jast
| EugenA: pushing over FTP is not supported | 09:48 |
| → GeertV joined | 09:48 |
|
EugenA
| ok.. | 09:48 |
| ← pity left | 09:48 |
|
cmn
| and ftp is deprecated at best | 09:50 |
|
| the fetching, I mean | 09:50 |
| ← anderse left | 09:50 |
|
AndHeiberg
| is this the wrong place to ask questions like mine? | 09:50 |
|
jast
| nah | 09:50 |
|
| if you want to work locally, just don't add any remotes and don't push | 09:51 |
|
| (of course, since there's no other repo, you won't have to fetch/merge, either) | 09:51 |
|
| oh well, I guess you *are* cloning from an upstream repo, so that part may actually still make sense | 09:51 |
| ← hafeez3000 left | 09:51 |
| → jatt joined | 09:51 |
|
AndHeiberg
| +jast: but I'm trying to add laravel development branch as a remote, since I wan't to be able to pull updates | 09:52 |
| ← chisler left | 09:52 |
|
jast
| cloning automatically adds a remote for your clone source | 09:52 |
|
| it's called 'origin' by default | 09:52 |
| ← GeertV left | 09:52 |
| ← rchavik left | 09:53 |
|
AndHeiberg
| okay, so after doing the clone there's no need to do anything else? | 09:53 |
| ← lyang0 left | 09:53 |
| ← tasslehoff left | 09:53 |
|
jast
| that's right | 09:53 |
| → marhaban joined | 09:53 |
|
AndHeiberg
| cool I will try that then | 09:53 |
|
| thanks a lot for you help | 09:53 |
| → chisler joined | 09:53 |
|
jast
| good luck :} | 09:54 |
| ← fisted left | 09:55 |
| → hafeez3000 joined | 09:55 |
| → buibex joined | 09:56 |
| → GeertV joined | 09:56 |
| → cheater joined | 09:56 |
|
cheater
| hi guys | 09:56 |
| ← Xethron left | 09:56 |
|
cheater
| can i somehow pull from many unrelated repositories, in order to be able to do git log on one repo and see the commit messages from all the different remotes at once? | 09:57 |
| → Chryyz joined | 09:57 |
| ← fflush left | 09:57 |
| ← smirn0v left | 09:57 |
| → guns joined | 09:58 |
| ← PapaSierra_ left | 09:58 |
| → fflush joined | 09:58 |
| → giallu joined | 09:58 |
| → tPl0ch joined | 09:58 |
|
AndHeiberg
| +jast: but if I only do the clone and tried to push wouldn't that go to the cloned repo? | 09:59 |
| → RaceCondition joined | 09:59 |
| ← JohnBat26 left | 09:59 |
| → smirn0v joined | 09:59 |
| ← djsecilla left | 10:00 |
| → babilen joined | 10:00 |
| → svetlyak40wt joined | 10:00 |
| → hegemoOn joined | 10:00 |
|
hegemoOn
| hello | 10:00 |
|
gitinfo
| hegemoOn: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 10:00 |
|
hegemoOn
| im new to git | 10:01 |
|
| i created a repository online using web interface | 10:01 |
|
| im new trying to put some file from my computer for this repository | 10:01 |
| ← Ziggy` left | 10:01 |
|
hegemoOn
| but it fails with error : failed to push some refs to .... | 10:01 |
|
AndHeiberg
| +jast: why can I only commit with the --amend tag? | 10:02 |
| → dermoth|home joined | 10:02 |
|
hegemoOn
| update were rejected because the tip of your current branch is behind | 10:02 |
| → nafg_ joined | 10:02 |
|
hegemoOn
| what can i do to fix that ? | 10:02 |
| → irqq joined | 10:03 |
| ← timj left | 10:03 |
| ← EugenA left | 10:03 |
|
frogonwheels
| hegemoOn: by 'web interface' do you mean github? | 10:04 |
|
hegemoOn
| yes | 10:04 |
| → achadwick joined | 10:04 |
|
frogonwheels
| hegemoOn: did you clone your new repo first? | 10:04 |
|
hegemoOn
| no | 10:04 |
|
jast
| AndHeiberg: what happens if you don't? | 10:04 |
|
frogonwheels
| hegemoOn: and this is your first push? | 10:04 |
| → FernandoBasso joined | 10:05 |
| → JohnBat26 joined | 10:05 |
|
hegemoOn
| yes | 10:05 |
|
AndHeiberg
| +jast: I'm using git Tower and it tells me I can only do it with that flag, but I can try in the command promt | 10:05 |
|
jast
| AndHeiberg: sounds weird | 10:05 |
|
hegemoOn
| frogonwheels: im trying to follow the https://help.github.com/articles/create-a-repo | 10:05 |
|
| instructions | 10:05 |
|
frogonwheels
| hegemoOn: I think github might put an initial commit with .gitignore in it. so if you force push your first commit you should be good. | 10:05 |
|
| hegemoOn: also there's #github | 10:05 |
|
hegemoOn
| frogonwheels: thanks for the hint | 10:05 |
| ← yshh left | 10:06 |
|
frogonwheels
| anyway I gg. gl | 10:06 |
| → Dr4k3 joined | 10:07 |
|
AndHeiberg
| +jast: http://pastie.org/6007533 is the terminal response | 10:07 |
| ← BiggFREE left | 10:07 |
|
jast
| AndHeiberg: how about you follow the instructions in that message ;) | 10:08 |
|
AndHeiberg
| yeah, just read it :) Remeber I used Tower before | 10:08 |
| → Gentlecat_ joined | 10:08 |
|
AndHeiberg
| I guess there must be some "add" button in tower. Idk maby I should just use the command line :) | 10:09 |
| → beautifulmind joined | 10:10 |
| → sjefen6 joined | 10:10 |
| ← Sonderblade left | 10:11 |
| ← soee left | 10:11 |
| ← dhruvasagar left | 10:11 |
| ← whowantstolivefo left | 10:11 |
| ← peppyheppy left | 10:11 |
| ← thehandler left | 10:11 |
| ← dc5ala left | 10:11 |
| ← frogonwheels left | 10:11 |
| ← dragon3_ left | 10:11 |
| ← rockfruit left | 10:11 |
| ← jday_ left | 10:11 |
| ← keller left | 10:11 |
| ← tirengarfio left | 10:11 |
| ← nutron left | 10:11 |
| ← zivester left | 10:11 |
| ← simesy left | 10:11 |
| ← masak left | 10:11 |
| ← cespare|home left | 10:11 |
| ← infogulch left | 10:11 |
| ← Samual left | 10:11 |
| ← Modernmy1h left | 10:11 |
| ← kanzure left | 10:11 |
| ← RichardJ left | 10:11 |
| ← jepler left | 10:11 |
| ← KaiSforza left | 10:11 |
| ← beawesomeinstead left | 10:11 |
| ← Anathema left | 10:11 |
| ← worch left | 10:11 |
| ← theForce_ left | 10:11 |
| ← chisler left | 10:11 |
| → KaiSforza joined | 10:12 |
| → chisler joined | 10:12 |
| → dragon3_ joined | 10:12 |
| → zoresvit joined | 10:13 |
| → Sonderblade joined | 10:14 |
| → soee joined | 10:14 |
| → dhruvasagar joined | 10:14 |
| → whowantstolivefo joined | 10:14 |
| → peppyheppy joined | 10:14 |
| → thehandler joined | 10:14 |
| → dc5ala joined | 10:14 |
| → rockfruit joined | 10:14 |
| → frogonwheels joined | 10:14 |
| → jday_ joined | 10:14 |
| → keller joined | 10:14 |
| → tirengarfio joined | 10:14 |
| → nutron joined | 10:14 |
| → zivester joined | 10:14 |
| → simesy joined | 10:14 |
| → masak joined | 10:14 |
| → cespare|home joined | 10:14 |
| → infogulch joined | 10:14 |
| → Samual joined | 10:14 |
| → Modernmy1h joined | 10:14 |
| → Anathema joined | 10:14 |
| → RichardJ joined | 10:14 |
| → jepler joined | 10:14 |
| → beawesomeinstead joined | 10:14 |
| → worch joined | 10:14 |
| ← sobhan left | 10:14 |
| ← notfunk left | 10:14 |
| → Xethron joined | 10:14 |
| → notfunk joined | 10:14 |
| ← whowantstolivefo left | 10:14 |
| → kanzure joined | 10:15 |
| → whowantstolivefo joined | 10:15 |
| ← AndHeiberg left | 10:15 |
| ← frogonwheels left | 10:17 |
| → frogonwheels joined | 10:17 |
| → skul joined | 10:18 |
| ← ahf left | 10:19 |
| → nikosss joined | 10:19 |
| → ahf joined | 10:19 |
| → Gentlecat__ joined | 10:19 |
| ← xonix left | 10:20 |
| ← JohnBat26 left | 10:20 |
| → beliveyourdream_ joined | 10:20 |
| ← beliveyourdream left | 10:20 |
| ← Gentlecat_ left | 10:21 |
| ← Chryyz left | 10:21 |
| ← jkremser left | 10:21 |
| → xonix_ joined | 10:22 |
| ← smirn0v left | 10:23 |
| → JohnBat26 joined | 10:24 |
| → jnavila joined | 10:24 |
| → arkiver joined | 10:25 |
| ← beliveyourdream_ left | 10:25 |
| → smirn0v joined | 10:25 |
| → beliveyourdream joined | 10:25 |
| → anderse joined | 10:27 |
| → xiangfu joined | 10:30 |
| ← nikosss left | 10:30 |
| → svetlyak40wt_ joined | 10:30 |
| ← svetlyak40wt left | 10:30 |
| ← dhruvasa1ar left | 10:31 |
| ← dhruvasagar left | 10:31 |
| ← peppyheppy left | 10:31 |
| → lyang0 joined | 10:31 |
| → sobhan joined | 10:32 |
| ← thiago left | 10:32 |
| → thiago joined | 10:32 |
| → dhruvasagar joined | 10:33 |
| → dhruvasa1ar joined | 10:33 |
| ← juvenal left | 10:34 |
| → juvenal joined | 10:35 |
| ← Hounddog_ left | 10:35 |
| ← sebuba left | 10:36 |
| ← kerrick left | 10:36 |
| → Hounddog joined | 10:39 |
| ← negaduck left | 10:40 |
| ← Grum left | 10:40 |
| → ozette joined | 10:41 |
| ← memoryleak left | 10:41 |
| → mklappstuhl joined | 10:42 |
| → Grum joined | 10:42 |
| → snql joined | 10:42 |
| → robotmay_ joined | 10:44 |
| ← Sonderblade left | 10:45 |
| ← asaf1 left | 10:45 |
| → asaf joined | 10:45 |
| → guampa joined | 10:46 |
| → TheFuzzball joined | 10:46 |
| ← FernandoBasso left | 10:46 |
| ← robotmay left | 10:48 |
| → FernandoBasso joined | 10:48 |
| ← zoresvit left | 10:48 |
| → timj joined | 10:48 |
| → vaibhavjain joined | 10:48 |
| ← svetlyak40wt_ left | 10:48 |
| → zoresvit joined | 10:50 |
| → tvw joined | 10:50 |
| ← asaf left | 10:51 |
| → asaf1 joined | 10:51 |
| → lun_ joined | 10:51 |
| → the_cybersphinx joined | 10:51 |
| → svetlyak40wt joined | 10:53 |
| → negaduck joined | 10:53 |
| → rchavik joined | 10:54 |
| → arietis joined | 10:56 |
| ← asaf1 left | 10:58 |
| → asaf joined | 10:58 |
| ← tinti left | 11:00 |
| → tinti joined | 11:01 |
| ← asaf left | 11:01 |
| → asaf1 joined | 11:01 |
| ← chisler left | 11:01 |
| iksik → pratchet | 11:02 |
| ← negaduck left | 11:02 |
| pratchet → iksik | 11:03 |
| → myx joined | 11:04 |
| → memoryleak joined | 11:06 |
| → Anders_J joined | 11:09 |
| ← juvenal left | 11:09 |
| ← rchavik left | 11:09 |
| → negaduck joined | 11:10 |
| → i42n joined | 11:10 |
| ← lun_ left | 11:11 |
| → lun_ joined | 11:11 |
| ← zoresvit left | 11:11 |
| ← Targen left | 11:12 |
| ← hegemoOn left | 11:12 |
| ← jaequery left | 11:15 |
| → scorphus joined | 11:15 |
| → rchavik joined | 11:16 |
| ← gerryvdm_mbp left | 11:17 |
| ← arietis left | 11:18 |
| → zoresvit joined | 11:18 |
| ← Noel_ left | 11:19 |
| → maleknet joined | 11:21 |
| ← rchavik left | 11:21 |
| ← dragon3_ left | 11:23 |
| → Mannequin joined | 11:24 |
| ← soc42 left | 11:24 |
| ← hyperair left | 11:25 |
|
epta
| Is there a way to have hook that will add ticket number from branch name to commit message if there is no one? I wan't to use it with -m (http://stackoverflow.com/questions/5823772/append-ticket-number-using-git-commit-hooks - this one don't works with -m as they said) | 11:25 |
|
| want* | 11:25 |
| ← sobhan left | 11:26 |
| ← maleknet left | 11:26 |
| → arietis joined | 11:26 |
| ← eletuchy left | 11:27 |
| → chisler joined | 11:27 |
| ← anish[1] left | 11:28 |
| → Chiku|dc joined | 11:28 |
|
Chiku|dc
| hi | 11:28 |
|
gitinfo
| Chiku|dc: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 11:28 |
|
Chiku|dc
| I want to find the commit from all commits a word match | 11:30 |
|
| is it possible to do that ? | 11:30 |
| → mit2nil joined | 11:30 |
| ← wolfmitchell left | 11:31 |
|
Chiku|dc
| not in commit desc but in comiited files | 11:31 |
| → prudnikov joined | 11:32 |
| ← lyang0 left | 11:32 |
| → Progster joined | 11:33 |
|
grawity
| you mean commits where a word was *added*, or...? | 11:33 |
|
Chiku|dc
| no | 11:33 |
| ← svetlyak40wt left | 11:34 |
|
Chiku|dc
| word in files which are commited | 11:34 |
|
| on all diff commited | 11:34 |
|
| all commited diffs | 11:35 |
| → svetlyak40wt joined | 11:35 |
|
Chiku|dc
| to get wich commit add this word in a file | 11:35 |
| ← AdrienBrault left | 11:36 |
|
grawity
| ...so like I said, commits where a word was added... | 11:36 |
|
| git log -Syourword | 11:36 |
|
Chiku|dc
| ok | 11:36 |
| ← svetlyak40wt left | 11:36 |
| → PigeonFriend joined | 11:36 |
| → robbyoconnor joined | 11:36 |
| ← hafeez3000 left | 11:37 |
| → rchavik joined | 11:37 |
| → svetlyak40wt joined | 11:37 |
|
Chiku|dc
| thx grawity | 11:38 |
| → pity joined | 11:38 |
|
Chiku|dc
| it 's what I wanted | 11:38 |
| ← mit2nil left | 11:39 |
| ← pantsman left | 11:40 |
| → jkremser joined | 11:40 |
| ← GeertV left | 11:40 |
| → rastar joined | 11:40 |
| ← Dreamer3 left | 11:40 |
| → GeertV joined | 11:41 |
| → basmoura joined | 11:41 |
| ← babilen left | 11:42 |
| → babilen joined | 11:43 |
| → anish[1] joined | 11:43 |
| → juvenal joined | 11:44 |
| → aldskf3 joined | 11:45 |
| ← Xethron left | 11:45 |
| → Guest68908 joined | 11:46 |
| ← luc___ left | 11:47 |
| → Dreamer3 joined | 11:47 |
| ← Guest68908 left | 11:47 |
| ← nafg_ left | 11:49 |
| → itatitat joined | 11:50 |
| → angelsl joined | 11:50 |
| ← Sky[x] left | 11:50 |
| → i42n_ joined | 11:51 |
| ← i42n_ left | 11:52 |
| → davidbanham joined | 11:52 |
| ← i42n left | 11:53 |
| → sebuba joined | 11:53 |
| ← flavius left | 11:56 |
| → eletuchy joined | 11:58 |
| ← ryez left | 11:58 |
| ← vaibhavjain left | 12:00 |
| ← prudnikov left | 12:01 |
| ← zoresvit left | 12:03 |
| ← Grum left | 12:03 |
| ← marhaban left | 12:04 |
| ← jnavila left | 12:04 |
| → Grum joined | 12:04 |
| → Xethron joined | 12:06 |
| → alansaul_ joined | 12:06 |
| ← eletuchy left | 12:09 |
| ← alansaul_ left | 12:11 |
| ← Error404NotFound left | 12:11 |
| → alansaul_ joined | 12:11 |
| → RonScagz joined | 12:11 |
| ← rwestphal left | 12:13 |
| ← giallu left | 12:15 |
| → krispin joined | 12:15 |
| → rwestphal joined | 12:15 |
| ← miso1337 left | 12:15 |
| → Sonderblade joined | 12:16 |
| ← lun_ left | 12:16 |
| → lun_ joined | 12:16 |
| → eletuchy joined | 12:17 |
| ← OOPMan left | 12:18 |
| → zoresvit joined | 12:19 |
| → cmmagid joined | 12:19 |
| ← dhruvasagar left | 12:20 |
| → e-dard joined | 12:20 |
| ← dhruvasa1ar left | 12:20 |
|
e-dard
| Hi, just wondering if I can use submodules to link a certain folder in another repository into my repo at a current location? | 12:20 |
|
| I don't want the entire "common" repo linked in, just a part of it. Is that possible? | 12:21 |
| ← cmmagid left | 12:21 |
| → lun__ joined | 12:21 |
| ← lun_ left | 12:21 |
| ← awesome_muffin left | 12:21 |
| → Chryyz joined | 12:22 |
| → dhruvasagar joined | 12:22 |
| → dhruvasa1ar joined | 12:22 |
| → prudnikov joined | 12:22 |
|
TonyM
| !backup | 12:23 |
|
gitinfo
| Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups | 12:23 |
| → cmmagid joined | 12:23 |
| ← odin_ left | 12:23 |
| ← arietis left | 12:24 |
|
e-dard
| TonyM: was that for me? | 12:24 |
| ← sangi left | 12:24 |
| SeoZ → SeoZ-work[AWAY] | 12:24 |
| → sysadminAli joined | 12:25 |
|
TonyM
| no, I was just looking back through the morning's messages and saw the welcome message from gitinfo at 10:00. I was interested in its comment about taking backups. | 12:25 |
| ← buibex left | 12:25 |
|
TonyM
| I'm pretty new to git, so can't answer your question - sorry! | 12:27 |
| ← flijten left | 12:27 |
| ← dhruvasagar left | 12:28 |
| ← dhruvasa1ar left | 12:28 |
|
jast
| e-dard: nope | 12:28 |
| → revagomes joined | 12:28 |
| → dhruvasagar joined | 12:29 |
| → dhruvasa1ar joined | 12:29 |
| ← Progster left | 12:29 |
| ← corimarisol left | 12:29 |
| → flijten joined | 12:29 |
| → corimarisol joined | 12:30 |
| ← corimarisol left | 12:30 |
| → corimarisol joined | 12:30 |
| ← corimarisol left | 12:30 |
| → corimarisol joined | 12:31 |
| ← corimarisol left | 12:31 |
| → corimarisol joined | 12:31 |
| → buibex joined | 12:33 |
| ← samio left | 12:34 |
| → cheater_ joined | 12:35 |
| → jnewt joined | 12:36 |
| → samio joined | 12:37 |
|
jnewt
| how can i get a list of branches and whether or not they were updated into a post-receive hook? | 12:37 |
| ← arkiver left | 12:37 |
| → n4irc joined | 12:37 |
| ← guns left | 12:38 |
| ← cheater left | 12:39 |
| → brunov joined | 12:39 |
| ← xxc_michael left | 12:40 |
| → marhaban joined | 12:42 |
| ← negaduck left | 12:44 |
|
EugeneKay
| jnewt - man githooks; you already get the list of updated branches. You can use man git-rev-list --branches to get a list of all branches and compare the two for intersections & omissions. | 12:44 |
|
gitinfo
| jnewt: the githooks manpage is available at http://jk.gs/githooks.html | 12:44 |
|
| jnewt: the git-rev-list manpage is available at http://jk.gs/git-rev-list.html | 12:44 |
| ← cmmagid left | 12:44 |
| → yshh joined | 12:44 |
| → cmmagid joined | 12:45 |
|
achadwick
| git svn, wh[y do yo]u no[t support] submodule [directly]? | 12:45 |
| ← cmmagid left | 12:45 |
|
EugeneKay
| !why | 12:45 |
|
gitinfo
| Why? Because screw you, that's why. | 12:45 |
|
| achadwick rearranges those omission []s until it's right. | 12:45 |
|
| achadwick also approves of this approach. | 12:46 |
| ← dhruvasagar left | 12:46 |
|
jnewt
| EugeneKay: i see this: <old-value> SP <new-value> SP <ref-name> LF is that what you mean? how do i use that? | 12:46 |
| ← dhruvasa1ar left | 12:47 |
| ← agile left | 12:47 |
| → AdrienBrault joined | 12:47 |
|
EugeneKay
| You read from stdin ;-) | 12:48 |
| → Error404NotFound joined | 12:48 |
| ← Error404NotFound left | 12:48 |
| → dhruvasagar joined | 12:48 |
| → JDuke128 joined | 12:48 |
| ← chisler left | 12:48 |
| → dhruvasa1ar joined | 12:49 |
| → Error404NotFound joined | 12:49 |
| ← JDuke128 left | 12:49 |
| → lyang0 joined | 12:49 |
| → ashok joined | 12:49 |
| → agile joined | 12:50 |
| ashok → Guest27074 | 12:50 |
| → JDuke128 joined | 12:50 |
| ← CausaMortis__ left | 12:50 |
| ← asaf1 left | 12:50 |
| ← JDuke128 left | 12:51 |
| → ankurankan joined | 12:51 |
|
jnewt
| EugeneKay: ok, we're not really getting anywhere here. lets say i have the script, with a while read lne; do "something"; done ok, now say i want to echo "$x"; where x is the branch names. how do i do that? | 12:51 |
| → JDuke128 joined | 12:51 |
| ← skorgon left | 12:52 |
|
EugeneKay
| jnewt - https://github.com/EugeneKay/scripts/blob/master/bash/git-deploy-hook.sh#L142 | 12:52 |
| → sobhan joined | 12:52 |
| ← JDuke128 left | 12:52 |
|
EugeneKay
| (this is bash, which I presume is what you're using as well) | 12:52 |
| → hyperair joined | 12:52 |
| → JDuke128 joined | 12:53 |
| → lugzer_ joined | 12:53 |
| → pandeiro joined | 12:53 |
| ← JDuke128 left | 12:53 |
| → skorgon joined | 12:54 |
| → JDuke128 joined | 12:54 |
|
jnewt
| that's fine. i can use bash | 12:54 |
| ← lugzer_ left | 12:54 |
| → lugzer joined | 12:54 |
|
lugzer
| hi | 12:54 |
|
jnewt
| EugeneKay, perfect. thanks. | 12:55 |
| ← svetlyak40wt left | 12:56 |
|
lugzer
| i noticed that when i'm in a directory present only in one branch, and then checkout master branch while in that directory, it gets created in the master branch. is that normal? | 12:56 |
| ← alansaul_ left | 12:56 |
| ← sebuba left | 12:56 |
|
Bombe
| It does not get created anywhere. | 12:57 |
| → svetlyak40wt joined | 12:57 |
|
Bombe
| If it’s not tracked, Git won’t touch it. | 12:57 |
|
| (Git doesn’t track directories, anyway.) | 12:57 |
| ← thyseus left | 12:57 |
| ← teukka left | 12:58 |
|
lugzer
| Bombe, okay, but I am seeing them created (only directories). | 12:58 |
| → ij joined | 12:58 |
|
ij
| What do you guys think about cross-branch fast-forward merges? | 12:58 |
|
jast
| for real merges I tend to prefer merge commits | 12:59 |
| → thyseus joined | 12:59 |
|
jast
| i.e. if I want to leave a record that something was merged | 12:59 |
| ← tirengarfio_ left | 12:59 |
| ← tirengarfio left | 12:59 |
|
Bombe
| lugzer, if you are in a directory while performing git checkout, how can you see it being created? | 13:00 |
|
| (Hint: you can’t. Because it’s not created.) | 13:00 |
| ← agile left | 13:00 |
|
lugzer
| Bombe, try "git checkout -b testbranch", "mkdir test && cd test", "touch index.html", "git add . && git commit -am 'commit'", "git checkout master" -- you will see what i mean | 13:00 |
| → teukka joined | 13:01 |
|
EugeneKay
| ij - they hide the "path" that the merging branch takes to get to the destination commit(via HEAD~ watching). Whether this is acceptable to your workflow is largely a religious matter. | 13:01 |
| → tirengarfio joined | 13:01 |
| → bmac joined | 13:02 |
|
Bombe
| lugzer, I do not see what you mean. The directory you created is gone. | 13:02 |
|
| As one would expect it to because there’s nothing in it which is in master. | 13:02 |
|
lugzer
| Bombe, then I don't understand why I am seeing the directory created in master after the same operation | 13:03 |
| → sander^work joined | 13:03 |
| → davidban_ joined | 13:03 |
| ← sysadminAli left | 13:04 |
|
YoungFrog
| lugzer: after 'git checkout master', if I do 'git status', I get an error fatal: Unable to read current working directory: | 13:04 |
|
| (because the directory is non existent, even if the shell still thinks I'm in it) | 13:04 |
| ← rastar left | 13:04 |
|
Bombe
| lugzer, then you’re probably doing something else. Or your system is broken. The directory doesn’t exist in master, and it won’t simply get created. | 13:04 |
|
lugzer
| Bombe, ok I understand now - it was the damn editor which was forcing these directories to be created? sorry, that was lame | 13:04 |
|
Bombe
| Yes, that was lame. :) | 13:04 |
|
lugzer
| (as I had them opened for edit in an editor) | 13:05 |
|
sander^work
| Hi. Does gitignore files make a file downloadable on a clone, but ignored on push? | 13:05 |
| → valtih joined | 13:05 |
|
EugeneKay
| sander^work - no; man gitignore. It's for telling git to ignore untracked files in your working directory(eg, build output) | 13:05 |
|
gitinfo
| sander^work: the gitignore manpage is available at http://jk.gs/gitignore.html | 13:05 |
| → wolfmitchell joined | 13:05 |
| ← bestform left | 13:05 |
| → milStaja joined | 13:05 |
| → Shurakai joined | 13:05 |
| → hafeez3000 joined | 13:06 |
|
grawity
| sander^work: No. `git push` always pushes commits unaltered. "gitignore" only applies when adding files to a new commit. | 13:06 |
| → Droolio joined | 13:06 |
|
valtih
| I have one commit. Then, I add one file and make another commit. Now, I rebase interactively: pick the first and squash the second. Two initial commits are replaced by one in result. So far so good. The problem is that the new file is missing in the result. How is this possible? | 13:07 |
| ← davidbanham left | 13:07 |
| → Sky[x] joined | 13:07 |
|
sander^work
| I've read the manpage.. But I want to be sure an initial version of the file follows the repository even if I dont want to track it. | 13:07 |
| → sebuba joined | 13:08 |
|
EugeneKay
| sander^work - !config | 13:08 |
|
gitinfo
| sander^work: [!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 ideas | 13:08 |
| → hafeez3000_ joined | 13:08 |
| ← skorgon left | 13:08 |
|
sander^work
| EugeneKay, I want everyone to not be able to add some spesific files. | 13:09 |
| ← samio left | 13:10 |
| ← bmac left | 13:10 |
| → jcromartie joined | 13:10 |
| → skorgon joined | 13:10 |
| ← deavidsedice left | 13:10 |
|
e-dard
| jast: what about if I use the gitignore file to ignore parts of the repository I don't want? Is that a possibility? | 13:11 |
| ← kristofers left | 13:11 |
|
grawity
| Add something.conf to .gitignore, and add something.conf.example to the actual repository | 13:11 |
|
YoungFrog
| valtih: I don't see that behaviour. | 13:11 |
|
EugeneKay
| git either tracks a file or it doesn't. gitignore doesn't change that | 13:11 |
| ← hafeez3000 left | 13:12 |
| hafeez3000_ → hafeez3000 | 13:12 |
|
EugeneKay
| WHat gitignore changes is the behaviour of 'git status' and 'git add' for files that are not tracked | 13:12 |
|
| That's it. | 13:12 |
| ← mmitchell left | 13:12 |
| ← rockfruit left | 13:13 |
| → gregsmith joined | 13:13 |
| → gusnan joined | 13:13 |
|
EugeneKay
| If you want the file to not be tracked in your repo, but still provide an example file, do as the configfiles factoid says and provide a ".example" file. | 13:13 |
|
| Put something in the README to make a copy of it | 13:13 |
| → rockfruit joined | 13:14 |
| → miso1337 joined | 13:15 |
| ← tPl0ch left | 13:15 |
| ← fflush left | 13:15 |
| → fflush joined | 13:15 |
| → speidy1` joined | 13:16 |
| → deavid joined | 13:17 |
| ← speidy left | 13:18 |
| adhawkins-away → adhawkins | 13:18 |
| → rastar joined | 13:18 |
| ← skorgon left | 13:19 |
| ← marhaban left | 13:19 |
| → amigojapan joined | 13:19 |
| ← Grum left | 13:19 |
| ← hafeez3000 left | 13:20 |
|
valtih
| Here is the archive, http://speedy.sh/tQuXv/.git.zip You 'git rebase -i HERAD~2', pick first commit 0c2b399 and squash with second 84f800e. You will recieve a conflict on a third file, just move it into index area and rebase -- continue. Please note that bug.vhdl, contained in the second commit has disappeared. | 13:20 |
|
amigojapan
| hi, is there a channel for the gists api, or can I ask here? I want to udenrstand how the authentication process for gists api works, I cant udnerstadn teh documentation very well,can someone explain it please | 13:20 |
| → skorgon joined | 13:20 |
|
adhawkins
| amigojapan: #github might be more appropriate. | 13:20 |
| ← revagomes left | 13:21 |
|
amigojapan
| ok adhawkins | 13:21 |
| → Grum joined | 13:21 |
|
EugeneKay
| From my experience with github's API, the answer is "poorly" | 13:22 |
| → hafeez3000 joined | 13:22 |
| ← e-dard left | 13:22 |
| → cmmagid joined | 13:22 |
| ← cmmagid left | 13:23 |
|
sander^work
| EugeneKay, does /* match all . files also? | 13:23 |
| → hinst joined | 13:23 |
| ← skorgon left | 13:23 |
|
sander^work
| with gitignore | 13:23 |
|
EugeneKay
| Yes. | 13:23 |
|
sander^work
| Thanks :-) | 13:24 |
| ← Guest27074 left | 13:24 |
| ← subhojit777 left | 13:24 |
| → Matek joined | 13:24 |
| → foofoobar joined | 13:25 |
| ← dharrigan left | 13:25 |
| → dharrigan joined | 13:26 |
| ← dharrigan left | 13:26 |
| → dharrigan joined | 13:26 |
| → revagomes joined | 13:26 |
| ← keller left | 13:26 |
| → skorgon joined | 13:27 |
| ← miso1337 left | 13:27 |
| → jcao219 joined | 13:28 |
| → OOPMan joined | 13:28 |
| ← aspiers left | 13:29 |
| → tomoyuki28jp joined | 13:29 |
| → sgambino joined | 13:29 |
| ← Fandekasp left | 13:29 |
| → cohwsw joined | 13:30 |
|
tomoyuki28jp
| How can I checkout a file which used to exists but has gone? | 13:30 |
|
EugeneKay
| man git-checkout; last syntax | 13:31 |
|
gitinfo
| the git-checkout manpage is available at http://jk.gs/git-checkout.html | 13:31 |
| ← myx left | 13:31 |
| → Fandekasp joined | 13:31 |
| → wasanzy joined | 13:32 |
| → karptonite joined | 13:32 |
| ← yshh left | 13:33 |
| → R1KRDO joined | 13:33 |
|
YoungFrog
| valtih: I have no bug.vhdl (anywhere), I have no conflict either, but there is a file named bug.vhd in the resulting commit | 13:33 |
| → myx joined | 13:33 |
| → MacWinner joined | 13:33 |
| ← R1KRDO left | 13:34 |
| → R1KRDO joined | 13:34 |
| ← dharrigan left | 13:34 |
| ← jcromartie left | 13:35 |
| ← alunduil left | 13:35 |
| → dharrigan joined | 13:35 |
| ← dharrigan left | 13:36 |
| → dharrigan joined | 13:36 |
| ← rfoust left | 13:36 |
|
tomoyuki28jp
| git checkout ID PATH returns me 'did not match any file(s) known to git.' | 13:36 |
|
valtih
| If you add these files http://www.speedyshare.com/8CSU2/b01.zip into your work dir? | 13:36 |
| ← jcao219 left | 13:36 |
| ← dhruvasagar left | 13:36 |
|
valtih
| YoungFrog: | 13:36 |
| ← speidy1` left | 13:36 |
| ← dhruvasa1ar left | 13:36 |
| → speidy joined | 13:36 |
|
valtih
| can existing file in the working dir cause lost files after sqash? | 13:36 |
| → javaprogger joined | 13:37 |
| → rgr joined | 13:38 |
| ← buibex left | 13:38 |
| → kristofers joined | 13:39 |
|
YoungFrog
| valtih: those files are the working dir of HEAD (except .project) | 13:40 |
|
| I don't see why existing files would interfere. If they don't match HEAD, git won't allow you to rebase (unless they are untracked or ignored of course) | 13:42 |
|
valtih
| I get a rebase conflict at modelism.do | 13:42 |
| → chisler joined | 13:42 |
| ← tirengarfio left | 13:42 |
| ← wasanzy left | 13:42 |
| → speidy1` joined | 13:43 |
| ← karptonite left | 13:43 |
| ← sontek left | 13:44 |
| → sontek joined | 13:44 |
| → tirengarfio joined | 13:44 |
| ← teukka left | 13:44 |
| → ajeffco joined | 13:44 |
| → goshawk joined | 13:45 |
| ← speidy left | 13:46 |
|
YoungFrog
| after unzipping, here is what happens when rebasing : http://pastebin.com/7VmNF0sf | 13:46 |
|
| valtih: so no conflict for me. | 13:46 |
| ← glennpratt left | 13:47 |
| → karptonite joined | 13:47 |
| → sweb joined | 13:47 |
| → geekbri joined | 13:48 |
| ← sweb left | 13:48 |
| ← davidban_ left | 13:48 |
| → jjido joined | 13:50 |
|
valtih
| This is odd. Thanks, YoungFrog | 13:50 |
| ← Chryyz left | 13:51 |
| ← zoresvit left | 13:52 |
| → negaduck joined | 13:52 |
|
YoungFrog
| You may want to try redownloading your own files and trying from an empty directory as I did. I tried to read your reflog but can't make any sense out of it. | 13:52 |
| → freeed joined | 13:53 |
| → sysadminAli joined | 13:54 |
| → teukka joined | 13:54 |
| ← smirn0v left | 13:55 |
| → zoresvit joined | 13:55 |
| ← johnthebear left | 13:55 |
|
lyang0
| how to get the oldest commit id in tree | 13:56 |
| → smirn0v joined | 13:57 |
| ← arvind_khadri left | 13:58 |
| ← rastar left | 13:58 |
| ← Fandekasp left | 13:59 |
| ← hafeez3000 left | 13:59 |
| ← tirengarfio left | 13:59 |
| → asaf joined | 14:00 |
| ← n1x left | 14:00 |
| → hafeez3000 joined | 14:00 |
| → acrocity joined | 14:01 |
| → tirengarfio joined | 14:01 |
| → handsome_cam joined | 14:01 |
| → yshh joined | 14:01 |
| ← beautifulmind left | 14:01 |
|
whowantstolivefo
| i finished my tests and try to push my files. i get this error, how can i fix it ? https://gist.github.com/4691423 ?? and when i type " ssh-add -l " i get this 2048 58:ac:6a:6d:f5:b9:ff:46:c1:0b:fa:60:db:33:88:b7 [email@hidden.address] (RSA) | 14:02 |
| lyang0 → Adele | 14:02 |
| ← Matek left | 14:02 |
| → rfoust joined | 14:04 |
| → arietis joined | 14:05 |
| → abcdefg_ joined | 14:05 |
| → ojacobson joined | 14:05 |
| → huoxito joined | 14:05 |
| ← rfoust left | 14:05 |
| ← gregsmith left | 14:06 |
| ← handsome_cam left | 14:06 |
| → teriyakis joined | 14:07 |
|
Adele
| I'm Adele | 14:07 |
|
lb1a
| whowantstolivefo: your key isn't regognized by the remote | 14:07 |
| → gregsmith joined | 14:08 |
| → breakingthings joined | 14:08 |
| → buibex joined | 14:08 |
|
whowantstolivefo
| lb1a: how i will recognize ? | 14:09 |
| → john_anderson joined | 14:09 |
| ← javaprogger left | 14:09 |
|
lb1a
| whowantstolivefo: make sure that your remote accepts your ssh key. | 14:10 |
|
whowantstolivefo
| lb1a: how i will make sure ? i have ssh key in my github command | 14:10 |
|
lb1a
| whowantstolivefo: what does "git remote -v" tell you? | 14:10 |
|
whowantstolivefo
| https://gist.github.com/4691516 << telling me this | 14:11 |
| ← wrouesnel left | 14:11 |
| ← foofoobar left | 14:12 |
| ← teriyakis left | 14:12 |
|
lb1a
| whowantstolivefo: i'm guessing you are trying to push to heroku. instead your git client tries to push to github (because it's your origin and tracked by default if you cloned) and github doesnt accept your id_rsa.pub key | 14:13 |
|
| whowantstolivefo: if you want to push to heroku say "git push heroku <branch>" | 14:13 |
| ← ehsan left | 14:13 |
|
lb1a
| whowantstolivefo: if you want to push to github, check you ssh keys at the github homepage | 14:14 |
| ← Xethron left | 14:14 |
|
lb1a
| or your ~/.ssh/config | 14:14 |
|
whowantstolivefo
| wait me i will check my ssh keys | 14:14 |
| → infynyxx joined | 14:15 |
| ← yshh left | 14:15 |
| → davidbanham joined | 14:16 |
| → kenperkins joined | 14:16 |
|
whowantstolivefo
| https://gist.github.com/4691516 <<<< | 14:16 |
| ← ij left | 14:16 |
| → kumbayo joined | 14:16 |
| ← buibex left | 14:16 |
| → AAA_awright_ joined | 14:17 |
| ← ankurankan left | 14:17 |
|
lb1a
| whowantstolivefo: http://wiki.ubuntuusers.de/SSH | 14:17 |
|
| whowantstolivefo: http://wiki.ubuntuusers.de/SSH#ssh-config | 14:18 |
| → yshh joined | 14:18 |
| → Xethron joined | 14:18 |
| ← john_anderson left | 14:18 |
| → kill-9_ joined | 14:18 |
| → marhaban joined | 14:19 |
| → m0ltar joined | 14:19 |
|
whowantstolivefo
| i have only >>>>>> id_rsa id_rsa.pub key_backup known_hosts <<<<<<<< these files in .ssh ? | 14:19 |
|
lb1a
| whowantstolivefo: your don't need the config, it's just a helper. anyway, your pushtarget doesn't recognize this key. | 14:19 |
|
| whowantstolivefo: https://github.com/settings/ssh | 14:20 |
|
| make sure you've added your pub key there | 14:20 |
|
whowantstolivefo
| i am stuck of here letme look github/setting/ssh | 14:20 |
|
lb1a
| whowantstolivefo: https://help.github.com/articles/error-permission-denied-publickey | 14:20 |
|
whowantstolivefo
| lb1a: [email@hidden.address] (b8:60:34:0a:e0:1c:b4:da:c3:25:fe:a3:32:35:72:8d) <<< in my github page SSH keys is this. | 14:21 |
| → dvide joined | 14:21 |
| → cannonball joined | 14:21 |
|
lb1a
| whowantstolivefo: if that's your id_rsa.pub your fine. check your user upon connection. to push to github it must be user "git" and not your local username or your github username | 14:22 |
|
| read the FAQ page, there are the most common errors listed | 14:23 |
|
whowantstolivefo
| lb1a: let me figure out i am newbie about programming and push stuff i will figure out it with your helpful links i will let you know soon | 14:24 |
| ← rockfruit left | 14:24 |
| ← lun__ left | 14:24 |
| ← davidbanham left | 14:25 |
| → matthias_dev joined | 14:26 |
| ← h0bbit left | 14:27 |
| → hsn joined | 14:28 |
| → thl0 joined | 14:29 |
|
hsn
| how do i revert already pushed commit? i need reversed cherrypick on that commit | 14:29 |
|
jast
| git revert | 14:29 |
| → rockfruit joined | 14:30 |
|
lb1a
| jast: sometimes the answer is so simple ;) | 14:30 |
| → alunduil joined | 14:30 |
|
hsn
| i did git rever xxxxx and it still working - about 30 seconds now | 14:31 |
| ← tinti left | 14:31 |
|
jast
| that's... highly unusual | 14:31 |
| ← exoon left | 14:31 |
| → exoon joined | 14:32 |
| ← pretty_function left | 14:32 |
| ← alunduil left | 14:32 |
| ← huoxito left | 14:33 |
| ← ESphynx left | 14:33 |
| → alunduil joined | 14:33 |
| → glennpratt joined | 14:33 |
| ← n4irc left | 14:34 |
| → Milossh joined | 14:34 |
|
hsn
| i had configured some weird X11 editor which took forever to start | 14:34 |
| ← Milossh left | 14:34 |
|
hsn
| i was afraid that repo got corrupted | 14:35 |
|
jast
| phew :) | 14:35 |
| → Milossh joined | 14:35 |
| → sbodo joined | 14:36 |
| → mmitchell joined | 14:36 |
| ← lugzer left | 14:37 |
|
hsn
| what is command for checking if repo is not corrupted | 14:38 |
|
jast
| git fsck | 14:38 |
| → aspiers joined | 14:39 |
| ← FernandoBasso left | 14:39 |
| → lun_ joined | 14:40 |
|
whowantstolivefo
| lb1a: i added new SSH key to my github finally :) | 14:40 |
| ← karptonite left | 14:41 |
| ← hafeez3000 left | 14:41 |
| → hafeez3000 joined | 14:42 |
| → nkr joined | 14:42 |
| → buibex joined | 14:42 |
| ← timj left | 14:43 |
| ← thl0 left | 14:43 |
| → foofoobar joined | 14:44 |
| → hellopat joined | 14:44 |
| ← hsn left | 14:44 |
| ← svetlyak40wt left | 14:45 |
| → svetlyak40wt joined | 14:45 |
| ← normanrichards left | 14:45 |
| → flavius joined | 14:46 |
| → AaronMT joined | 14:46 |
| ← negaduck left | 14:47 |
|
lb1a
| whowantstolivefo: yw | 14:48 |
| → bil` joined | 14:48 |
|
whowantstolivefo
| lb1a: but now i have another problem | 14:48 |
| → giallu joined | 14:48 |
| → karptonite joined | 14:49 |
| ← aspiers left | 14:49 |
| ← teukka left | 14:49 |
| ← valgrind left | 14:49 |
| ← AAA_awright_ left | 14:49 |
| ← karptonite left | 14:49 |
|
whowantstolivefo
| lb1a: https://gist.github.com/4691728 << | 14:49 |
| ← buibex left | 14:49 |
| → teukka joined | 14:51 |
| ← Infiltrator left | 14:52 |
|
lb1a
| whowantstolivefo: http://bit.ly/XsDNHB | 14:52 |
| → Infiltrator joined | 14:52 |
| → lifelike joined | 14:53 |
|
lb1a
| whowantstolivefo: https://help.github.com/articles/error-agent-admitted-failure-to-sign ^^ | 14:53 |
| ← JDuke128 left | 14:54 |
| → buibex joined | 14:54 |
| ← samuel02 left | 14:55 |
| ← soee left | 14:55 |
|
whowantstolivefo
| lb1a: i think i made wrong at here >>> Enter passphrase for /home/aslan/.ssh/id_rsa: << | 14:55 |
| ← OOPMan left | 14:55 |
|
whowantstolivefo
| lb1a: what is passphrase ? my github password ? | 14:56 |
|
lb1a
| whowantstolivefo: your passphrase that you setup when you generated the key | 14:56 |
| → v0n joined | 14:56 |
| ← Ikoo left | 14:56 |
|
whowantstolivefo
| Server host key: RSA 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48 <<< this one ? | 14:56 |
| ← kill-9_ left | 14:56 |
|
lb1a
| that looks liek a fingerprint to me | 14:57 |
|
whowantstolivefo
| yes it is ? | 14:57 |
|
lb1a
| a passphrase is a password. setup while creating the ssh key. you'll have to remember | 14:57 |
| ← rgr left | 14:57 |
|
whowantstolivefo
| lb1a: >>> Identity added: /home/aslan/.ssh/id_rsa (/home/aslan/.ssh/id_rsa) <<< | 14:58 |
| → x82_nicole joined | 14:59 |
| → rugged joined | 15:00 |
|
whowantstolivefo
| lb1a: i pick it up!! thank you " git push " worked here but now have another problem same git push.. about git push heroku master >>> https://gist.github.com/4691801 | 15:00 |
| → tmcmahon joined | 15:01 |
|
whowantstolivefo
| need heroku keys:add ? | 15:01 |
| ← svetlyak40wt left | 15:01 |
| → krispin1 joined | 15:01 |
|
lb1a
| whowantstolivefo: this is not git specific. try the heroku docs on their page or #heroku | 15:01 |
| ← krispin left | 15:01 |
|
whowantstolivefo
| okay | 15:02 |
|
| lb1a: thank you very much! | 15:02 |
| → ehsan joined | 15:02 |
| ← myx left | 15:02 |
|
lb1a
| whowantstolivefo: you're welcome | 15:02 |
| → oreth joined | 15:02 |
|
whowantstolivefo
| lb1a: i got it over also :) now uploading! | 15:02 |
| → svetlyak40wt joined | 15:03 |
| ← bartek left | 15:03 |
| → bartek joined | 15:04 |
| → TeckniX joined | 15:04 |
| ← aldskf3 left | 15:05 |
| → mmitchel_ joined | 15:05 |
| ← jjido left | 15:05 |
| → wave joined | 15:06 |
|
wave
| I did this git config core.filemode false, but I committed already files those mode changed. So can I somehow uncommit them? | 15:07 |
| ← ehsan left | 15:07 |
|
wave
| I think this should keep my changed on a commit tree and uncommit? git reset --soft HEAD^ | 15:08 |
| ← mmitchell left | 15:08 |
| ← skorgon left | 15:09 |
|
EugeneKay
| !amend | 15:09 |
|
| Hrm. | 15:09 |
|
| wave - man git-commit; see --amend. | 15:09 |
|
gitinfo
| wave: the git-commit manpage is available at http://jk.gs/git-commit.html | 15:09 |
|
EugeneKay
| Just change the files how you want; add, then amend ;-) | 15:09 |
|
wave
| thank you, got it uncommitted | 15:10 |
|
| but how can I ignore change of file modes? | 15:10 |
|
| I don't want upload whole repository | 15:10 |
| → skorgon joined | 15:10 |
| → normanrichards joined | 15:10 |
| ← lausi left | 15:11 |
| → lausi joined | 15:11 |
| → kill-9_ joined | 15:11 |
| → luc___ joined | 15:11 |
| → spuz joined | 15:11 |
| adhawkins → adhawkins-away | 15:12 |
| ← flijten left | 15:13 |
| ← gregsmith left | 15:13 |
| → johnthebear joined | 15:13 |
| → timj joined | 15:13 |
| ← eletuchy left | 15:14 |
| → thl0 joined | 15:14 |
| → saby joined | 15:14 |
|
saby
| Hi | 15:14 |
|
gitinfo
| saby: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 15:14 |
| → michaelmartinez joined | 15:15 |
|
saby
| !topic | 15:15 |
| → jstn joined | 15:15 |
| gitinfo set mode: +v | 15:15 |
| → Gentlecat joined | 15:16 |
| → natechan joined | 15:16 |
| ← jstn left | 15:16 |
| → davidbanham joined | 15:16 |
|
saby
| Hi, we are currently using SVN as our central repository and are planning to move to Git What according to you should be the best procedure to migrate all the code from SVN to Git and also get all the commit history in Git, so that if we want to move back to a previous version of code then we can easily do that. | 15:17 |
| → flijten1 joined | 15:17 |
| → Destos joined | 15:18 |
| ← tomoyuki28jp left | 15:18 |
| ← thl0 left | 15:18 |
| → thl0 joined | 15:18 |
|
jast
| there's git-svn... it's slightly eccentric, though | 15:18 |
| ← Gentlecat__ left | 15:18 |
|
grawity
| reposurgeon can load svnadmin dumps | 15:18 |
| → javaprogger joined | 15:19 |
| ← goshawk left | 15:19 |
| → wasanzy joined | 15:19 |
| → kermit joined | 15:20 |
| → clreed87 joined | 15:20 |
| → daniel_- joined | 15:21 |
| ← daniel_- left | 15:21 |
| → daniel_- joined | 15:21 |
| ← netiul left | 15:22 |
| → jesfre joined | 15:22 |
|
fflush
| saby: you might want to read http://blogs.atlassian.com/2013/01/atlassian-svn-to-git-migration-technical-side/?utm_source=GooglePlus&utm_medium=Atlassian&utm_campaign=Stash | 15:22 |
|
lb1a
| if i do a git svn clone <some-svn-repo> and after that i clone that cloned git repo somewhere else, will the svn metadata get lost? | 15:22 |
|
| !migration | 15:22 |
|
saby
| thanks fflush :) | 15:22 |
|
| jast does git-svn also migrate the commit history so that we can revert back to previous code if required? | 15:23 |
|
jast
| it does migrate the commit history | 15:23 |
|
| though you have to take care if you want all branches etc. to use the right parameters | 15:23 |
|
| lb1a: metadata can't be cloned via the git protocol | 15:23 |
|
| git-svn metadata, that is | 15:23 |
|
lb1a
| saby: if you create an authors file, it will map all old users to new users in git | 15:24 |
|
saby
| ya we would require all the branches as we want to get rid of SVN completely | 15:24 |
| ← infynyxx left | 15:24 |
|
grawity
| migrating the commit history is the whole point of git-svn | 15:24 |
|
jast
| it's technically possible to clone and then do a new init/fetch, but no promises that it'll work :} | 15:24 |
|
saby
| how's SubGit? | 15:24 |
|
lb1a
| jast: i want to get rid of the svn metadata ;) | 15:24 |
| ← timj left | 15:24 |
|
saby
| heard that's better than git-svn | 15:24 |
|
grawity
| saby: i'd say just try all three | 15:25 |
| ← davidbanham left | 15:25 |
| ← bauruine left | 15:25 |
|
saby
| grawity all three?? 1. Git-SVN, 2. SubGit, 3. ?? | 15:25 |
|
grawity
| reposurgeon | 15:25 |
|
saby
| ah ok | 15:25 |
| → Arktos joined | 15:25 |
|
cheater_
| hi | 15:26 |
| ← x82_nicole left | 15:26 |
| ← beliveyourdream left | 15:26 |
| ← kenperkins left | 15:27 |
| ← michaelmartinez left | 15:27 |
| → ISF joined | 15:27 |
| → OOPMan joined | 15:27 |
|
cheater_
| i have a git repo where someone checked a lot of huge files, then they got removed, and people went on developing like this. i would like to find out what the biggest files are (whether they exist in the current rev or not). how can i obtain this info? | 15:27 |
|
| *checked in | 15:27 |
| → erichynds joined | 15:29 |
| → goshawk joined | 15:29 |
| → techhelp joined | 15:29 |
| ← WinstonSmith left | 15:30 |
| → eletuchy joined | 15:30 |
| ← tmcmahon left | 15:32 |
| ← Arktos left | 15:32 |
| → myx joined | 15:32 |
| ← krispin1 left | 15:33 |
| ← marhaban left | 15:34 |
| ← javaprogger left | 15:34 |
| ← techhelp left | 15:34 |
| ← mnx| left | 15:34 |
| → john2496 joined | 15:34 |
| → ash4 joined | 15:35 |
| → odin_ joined | 15:35 |
| ← tbosua left | 15:36 |
| ← MissionCritical left | 15:36 |
| ← fasta left | 15:37 |
| → timj joined | 15:38 |
| → WinstonSmith joined | 15:38 |
| → drizzd joined | 15:38 |
| → axl_ joined | 15:38 |
| → ehsan joined | 15:40 |
| → dermoth|work joined | 15:40 |
| → x82_nicole joined | 15:40 |
| → AnimeCYC joined | 15:40 |
| → pfFredd joined | 15:41 |
| → ThePeach joined | 15:42 |
| → OliverJAsh joined | 15:42 |
| → Noldorin joined | 15:42 |
|
ThePeach
| hi all. if I need to add a tag to a specific commit, would it work: git checkout <commit>; git tag -a "newtag" ? | 15:42 |
|
OliverJAsh
| How can I see which commit a file was first introduced by? | 15:43 |
| → aksnot joined | 15:43 |
| → n4irc joined | 15:43 |
| → zenx joined | 15:43 |
|
comps
| ThePeach: git tag -a newtag <commit> | 15:43 |
|
ThePeach
| oh that's even better | 15:43 |
| ← milStaja left | 15:43 |
|
ThePeach
| thanks comps | 15:43 |
| ← asaf left | 15:44 |
| ← exoon left | 15:44 |
| → infynyxx joined | 15:44 |
| → jcromartie joined | 15:45 |
|
comps
| OliverJAsh: something like git log --oneline -- path/to/file | tail -n1 ? | 15:45 |
| → Mission-Critical joined | 15:45 |
|
comps
| being very basic, it does not follow renames | 15:45 |
| ← eletuchy left | 15:46 |
|
OliverJAsh
| cheers | 15:46 |
| → setmeaway joined | 15:46 |
| → Chryyz joined | 15:48 |
| → cmmagid joined | 15:48 |
| → kalanag joined | 15:49 |
| → ijuma joined | 15:49 |
| → rideh joined | 15:49 |
| ← lb1a left | 15:50 |
| ← laurav left | 15:50 |
| ← flijten1 left | 15:50 |
| ← memoryleak left | 15:52 |
| → laurav joined | 15:53 |
| → michaelmartinez joined | 15:54 |
|
EugeneKay
| !stats | 15:54 |
|
gitinfo
| [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html | 15:54 |
|
EugeneKay
| .trigger_edit irclog Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html | 15:55 |
|
gitinfo
| EugeneKay: Okay. | 15:55 |
| Mission-Critical → MissionCritical | 15:55 |
|
EugeneKay
| Yes, I'm too lazy to import old logs from the logger. | 15:55 |
| ← aksnot left | 15:55 |
|
cmn
| the second link doesn't work | 15:56 |
|
| third, rather | 15:56 |
|
EugeneKay
| Give it a minute, still generating | 15:56 |
|
cmn
| ah, you tease | 15:56 |
|
EugeneKay
| ;-) | 15:56 |
|
| F5 now | 15:56 |
|
cmn
| nope, still 404 | 15:57 |
|
EugeneKay
| Pretty sure it isn't | 15:58 |
|
YoungFrog
| "works for me" | 15:58 |
|
cmn
| not for me | 15:58 |
|
EugeneKay
| F5 harder | 15:58 |
| → kevwil joined | 15:58 |
| ← un1matr1x| left | 15:59 |
| → jaequery joined | 15:59 |
| → un1matr1x| joined | 15:59 |
|
cmn
| ok, F5'd harder (ran curl from a different machine) and it worked | 15:59 |
| → nicklasbo joined | 15:59 |
|
cmn
| I must be behind some stupid-add transparent proxy | 15:59 |
| ← alorence left | 15:59 |
|
cmn
| s/add/ass/ | 15:59 |
|
EugeneKay
| ;-) | 15:59 |
| → ejd joined | 15:59 |
| ← maxmanders left | 16:00 |
|
cmn
| yep, there's a squid rewriting my HTTP | 16:00 |
| ← clreed87 left | 16:00 |
| → maxmanders joined | 16:00 |
|
EugeneKay
| I have a fishing pole if you need | 16:01 |
|
| You can load it over https | 16:01 |
| ← snql left | 16:01 |
| ← tvw left | 16:01 |
| ← maxmanders left | 16:01 |
|
cmn
| that's too easy, I openend a socks proxy with ssh that goes over my sever | 16:02 |
|
| I have too much bandwidth anyway | 16:02 |
|
EugeneKay
| Heh | 16:02 |
| → clreed87 joined | 16:02 |
| → swiety joined | 16:02 |
| ← itatitat left | 16:02 |
| → maxmanders joined | 16:03 |
| → wongon_ joined | 16:03 |
| ← wongon left | 16:03 |
| wongon_ → wongon | 16:03 |
| → d2dchat joined | 16:03 |
|
cmn
| heh, in the total count I'm beating cbreak by words | 16:03 |
| → skyf joined | 16:04 |
| ChanServ set mode: +o | 16:04 |
| EugeneKay changed the topic to: Latest version: 1.8.1.2 | http://git-scm.com | Help with git and #git: http://jk.gs/git/ | Git Wars II: Attack of the Clones | Getting "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | 16:04 |
| EugeneKay set mode: -o | 16:04 |
| → arex\ joined | 16:04 |
| gitinfo set mode: +v | 16:04 |
|
arex\
| I suspect my git repo has been corrupted. http://pastie.org/private/kboolsq1dd1f1hc0oomjw | 16:04 |
| → john_anderson joined | 16:04 |
| ← psoo left | 16:05 |
|
EugeneKay
| man git-fsck | 16:05 |
|
gitinfo
| the git-fsck manpage is available at http://jk.gs/git-fsck.html | 16:05 |
|
cmn
| that just shows you're in an unborn branch | 16:05 |
| ← rockfruit left | 16:05 |
|
YoungFrog
| bare repositories do that | 16:05 |
| → rockfruit joined | 16:05 |
|
cmn
| do what? | 16:05 |
| ← ISF left | 16:06 |
|
YoungFrog
| Show the given message. Don't they ? | 16:06 |
|
cmn
| no more than any other repo | 16:06 |
|
| there is simply no correlation between unborn branches and bare repos | 16:07 |
| → dhruvasagar joined | 16:07 |
| → dhruvasa1ar joined | 16:07 |
| ← Davey left | 16:07 |
|
EugeneKay
| Empty repos != bare repos | 16:07 |
| → eletuchy joined | 16:08 |
| → catlee joined | 16:08 |
| ← ajeffco left | 16:09 |
| → jerikl joined | 16:09 |
| → kergoth joined | 16:10 |
| ← luc___ left | 16:11 |
| ← axl_ left | 16:11 |
| ← amigojapan left | 16:11 |
|
catlee
| hi - I'm trying to do something that's possibly not a great idea...I'm fetching a bunch of unrelated repos into a single local repo. My builds then do local shared clones from the local repo to their build directory using specific refs to get the contents they need | 16:11 |
| → techhelp joined | 16:12 |
| → kcj joined | 16:12 |
| → krispin joined | 16:12 |
| ← thl0 left | 16:12 |
| ← kergoth left | 16:12 |
| → beaky joined | 16:12 |
|
beaky
| hello | 16:12 |
| ← revyd left | 16:13 |
|
beaky
| how do I merge changes from my master branch into all of my development and topic branches? | 16:13 |
| ← svetlyak40wt left | 16:13 |
|
RandalSchwartz
| one at a time | 16:13 |
|
| because any one of those might fail | 16:13 |
|
beaky
| ah | 16:13 |
| ← rath left | 16:13 |
|
RandalSchwartz
| takes a human to oversee that | 16:13 |
| ← Sigma left | 16:13 |
|
beaky
| yep | 16:13 |
|
EugeneKay
| Pfffft, -Xtheirs | 16:14 |
|
beaky
| I think I have too many branches :( | 16:14 |
| → thl0 joined | 16:14 |
|
EugeneKay
| Works magic. | 16:14 |
|
RandalSchwartz
| heh! | 16:14 |
| → axl_ joined | 16:14 |
|
RandalSchwartz
| "I got yer upstream... RIGHT HERE..." :) | 16:14 |
| ← angelsl left | 16:14 |
|
catlee
| the local clones work well actually. but I've noticed that fetching new remotes into the giant shared repo takes orders of magnitude more time than a simple clone | 16:14 |
| → michaelmartinez_ joined | 16:15 |
| ← dermoth|work left | 16:16 |
| ← cbreak-work left | 16:16 |
| ← michaelmartinez left | 16:16 |
| michaelmartinez_ → michaelmartinez | 16:16 |
| → gregsmith joined | 16:16 |
|
beaky
| is it a good idea to delete branches? | 16:17 |
| → davidbanham joined | 16:17 |
|
PerlJam
| beaky: if they are no longer useful, sure. | 16:17 |
|
beaky
| ah | 16:17 |
|
| yes I wanna just merge all those done topic branches to my development branch | 16:17 |
| → thatguycraig joined | 16:18 |
| → lethjakman_lapto joined | 16:18 |
|
beaky
| oh noes, a merge conflict!11 | 16:18 |
| → relipse joined | 16:18 |
|
beaky
| git ftw | 16:18 |
| ← rchavik left | 16:19 |
|
beaky
| without it my workflow would be hell managing all those timestamped tarballs :( | 16:19 |
| → aberrant joined | 16:19 |
|
PerlJam
| beaky: I predict lots of merge conflicts in your future btw. From what you've said of your workflow, it sounds like you let branches linger a bit. | 16:20 |
|
beaky
| yeah :( | 16:20 |
| ← mklappstuhl left | 16:20 |
| ← papegaaij left | 16:20 |
|
beaky
| i need to improve my habits | 16:20 |
|
| my git graph looks like scooby doo | 16:21 |
| ← meLon left | 16:21 |
| ← Sonderblade left | 16:21 |
| → fisted joined | 16:21 |
| ← infynyxx left | 16:22 |
| ← lun_ left | 16:22 |
| ← cmmagid left | 16:22 |
| → meLon joined | 16:23 |
| → infynyxx joined | 16:23 |
| → cmmagid joined | 16:24 |
| ← jatt left | 16:24 |
| → mklappstuhl joined | 16:25 |
| ← relipse left | 16:25 |
| ← davidbanham left | 16:25 |
| → leokaito joined | 16:25 |
| → marhaban joined | 16:26 |
| → DeltaHeavy joined | 16:26 |
| ← anish[1] left | 16:27 |
| ← thl0 left | 16:27 |
| ← nilg left | 16:27 |
|
beaky
| how do I diff between two branches? | 16:28 |
| ← zoresvit left | 16:28 |
|
kpreid
| git diff branch1 branch2 | 16:29 |
| ← hafeez3000 left | 16:29 |
| → bootstrapper joined | 16:29 |
| ← swiety left | 16:29 |
|
beaky
| ah thanks | 16:29 |
| → kenperkins joined | 16:30 |
| → tplaner joined | 16:30 |
| → shashin joined | 16:30 |
| → amccloud joined | 16:33 |
|
beaky
| so is it a bad idea to have several branches? | 16:33 |
| → ErKa joined | 16:33 |
| ← Milossh left | 16:33 |
|
cannonball
| Uh, I hate using cvs. I changed like 40 files fixing some cross site scripting, and I just want the simplistic cvs equivalent of 'git status' to see which ones I changed. YUCK YUCK YUCKY cvs. | 16:34 |
| → todd_dsm joined | 16:34 |
| → asaf joined | 16:34 |
| → michaelmartinez_ joined | 16:35 |
|
jerikl
| beaky: Not if there is a purpose for them, just a bit more upkeep. Create a branch to implement a feature or fix a bug or to play around, merge it back into master when done and delete the branch. | 16:35 |
| ← buibex left | 16:35 |
|
beaky
| ah | 16:35 |
|
jerikl
| That's my workflow anyway | 16:36 |
| → looper joined | 16:36 |
| → tjbiddle joined | 16:36 |
| ← michaelmartinez left | 16:37 |
| ← GeertV left | 16:38 |
| → lavaman joined | 16:38 |
| → shwaiil joined | 16:38 |
| jerrad_ → jerrad | 16:38 |
| → GeertV joined | 16:38 |
|
shwaiil
| hi | 16:38 |
| ← alkino left | 16:38 |
| ← meLon left | 16:39 |
| ← TeamColtra left | 16:39 |
| ← michaelmartinez_ left | 16:40 |
| → lresende joined | 16:40 |
|
shwaiil
| Q: I've been working in a branch for some time. Done 6 different tasks (6 commits). I've pushed to the live server 4 of those tasks. But not I need to make a change in that state, but the 6 needs to have it too. I'm wondering what should I do ? Create a new branch work on that changes and then push ?! not sure... | 16:40 |
|
| tks | 16:40 |
|
| not sure if I was clear | 16:40 |
| ← LimeBlast left | 16:42 |
| ← pity left | 16:42 |
| ← GeertV left | 16:43 |
|
PerlJam
| shwaiil: not particularly clear for me :) | 16:44 |
|
shwaiil
| PerlJam: thanks for looking btw! Yes, I'll try to be more clear | 16:44 |
|
PerlJam
| shwaiil: explain "need to make a change in that state" a bit more. | 16:45 |
| → herdingcat joined | 16:46 |
|
ThePeach
| how do I get a specific tag? | 16:46 |
|
shwaiil
| I had some bugs to fix and create some new features in this website. Working on branch-A. I fix each bug and commit and pushed to the repository (4 commits). Then I created two new features, 2 new commits. I had to send the bug fix to the live server but not the features. What I did was, checked out commit nr 4 and push to the live site. | 16:46 |
|
grawity
| ThePeach: with `git checkout` | 16:46 |
| → cilly joined | 16:46 |
|
ThePeach
| how would I do that using refspecs? | 16:46 |
|
| (trying to configure jenkins to build a specific tag) | 16:46 |
| ← nicklasbo left | 16:47 |
|
grawity
| tags are under refs/tags/*, not sure what format jenkins wants | 16:47 |
| ← mklappstuhl left | 16:47 |
|
shwaiil
| The HEAD is in the 6 commit where the features are, but I'll only push that to live after approval, next week. But right now I need to fix some other issue and send it to the live site, but I don't want to send the new features PerlJam | 16:47 |
|
| not sure if I was more clear now :T | 16:48 |
| ← jesfre left | 16:48 |
|
ThePeach
| grawity: from the error is trying to do a "git fetch -t <repo path> +refs/tags/mytag | 16:48 |
|
shwaiil
| so, what I did was, made the changes in the live one manually and commited. In the HEAD (where the new features that shouldn't be live yet are) I did it manually too. I think this is not the best way of doing this, and I'm wondering what could I've done instead | 16:48 |
|
ojacobson
| if you need a + when fetching tags, something has gone seriously wrong :) | 16:48 |
|
shwaiil
| Thanks for looking | 16:48 |
|
ThePeach
| I've specified +refs/tags/mytag as refspec, but I don't think that's correct grawity | 16:49 |
|
grawity
| shwaiil: don't commit features to the "master" branch immediately | 16:49 |
|
| shwaiil: use a separate branch (or branches) for that – and merge to master when they're approved | 16:49 |
|
| shwaiil: that'd be my guess | 16:49 |
|
ThePeach
| ojacobson: that's just me fiddlying around, I've used the + only because it was in the description of the field. | 16:49 |
| ← sobhan left | 16:50 |
|
ThePeach
| I'd remove that and see if that's making it ork | 16:50 |
|
| *work | 16:50 |
|
PerlJam
| shwaiil: making another branch at the point where you feature set diverges seems like what you wanted to me. | 16:50 |
|
ojacobson
| + means "blindly replace" in that context | 16:50 |
|
shwaiil
| grawity: I see. So each new bug fix or feature, or whatever really I should always create a new branch and just commit to "Master" once approved ? | 16:50 |
| ← clreed87 left | 16:50 |
|
ojacobson
| and if you have a tag that changes frequently enough to need that, perhaps it shouldn't be a tag | 16:50 |
| → sobhan joined | 16:50 |
|
PerlJam
| shwaiil: i.e. branch at "commit 4" and continue adding features and don't push the 2 commits you don't want live yet. | 16:50 |
|
ojacobson
| (eg. blindly replace the local refs/tags/mytag with the value of refs/tags/mytag in the source repo, when fetching) | 16:50 |
|
grawity
| shwaiil: Yes. | 16:50 |
|
shwaiil
| PerlJam: I see :) and then just merge | 16:51 |
|
grawity
| shwaiil: Or *at least* have a single "devel" branch. | 16:51 |
|
shwaiil
| grawity: thanks a lot! I'll start doing that | 16:51 |
| → mklappstuhl joined | 16:51 |
|
shwaiil
| and thanks for the tip on fixing my current issue. I was doing things wrong :P | 16:51 |
| → sq-one joined | 16:51 |
|
grawity
| shwaiil: That way, you can always commit bugfixes & push "master" to the server without accidentally pushing "unapproved" changes... | 16:51 |
|
ThePeach
| ojacobson: makes sense. Is there a way to explicitly push a tag? or is it pushed normally? | 16:51 |
|
ojacobson
| ThePeach: man git-push and read down: there are a few ways to do it | 16:52 |
|
gitinfo
| ThePeach: the git-push manpage is available at http://jk.gs/git-push.html | 16:52 |
|
grawity
| shwaiil: See `git branch` and `git merge` for more info. | 16:52 |
| → meLon joined | 16:52 |
| ← meLon left | 16:52 |
| → meLon joined | 16:52 |
| ← eletuchy left | 16:52 |
|
shwaiil
| grawity: true! thanks a lot! It's clear for me what to do. The thing is, I always work by myself and unless I can get tips online, it's just hard to learn everything : ) | 16:52 |
| → davidbanham joined | 16:52 |
| ← myx left | 16:52 |
|
ojacobson
| you can push all tags, push the tag named foo (git push <remote> 'tag foo' I believe, though 'git push <remote> foo' works if foo is unambiguously a tag), or you can spell out the refspec during push | 16:52 |
|
shwaiil
| grawity: I'll start doing that from now on = D makes more sense | 16:52 |
| ← wasanzy left | 16:53 |
| → clreed87 joined | 16:53 |
|
ThePeach
| thanks ojacobson | 16:53 |
|
atrus
| at our office, we don't even have the ability to directly push to master. we push to a review branch, which (once the review is finished) is automatically merged into master (assuming it builds successfully in several platforms, configs, and passes unit tests in same). | 16:54 |
|
ThePeach
| scared are they? :D | 16:54 |
|
shwaiil
| atrus: nice : ) that's advanced | 16:54 |
| ← kcj left | 16:55 |
|
shwaiil
| well... here... the IT guys..it's actually just me : I it's hard to keep up with everything but doing my best | 16:55 |
| → rue_XIV joined | 16:56 |
|
PerlJam
| atrus: we do something similar here, except everyone can push to master, but there's another branch for the stuff that goes live. (so, our master is like your review) | 16:56 |
| ← irqq left | 16:56 |
| ← rue left | 16:57 |
| → irqq joined | 16:58 |
| ← john_anderson left | 16:58 |
| ← infynyxx left | 16:58 |
| ← mklappstuhl left | 16:59 |
| → maestrojed joined | 16:59 |
| → john_anderson joined | 16:59 |
| ← cmmagid left | 16:59 |
| ← ash4 left | 17:01 |
| ← davidbanham left | 17:01 |
| ← petersaints left | 17:01 |
| ← timj left | 17:01 |
| → hwrd|work joined | 17:03 |
| → tvw joined | 17:04 |
| ← normanrichards left | 17:04 |
| → zequence_ joined | 17:04 |
| → jesfre joined | 17:04 |
| → ash4 joined | 17:05 |
| ← skul left | 17:05 |
| ← seanh left | 17:05 |
| ← Grum left | 17:05 |
| ← OliverJAsh left | 17:05 |
| → Ziggy` joined | 17:06 |
| → seanh joined | 17:06 |
| → Ryback_ joined | 17:06 |
| ← Ryback_ left | 17:06 |
| → Ryback_ joined | 17:06 |
| → Grum joined | 17:06 |
| ← navid_ left | 17:07 |
| ← herdingcat left | 17:07 |
| → edoceo joined | 17:07 |
| ← jcromartie left | 17:07 |
| ← zequence left | 17:08 |
| ← matthias_dev left | 17:09 |
| → herdingcat joined | 17:09 |
|
edoceo
| I want to keep my patch set small, like cleaning up the "sausage" part. I created my branch from master months ago and made numerous commits to it; now I will checkout master, pull, checkout my branch and rebase - correct? | 17:09 |
| → undecim joined | 17:09 |
| ← herdingcat left | 17:09 |
|
paulweb515
| edoceo: yes, that's the general practice | 17:10 |
| → eijk joined | 17:10 |
|
edoceo
| after 20 more times I'll get it - swear! | 17:10 |
| ← sobhan left | 17:10 |
| → swiety joined | 17:11 |
| → herdingcat joined | 17:11 |
| ← sebuba left | 17:11 |
| → rakl joined | 17:11 |
| → anish[1] joined | 17:11 |
| → leeN joined | 17:12 |
| → fobban joined | 17:12 |
| ← herdingcat left | 17:12 |
| ← bootstrapper left | 17:13 |
| ← tjbiddle left | 17:13 |
| ← eijk left | 17:13 |
| ← clreed87 left | 17:14 |
| → h0bbit joined | 17:15 |
| → nilg joined | 17:15 |
| ← Asenar left | 17:16 |
| ← LeMike left | 17:16 |
| ← shashin left | 17:16 |
| → sobhan joined | 17:17 |
| → kcj joined | 17:17 |
| → sluther joined | 17:19 |
| ← Xethron left | 17:19 |
| → thl0 joined | 17:20 |
| ← JohnBat26 left | 17:20 |
| ← jesfre left | 17:20 |
| → jfelchner joined | 17:20 |
| → Xethron joined | 17:20 |
| ← sobhan left | 17:22 |
| ← fRAiLtY- left | 17:22 |
|
shwaiil
| Q; when we merge we don't have to commit right ? we can just push and its saved in the repository ?! | 17:22 |
| → jdunck joined | 17:22 |
| → eletuchy joined | 17:22 |
| ← WinstonSmith left | 17:22 |
| zequence_ → zequence | 17:23 |
| → eijk joined | 17:24 |
| → lun_ joined | 17:24 |
| → sebuba joined | 17:25 |
| ← jaequery left | 17:25 |
| → sobhan joined | 17:26 |
| → WinstonSmith joined | 17:26 |
| ← lun_ left | 17:26 |
| → khmarbaise joined | 17:27 |
| ← Destos left | 17:27 |
|
RandalSchwartz
| if the merge has conflicts, you have to fix them and commit | 17:29 |
|
| if the merge just works, then no, the commit is already made | 17:29 |
|
| but either way, you should push to share it | 17:29 |
| → bootstrapper joined | 17:29 |
| ← jerikl left | 17:29 |
|
RandalSchwartz
| shwaiil? | 17:29 |
| → sayd joined | 17:29 |
| ← eijk left | 17:29 |
| ← spuz left | 17:30 |
| → jaequery joined | 17:30 |
| → eijk joined | 17:30 |
| → macabre joined | 17:30 |
|
cmn
| shwaiil: notice that merges (actual ones, not fast-forwards) are commits in themselves | 17:31 |
| ← jaequery left | 17:31 |
| ← babilen left | 17:31 |
| → myx joined | 17:31 |
| ← mmitchel_ left | 17:32 |
| → Shusshu joined | 17:33 |
| ← thl0 left | 17:33 |
| → relipse joined | 17:34 |
| ← MissionCritical left | 17:35 |
| → JDuke128 joined | 17:36 |
| ← eijk left | 17:37 |
| → Chillance joined | 17:37 |
| ← amccloud left | 17:37 |
| → ecadre joined | 17:37 |
| ← cheater_ left | 17:38 |
|
irqq
| how to push all branches at once? | 17:38 |
| → flijten joined | 17:38 |
| → mikef_ joined | 17:39 |
| → whowantstolivef1 joined | 17:39 |
|
RandalSchwartz
| git push --all I think | 17:39 |
|
| yeah | 17:40 |
| → maletor joined | 17:40 |
| ← maletor left | 17:40 |
|
RandalSchwartz
| presuming they all have valid upstreams | 17:40 |
| → gtrak joined | 17:42 |
| → maletor joined | 17:42 |
| ← mishok13 left | 17:42 |
| ← maletor left | 17:42 |
| → OliverJAsh joined | 17:43 |
| → Mission-Critical joined | 17:44 |
| → LuxuryMode joined | 17:44 |
| ← gtrak left | 17:44 |
| ← sobhan left | 17:44 |
|
irqq
| does --all apply to anything else beyond just branches? | 17:45 |
| ← todd_dsm left | 17:45 |
|
cmn
| no, see man git push --all | 17:45 |
|
gitinfo
| the git-push manpage is available at http://jk.gs/git-push.html | 17:45 |
|
cmn
| but the upstreams shouldn't have much to do with this | 17:46 |
| → davidbanham joined | 17:46 |
| → rcu joined | 17:46 |
| → svetlyak40wt joined | 17:47 |
| → sobhan joined | 17:48 |
| ← Shusshu left | 17:48 |
| → tjbiddle joined | 17:48 |
| → tazle_ joined | 17:48 |
| → timj joined | 17:48 |
| ← kumbayo left | 17:49 |
|
irqq
| does refs mean branches there? | 17:49 |
| ← jkremser left | 17:49 |
| ← davidbanham left | 17:50 |
|
grawity
| it means references – which might be branches, tags, or just simple pointers to an object | 17:50 |
| → ZaherDirkey joined | 17:51 |
| ← ZaherDirkey left | 17:51 |
| ← dc5ala left | 17:52 |
| → ISF joined | 17:52 |
| → MrPunkin joined | 17:52 |
|
MrPunkin
| Guys, I want to trash my last commit (not pushed)… but don't want to lose the work… I just want to change which files were included in it before pushing as one was accidentally included that shouldn't have been. | 17:52 |
|
grawity
| `git reset HEAD^` should do it | 17:53 |
| ← wongon left | 17:54 |
| → soypirate joined | 17:54 |
| ← john_anderson left | 17:54 |
| Mission-Critical → MissionCritical | 17:54 |
|
MrPunkin
| Thanks grawity | 17:55 |
| → jaequery joined | 17:55 |
| → jcromartie joined | 17:55 |
| → john_anderson joined | 17:55 |
| ← maxmanders left | 17:56 |
| ← corimarisol left | 17:56 |
| → corimarisol joined | 17:57 |
| ← corimarisol left | 17:57 |
| → corimarisol joined | 17:57 |
| ← achadwick left | 17:57 |
| ← ErKa left | 17:57 |
| ← anderse left | 17:58 |
| → wongon_ joined | 17:58 |
| ← Praise left | 17:58 |
| → mmitchell joined | 17:58 |
| → grn joined | 17:59 |
| → Praise joined | 18:00 |
| → hobodave joined | 18:00 |
| ← MrPunkin left | 18:00 |
| ← mikef_ left | 18:01 |
| → cmmagid joined | 18:01 |
| ← howlymowly left | 18:01 |
| → Cromulent joined | 18:01 |
| → thl0 joined | 18:01 |
| ← Jahm_ left | 18:02 |
| → towski joined | 18:03 |
| → Jahm joined | 18:03 |
| → michaelmartinez joined | 18:03 |
| ← saby left | 18:03 |
| ← AdrienBrault left | 18:03 |
| → peppyheppy joined | 18:03 |
| → rath joined | 18:03 |
| gitinfo set mode: +v | 18:04 |
| ← Jahm left | 18:04 |
| → Jahm joined | 18:04 |
| → guest3137 joined | 18:04 |
| ← hobodave left | 18:05 |
| → shashin joined | 18:05 |
| → howlymowly joined | 18:05 |
| → z8z joined | 18:07 |
| ← n4irc left | 18:07 |
| → pppaul joined | 18:07 |
| ← R1KRDO left | 18:08 |
| → amccloud joined | 18:08 |
| ← howlymowly left | 18:09 |
| → sd1074 joined | 18:09 |
|
epta
| Is there a way to have red __git_ps1 when state is dirty and green otherwise? | 18:09 |
|
| Using git-prompt.sh | 18:10 |
| ← breakingthings left | 18:10 |
| ← sd1074 left | 18:10 |
| ← flijten left | 18:11 |
| ← michaelmartinez left | 18:12 |
|
engla
| isn't that GIT_PS1_SHOWCOLORHINTS | 18:12 |
| ← thl0 left | 18:13 |
| → aspiers joined | 18:13 |
| ← tvw left | 18:14 |
| → tvw joined | 18:14 |
| → ankurankan joined | 18:14 |
| ← bil` left | 18:15 |
| ← hoschi left | 18:15 |
| ← prudnikov left | 18:15 |
| ← marthinal left | 18:15 |
| → Rolybrau joined | 18:17 |
|
epta
| engla: nope | 18:17 |
| ← bgerber left | 18:17 |
| ← robotmay_ left | 18:17 |
| ← Rolybrau left | 18:17 |
| ← Xethron left | 18:18 |
| ← jlopez left | 18:18 |
| ← towski left | 18:19 |
| ← wongon_ left | 18:19 |
| → wongon joined | 18:19 |
| ← JDuke128 left | 18:19 |
| ← cmmagid left | 18:20 |
| ← techlife left | 18:20 |
| → cmmagid joined | 18:21 |
| → nsanden joined | 18:21 |
| → JDuke128 joined | 18:22 |
| ← oojacoboo left | 18:22 |
| ← cohwsw left | 18:23 |
| ← o] left | 18:23 |
| ← ankurankan left | 18:23 |
| → wavez joined | 18:24 |
| → o] joined | 18:24 |
| ← dwmw2_gone left | 18:24 |
|
nsanden
| hi guys, i have 50 or so websites all under a /home/ directory on my web server, i want to get away from ftp, I wonder if i should try making a single repository to include them all or should i make one for each website. probably about 75gigs | 18:24 |
| → dwmw2_gone joined | 18:24 |
|
wavez
| doing my first git commit. Having trouble using the commit message editor | 18:24 |
|
relipse
| i went on github, forked a project, added a feature, now how do i contact the owner | 18:25 |
|
| dont use an editor wavez | 18:25 |
|
| git commit -m "your message here" | 18:25 |
|
nsanden
| relipse: do a pull request | 18:25 |
|
wavez
| relipse, how do I cancel? | 18:25 |
|
jcromartie
| git config --global alias.brnach branch | 18:26 |
| ← foofoobar left | 18:26 |
| ← smirn0v left | 18:26 |
| → oojacoboo joined | 18:26 |
| → techlife joined | 18:26 |
| ← techlife left | 18:26 |
|
wavez
| nothing is getting me out of this thing | 18:26 |
| ← dhruvasa1ar left | 18:26 |
|
wavez
| ctrl-c does nothing | 18:26 |
|
| just causes a system beep | 18:27 |
| ← oojacoboo left | 18:27 |
|
wavez
| esc does nothing | 18:27 |
|
grawity
| wavez: if you're in vim, press Esc a few times, then :wq | 18:27 |
|
nsanden
| type in :q i think | 18:27 |
|
grawity
| (then Enter) | 18:27 |
| → techlife joined | 18:27 |
| ← techlife left | 18:27 |
| ← dhruvasagar left | 18:27 |
|
wavez
| ah, it was vim | 18:27 |
|
| no wonder | 18:27 |
| ← scorphus left | 18:27 |
| → techlife joined | 18:28 |
| ← techlife left | 18:28 |
|
wavez
| no, vi | 18:28 |
| ← amccloud left | 18:28 |
| → scorphus joined | 18:28 |
| → mikef_ joined | 18:28 |
|
grawity
| whatever your $VISUAL is set to – or if it's unset, $EDITOR | 18:28 |
|
| if *that* is unset, 'vi' is the default | 18:28 |
| → techlife joined | 18:28 |
| ← techlife left | 18:28 |
| ← pfFredd left | 18:28 |
|
grawity
| except Git for Windows symlinks 'vi' to Vim, I thought? | 18:29 |
|
| meh, doesn't matter what it does | 18:29 |
| ← skyf left | 18:29 |
| → amccloud joined | 18:30 |
| → techlife joined | 18:30 |
| ← techlife left | 18:30 |
| → techlife joined | 18:31 |
| ← techlife left | 18:31 |
| ← lresende left | 18:31 |
| → techlife joined | 18:31 |
| ← techlife left | 18:31 |
| ← dwmw2_gone left | 18:32 |
| → techlife joined | 18:32 |
| ← techlife left | 18:32 |
| → dwmw2_gone joined | 18:32 |
|
wavez
| a friend of mine had me setup git using assembla. I've decided to abandon that project and also use git on my host account instead. What happens to the previous remote origin? | 18:32 |
|
| Is that specific to the local repository? | 18:32 |
| ← Cromulent left | 18:32 |
| ← siriuz left | 18:32 |
|
grawity
| Each repository has its own remotes | 18:33 |
|
wavez
| so commits from one repository go to the assembla repository and commits from the new one go to my new host server repository? | 18:33 |
|
| I see | 18:33 |
|
grawity
| (multiple remotes if needed) | 18:33 |
| → techlife joined | 18:33 |
| ← techlife left | 18:33 |
| ← DeltaHeavy left | 18:33 |
| → sysadminAli_ joined | 18:33 |
| → longbeach joined | 18:34 |
| → techlife joined | 18:34 |
| → opus joined | 18:34 |
| → jason237 joined | 18:34 |
| → siriuz joined | 18:34 |
|
nsanden
| anyone have suggestion, i want to use git for about 50 websites all under /home dir maybe 75gigs data. is this safe or should i just go the long route and make a repository for each site | 18:35 |
| → pantsman joined | 18:35 |
| ← pantsman left | 18:35 |
| → pantsman joined | 18:35 |
| ← sbodo left | 18:35 |
|
wavez
| I've finished with the first push. I'm manually browsing the directory to see that it worked. Are the files not visible as standard files? | 18:36 |
|
osse
| nsanden: why are the webpages that big? is there a lot of video/pictures and so on? Those are probably best left out. | 18:36 |
| ← sysadminAli left | 18:36 |
| sysadminAli_ → sysadminAli | 18:36 |
| ← sobhan left | 18:36 |
|
nsanden
| osse: yes lots of images | 18:36 |
|
osse
| nsanden: leave those out. only put the code itself in git. | 18:36 |
|
wavez
| I see branches, hooks, info, objects, refs, HEAD, config, description | 18:36 |
| → sbodo joined | 18:37 |
|
grawity
| wavez: I'm guessing you are pushing to a bare repository – and no, those don't have a working tree, just the repository itself | 18:37 |
|
wavez
| yes, a bare repo | 18:37 |
| → gustavnils joined | 18:37 |
| → bgerber joined | 18:37 |
|
nsanden
| osse: hmm ok | 18:37 |
|
wavez
| grawity, so the data is there? Or it is not there? | 18:37 |
|
grawity
| wavez: The data is there. | 18:37 |
|
osse
| nsanden: unless you want to actually version control all that (mostly static) data, in which case git is the wrong tool. | 18:38 |
|
grawity
| wavez: In somewhat different words, what you see in a bare repository is the same as what you would see in a "normal" repo's .git/ directory | 18:38 |
|
| wavez: It has all the commits, you can run `git log` and other commands in it, it just doesn't make the files directly accessible. | 18:39 |
| → buibex joined | 18:39 |
| ← Jahm left | 18:40 |
|
wavez
| ok | 18:40 |
|
nsanden
| osse: yeah i dont care about versioning as much as having a local copy for testing before pushing | 18:40 |
|
wavez
| should I choose gitosis or gitolite? | 18:40 |
| → Jahm joined | 18:40 |
|
grawity
| I've heard the development of gitosis has stopped | 18:40 |
| → sobhan joined | 18:40 |
| → ErKa joined | 18:41 |
|
osse
| nsanden: then you hould be fine. | 18:41 |
|
| nsanden: but you can still add PNGs and GIFs and small images that are poart of the design and subject to change. | 18:42 |
| ← shashin left | 18:42 |
| → oojacoboo joined | 18:43 |
|
nsanden
| osse: yeah thats true, just ignore big image cache dirs | 18:43 |
| → thl0 joined | 18:43 |
|
wavez
| I'm looking at the install instructions and I don't understand what this means: "a dedicated userid to host the repos (in this document, we assume it is 'git'), with shell access ONLY by 'su - git' from some other userid on the same server." | 18:43 |
|
nsanden
| osse: thanks | 18:43 |
|
osse
| nsanden: just craft your .gitignore proprely and you should be off to a good start | 18:44 |
|
| nsanden: but it will be up to you whether to version control the pages independently or in one big repo | 18:44 |
| ← aberrant left | 18:44 |
| ← ThomasLocke left | 18:44 |
| ← sobhan left | 18:45 |
| ← sebuba left | 18:45 |
| ← brunov left | 18:45 |
|
wavez
| wait? why would ~/.ssh/authorized_keys be empty? I created that when I setup the bare repo in ssh. | 18:45 |
| → yshh_ joined | 18:45 |
| ← swiety left | 18:45 |
|
ojacobson
| wavez: that looks like the gitolite installation instructions | 18:45 |
|
| it should be empty when you start _because gitolite will manage its contents_. | 18:46 |
|
wavez
| it is | 18:46 |
|
| oh | 18:46 |
|
ojacobson
| (eg. adding a key to gitolite using its usual mechanism - by pushing changes to gitolite-admin.git - will cause gitolite to also update authorized_keys appropriately) | 18:46 |
|
grawity
| wavez: "userid" here means a separate Unix account | 18:46 |
| ← ak5 left | 18:47 |
|
wavez
| grawity, I have one user account that I use. I need a second one? | 18:47 |
| ← gregsmith left | 18:47 |
|
ojacobson
| You _can_ use a single account for both, but I wouldn't :) | 18:47 |
| → arvind_khadri joined | 18:47 |
|
ojacobson
| (uids are cheap) | 18:47 |
| → ak5 joined | 18:47 |
| ← Guest97097 left | 18:47 |
|
ojacobson
| (time spent troubleshooting ssh keys is not) | 18:47 |
|
grawity
| if it's a single-user server, I wouldn't bother much with gitolite at all | 18:48 |
|
wavez
| okay, so create a user account named git and ssh with that? | 18:48 |
| ← yshh left | 18:48 |
|
wavez
| it's my web server | 18:48 |
|
| shared hosting | 18:48 |
| → Destos joined | 18:49 |
|
wavez
| but it's only for my own use right now | 18:49 |
|
| there's no team at this point | 18:49 |
|
| and no plans for a team yet | 18:49 |
| → jesfre joined | 18:50 |
| ← thl0 left | 18:51 |
| ← sysadminAli left | 18:51 |
| ← cmmagid left | 18:52 |
|
ojacobson
| wavez: fwiw I do use gitolite for purely-just-me projects, because I find it a handy way to make sure all the repos work the same way (hooks and so on) | 18:53 |
| ← nilg left | 18:53 |
|
ojacobson
| but I'm an inveterate sysadmin and tinkerer | 18:53 |
|
| you can quite happily start small with a bare repo in a homedir somewhere | 18:53 |
| → sysadminAli joined | 18:53 |
| → n4irc joined | 18:53 |
| → cmmagid joined | 18:53 |
|
ojacobson
| The important part is more that you actively choose which repo is the "canonical" one (i.e., the one that you draw releases from/deploy from/tell others to clone) | 18:53 |
| → rgr joined | 18:54 |
|
wavez
| yeah, I'm not a sysadmin | 18:54 |
| ← laurav left | 18:54 |
| → thl0 joined | 18:55 |
| → GeertV joined | 18:55 |
| ← CodeShark left | 18:55 |
|
wavez
| ojacobson, I don't think I understand what you mean. Is my repo safe from outside tampering? The instructions I followed state that, "Git by itself, out of the box, provides no method of access control. If you know a URL for a git repository, you can clone it. Without some mechanism of access control, you can commit to it as well." | 18:56 |
| → infynyxx joined | 18:56 |
| ← bratner left | 18:57 |
| ← MissionCritical left | 18:57 |
| ← relipse left | 18:57 |
|
wavez
| I thought the ssh key was supposed to take care of the security | 18:57 |
|
ojacobson
| it's true that git does not do access control itself | 18:57 |
|
| however, gitolite is still subject to the underlying OS access control mechanisms (file permissions &c) | 18:57 |
|
| er, git | 18:57 |
|
| (gitolite too, but that was a typo) | 18:57 |
| → sebuba joined | 18:58 |
|
ojacobson
| if there's only one of you, your access control needs are very modest: maybe you need a few checks to "keep you honest" with yourself, but probably you need nothing :) | 18:58 |
| ← oojacoboo left | 18:58 |
|
ojacobson
| in which case, FS permissions are probably more than good enough | 18:58 |
|
wavez
| I see | 18:58 |
| ← Sky[x] left | 18:58 |
| ← peppyheppy left | 18:58 |
|
wavez
| ojacobson, and when I want to give permission to another machine, do I just copy the my public rsa key to authorized_keys? | 18:59 |
| ← Ziggy` left | 18:59 |
| → sharpyy joined | 19:00 |
| → marthinal joined | 19:00 |
| ← OliverJAsh left | 19:01 |
| → Rolybrau joined | 19:01 |
| ← suy left | 19:04 |
| → tewecske joined | 19:04 |
| → aberrant joined | 19:05 |
|
rking
| How do you get that output that a 'git pull' shows, with the +++---- ? | 19:05 |
|
| I've been using 'git pull --rebase', but I miss that. And also I find I want to see that just from some random comparisons. | 19:05 |
| → cworth` joined | 19:06 |
| ← bootstrapper left | 19:06 |
| ← albel727 left | 19:06 |
| → Dactyl joined | 19:06 |
|
EugeneKay
| rking - man git-log; look at --stat | 19:06 |
|
gitinfo
| rking: the git-log manpage is available at http://jk.gs/git-log.html | 19:06 |
| ← buibex left | 19:06 |
| → bootstrapper joined | 19:07 |
| ← cworth left | 19:07 |
| ← rcu left | 19:08 |
| → normanrichards joined | 19:08 |
| ← nsanden left | 19:08 |
| ← irqq left | 19:09 |
| ← shwaiil left | 19:09 |
| ← tewecske left | 19:10 |
| → cakehero joined | 19:10 |
| → bauruine joined | 19:10 |
| → Mission-Critical joined | 19:10 |
| → apok joined | 19:11 |
|
rking
| EugeneKay: Yep, that's what I wanted. Thanks! | 19:11 |
|
| git stash show --stat # Also works(!) | 19:11 |
|
| Haha, no, that's the default | 19:11 |
| ← soypirate left | 19:12 |
| ← alex-weeej left | 19:13 |
| → aksnot joined | 19:13 |
| ← Dr4k3 left | 19:14 |
| → fasta joined | 19:15 |
| → snql joined | 19:15 |
| ← thl0 left | 19:15 |
| → gregsmith joined | 19:16 |
| → maletor joined | 19:16 |
| ← asaf left | 19:18 |
| ← Dactyl left | 19:18 |
|
oreth
| i've got a public repository on git hub, and a private one on beanstalk | 19:18 |
|
| i've cloned my git hub repository, how do i push it to my beanstalk repository? | 19:18 |
| Mission-Critical → MissionCritical | 19:18 |
| ← kevwil left | 19:18 |
| ← john_anderson left | 19:19 |
| → aberrant_ joined | 19:19 |
| ← arietis left | 19:19 |
| → otherj joined | 19:19 |
| ← Rolybrau left | 19:20 |
| → john_anderson joined | 19:20 |
|
grawity
| Add a second remote, then `git push <remote>` | 19:20 |
|
| Or just `git push <url>` | 19:20 |
| → ryanplas joined | 19:20 |
| ← cilly left | 19:20 |
| ← sbodo left | 19:20 |
| → oojacoboo joined | 19:21 |
|
oreth
| when i do that, it tells me everything is up to date | 19:21 |
|
| but my beanstalk repository is competely empty | 19:21 |
| ← aberrant left | 19:21 |
| aberrant_ → aberrant | 19:21 |
| → peppyheppy joined | 19:21 |
| → oposomme joined | 19:22 |
| ← gregsmith left | 19:22 |
| → maxmanders joined | 19:22 |
| ← johnw left | 19:23 |
| → pro_metedor joined | 19:23 |
| → hobodave joined | 19:24 |
| → LeMike joined | 19:24 |
| → Dactyl joined | 19:24 |
| → dbck joined | 19:24 |
| ← pppaul left | 19:25 |
| → AAA_awright_ joined | 19:26 |
|
wavez
| I'm getting started with gitx | 19:26 |
| ← wongon left | 19:27 |
|
wavez
| if I branch, that's only a branch on my local repo? | 19:27 |
|
grawity
| wavez: yes | 19:27 |
| ← Noldorin left | 19:27 |
|
wavez
| If I push, does the branch go with? | 19:27 |
| → wongon joined | 19:27 |
|
grawity
| wavez: only if the remote already has a branch with the same name | 19:28 |
|
| wavez: or if you explicitly tell git to push this branch | 19:28 |
| ← natechan left | 19:28 |
|
grawity
| (but I think the "has a branch with same name" behavior changes in 1.9 or 2.0 or whatever – I always forget when) | 19:28 |
| ← jfelchner left | 19:30 |
|
wavez
| I think gitx is only showing my local repo | 19:30 |
| ← hyperair left | 19:30 |
| ← AAA_awright_ left | 19:31 |
| → AAA_awright_ joined | 19:31 |
| ← basmoura left | 19:31 |
|
wavez
| I don't understand the point of having only local repo control. | 19:31 |
| ← AAA_awright_ left | 19:31 |
|
PerlJam
| wavez: what do you mean? | 19:31 |
|
| you don't understand the point of separating local branches from remote branches? | 19:31 |
|
wavez
| PerlJam, I don't understand the point of not having gui features to show my local repo changes in relation to the remote repo | 19:32 |
|
Pieter
| wavez: gitx is meant as additional tool, supplementing the CLI interface | 19:32 |
| → tenmilestereo joined | 19:33 |
|
Pieter
| wavez: it's not a replacement for CLI git or a standalone program at all | 19:33 |
| ← kcj left | 19:33 |
|
wavez
| pieter, does there exist a gui replacement for cli? I don't think I can adapt to CLI | 19:33 |
| → hoschi joined | 19:33 |
| ← jesfre left | 19:34 |
|
Pieter
| wavez: you can take a look at gittower or gitbox, or the github git app for os x | 19:34 |
| ← Dactyl left | 19:35 |
| → jlopez_ joined | 19:36 |
| ← otherj left | 19:36 |
|
ojacobson
| !gui | 19:36 |
|
gitinfo
| Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 19:36 |
| → Jestah joined | 19:36 |
|
ojacobson
| wrong factoid | 19:36 |
|
| tower, github, sourcetree | 19:36 |
| ← arvind_khadri left | 19:37 |
|
wavez
| pieter, great. I will probably try each of these. thnx much | 19:37 |
| ← sharpyy left | 19:37 |
| ← Guest77033 left | 19:37 |
| ← Jestah left | 19:37 |
| → Guest77033 joined | 19:37 |
| ← kermit left | 19:38 |
| → _iron joined | 19:38 |
| → albel727 joined | 19:39 |
| ← setmeaway left | 19:39 |
| → johnw joined | 19:39 |
| ← oposomme left | 19:41 |
| → sbodo joined | 19:41 |
| ← rgr left | 19:41 |
| → jesfre joined | 19:42 |
| ← txomon|home left | 19:42 |
| → frogonwheels_ joined | 19:42 |
| ← kalanag left | 19:42 |
| → txomon|home joined | 19:43 |
| ← _iron left | 19:44 |
| → _iron joined | 19:44 |
| ← jlopez_ left | 19:44 |
| → jlopez joined | 19:44 |
| → thl0 joined | 19:45 |
| → AdrienBrault joined | 19:45 |
| → kevwil joined | 19:45 |
| ← frogonwheels left | 19:46 |
| ← ISF left | 19:46 |
| ← AdrienBrault left | 19:47 |
| ← john_anderson left | 19:47 |
| → john_anderson joined | 19:48 |
| → OliverJAsh joined | 19:48 |
| → b1rkh0ff joined | 19:49 |
| → AdrienBrault joined | 19:49 |
| ← eletuchy left | 19:49 |
| → gregsmith joined | 19:51 |
| ← chisler left | 19:51 |
| ← rideh left | 19:51 |
| → natechan joined | 19:52 |
| ← n4irc left | 19:52 |
| → jonshea joined | 19:52 |
| ← RonScagz left | 19:52 |
| → aspotashev joined | 19:53 |
| ← kevwil left | 19:54 |
| ← johnw left | 19:54 |
| ← thl0 left | 19:56 |
| ← jwmann left | 19:57 |
| ← hoschi left | 19:58 |
| ← jason237 left | 19:59 |
| → thorie joined | 19:59 |
| → thl0 joined | 19:59 |
| → jwmann joined | 20:00 |
| → breakingthings joined | 20:00 |
| → TeamColtra joined | 20:00 |
| → Goles joined | 20:00 |
| ← anish[1] left | 20:00 |
| → trungqtran joined | 20:01 |
| → todd_dsm joined | 20:01 |
| ← ejd left | 20:02 |
| ← theoros left | 20:02 |
| → theoros joined | 20:03 |
| ← nigelb left | 20:03 |
| ← tukkol left | 20:03 |
| → nigelb joined | 20:03 |
| → tukkol joined | 20:04 |
| ← gregsmith left | 20:04 |
| → jMCg joined | 20:04 |
|
jMCg
| Hello happy people! | 20:04 |
| ← hwrd|work left | 20:04 |
|
jMCg
| How do I go through the history of a single file, diff by diff? | 20:05 |
| → pppaul joined | 20:06 |
| ← Chryyz left | 20:06 |
| ← juvenal left | 20:06 |
| ← TonyM left | 20:06 |
| → kermit joined | 20:06 |
| ← erichynds left | 20:06 |
| ← myme left | 20:06 |
| ← aberrant left | 20:07 |
| ← TDJACR left | 20:07 |
| → TonyM joined | 20:07 |
|
grawity
| git log -p foo.c | 20:08 |
| ← zenx left | 20:08 |
| ← primitive left | 20:09 |
|
trout
| with git svn is there a way to see which commits will be committed? | 20:10 |
|
| git svn dcommit -n shows me diff-tree which is not useless | 20:10 |
|
| * not useful | 20:10 |
| ← marthinal left | 20:11 |
| ← opus left | 20:11 |
|
jMCg
| grawity: awesome. Thank you. | 20:11 |
|
| Now I know that this fix hasn't been tried yet ;) | 20:11 |
| → aberrant joined | 20:11 |
| ← aksnot left | 20:12 |
| ← thl0 left | 20:13 |
| ← rockfruit left | 20:14 |
| ← pro_metedor left | 20:15 |
| → eletuchy joined | 20:15 |
| → nilg joined | 20:15 |
| → smirn0v joined | 20:15 |
| ← jlopez left | 20:16 |
| ← cyphase left | 20:16 |
| → marthinal joined | 20:17 |
| → CodeShark joined | 20:18 |
| → sobhan joined | 20:18 |
| ← sebuba left | 20:18 |
| → juvenal joined | 20:18 |
| → rideh joined | 20:18 |
| → michaelmartinez joined | 20:21 |
| ← JDuke128 left | 20:21 |
| → Chryyz joined | 20:22 |
| ← smirn0v left | 20:22 |
| → juril joined | 20:22 |
|
cbreak
| tr4656: you can look at git !lol | 20:23 |
|
gitinfo
| tr4656: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 20:23 |
| ← Grum left | 20:23 |
|
cbreak
| sorry, trout was the intended target | 20:23 |
| → hoschi joined | 20:23 |
| → sebuba joined | 20:23 |
|
cbreak
| trout: also look at normal git log ..@{u} syntax | 20:24 |
| → cyphase joined | 20:24 |
| → rockfruit joined | 20:24 |
| → Grum joined | 20:24 |
| → pfFredd joined | 20:27 |
| → hwrd|work joined | 20:30 |
| → thl0 joined | 20:31 |
|
ojacobson
| "normal" followed by punctuation soup might be a bit strong ;) | 20:31 |
|
| (yes, I know exactly how to read it) | 20:32 |
| ← revagomes left | 20:34 |
| ← john2496 left | 20:35 |
| ← Goles left | 20:35 |
| → jfelchner joined | 20:35 |
| ← OOPMan left | 20:35 |
| → recurrence joined | 20:35 |
| → john2496 joined | 20:37 |
| ← hoschi left | 20:37 |
| ← LeMike left | 20:38 |
| ← john2496 left | 20:38 |
| ← imMute left | 20:38 |
| → Milossh joined | 20:39 |
| → LeMike joined | 20:40 |
| → john2496 joined | 20:40 |
| → OOPMan joined | 20:40 |
| ← TonyM left | 20:41 |
| → TonyM joined | 20:41 |
| ← john_anderson left | 20:42 |
| ← thl0 left | 20:43 |
| ← valtih left | 20:43 |
| → thl0 joined | 20:44 |
| → ntls joined | 20:44 |
| ← virako left | 20:44 |
| → john_anderson joined | 20:45 |
| → skyf joined | 20:45 |
| → valtih joined | 20:46 |
|
catlee
| I'm fetching a bunch of unrelated repos into a single local repo. My builds then do local shared clones from the local repo to their build directory using specific refs to get the contents they need. However, I've noticed that fetching new repos into my giant shared repo is several times slower than a regular clone... | 20:47 |
|
| any ideas why? | 20:47 |
| → tinti joined | 20:47 |
| ← thatguycraig left | 20:48 |
|
catlee
| e.g. a repo that normally takes 5s to clone takes 5 minutes to fetch into the shared repo | 20:48 |
| → warthog9 joined | 20:49 |
|
cbreak
| catlee: sounds dumb | 20:49 |
| → R1KRDO joined | 20:49 |
| → Xunie_ joined | 20:49 |
|
cbreak
| make separate repositories for separate things | 20:49 |
|
catlee
| a lot of the separate things are actually related | 20:50 |
| ← Fuuzetsu left | 20:50 |
|
catlee
| is there a quick way to test if repositories are related? | 20:50 |
|
cbreak
| if they are separate repositories, then don't fetch them into the same | 20:51 |
| ← eletuchy left | 20:51 |
| ← krispin left | 20:51 |
|
catlee
| I don't know if they're separate until I have them | 20:52 |
| → Noldorin joined | 20:52 |
|
catlee
| I guess I could look at the first commit | 20:52 |
| → eletuchy joined | 20:52 |
| ← Guest77033 left | 20:53 |
|
cbreak
| then just clone them into separate repositories | 20:53 |
|
| if their URL is different | 20:53 |
|
catlee
| I have related repos with separate URLs | 20:53 |
| → Fuuzetsu joined | 20:53 |
| ← Fuuzetsu left | 20:53 |
| → Fuuzetsu joined | 20:53 |
|
catlee
| and unrelated repos also with separate URLs | 20:53 |
| → shashin joined | 20:53 |
|
cbreak
| then you'll have dupes, no big deal | 20:53 |
|
catlee
| well, it is | 20:54 |
| → Dooom joined | 20:54 |
|
catlee
| that's why I'm trying to figure out a way around it | 20:54 |
| ← rakl left | 20:54 |
| ← ntls left | 20:54 |
| ← john2496 left | 20:54 |
| → john2496 joined | 20:56 |
| ← eletuchy left | 20:57 |
| ← Ryback_ left | 20:58 |
| ← guest3137 left | 21:00 |
| → youf joined | 21:00 |
| ← sbodo left | 21:00 |
| → jason237 joined | 21:00 |
| → Goles joined | 21:02 |
| ← cakehero left | 21:02 |
| ← skyf left | 21:02 |
| ← valtih left | 21:02 |
|
rath
| If I merge a branch with 10 commits, and i'll get 5 conflicts in a file..do I see exactly the commit which causes the conflict in this part of the file? | 21:03 |
|
cbreak
| rath: no | 21:03 |
|
| git merges the branch tips | 21:03 |
|
| I am not completely sure, but I don't think it considers history much (apart from merge base and rename tracking) | 21:04 |
| ← bgerber left | 21:04 |
|
osse
| rath: when you're in the middle of the conflict I think you can use git log --merge to see which commits contributed to the horror | 21:06 |
|
EugeneKay
| git's recursive merge is a 3-way merge algorithm. It uses merge-base and the two tips being merged. | 21:06 |
|
| It uses some magic with intermerges after the merge base(ie, when you merge A into B regularly, but never B into A, until you're ready to do that) | 21:06 |
| → krispin joined | 21:08 |
| ← krispin left | 21:08 |
| ← z8z left | 21:08 |
| → lun_ joined | 21:08 |
|
EugeneKay
| But the general gist is no, you can't see the commit that introduced the conflict, because there isn't one until you merge. | 21:08 |
|
| It's merging trees, not patchsets(like darcs) | 21:08 |
|
osse
| So my suggestion is crap? | 21:08 |
|
rath
| >_< | 21:08 |
| → bgerber joined | 21:08 |
| ← hinst left | 21:08 |
|
osse
| man git-log says: '--merge After a failed merge, show refs that touch files having a conflict and don’t exist on all heads to merge.' | 21:08 |
|
gitinfo
| the git-log manpage is available at http://jk.gs/git-log.html | 21:08 |
|
EugeneKay
| It's a good starting point | 21:09 |
|
rath
| so how to merge pretty old branches with a long list of conflicts? | 21:09 |
|
EugeneKay
| man git-merge; the -Xours / -Xtheirs options(for the standard recursive strategy) can help greatly in auto-resolving conflicts with the version that you prefer. | 21:10 |
|
gitinfo
| the git-merge manpage is available at http://jk.gs/git-merge.html | 21:10 |
| ← catlee left | 21:10 |
|
EugeneKay
| You'll want to check before you commit(run your test suite.... you have a test suite, right?) of course | 21:10 |
| → revyd joined | 21:10 |
| ← normanrichards left | 21:11 |
| ← Destos left | 21:11 |
|
rath
| a merge strategy is not an option since you've decide at each conflict if you need to take or not.... | 21:12 |
| → asaf joined | 21:12 |
|
rath
| so i can't see "this conflict comes from this comit"? | 21:12 |
| ← maletor left | 21:13 |
|
EugeneKay
| not that I know of, no. | 21:13 |
|
| man git-blame may be of interest | 21:13 |
|
gitinfo
| the git-blame manpage is available at http://jk.gs/git-blame.html | 21:13 |
| ← warthog9 left | 21:14 |
| ← AdrienBrault left | 21:14 |
| → opus joined | 21:15 |
| → basmoura joined | 21:15 |
|
rath
| the thing is....merge a branch by merging a count of commits until you're at the end (you have n-times a small number of conflicts you can resolve)....or merge the branch as it is..... | 21:17 |
| ← asaf left | 21:17 |
| ← LuxuryMode left | 21:17 |
| ← imaginationac left | 21:18 |
| → Cromulent joined | 21:18 |
| → asaf joined | 21:18 |
| ← john2496 left | 21:18 |
| → john2496 joined | 21:21 |
|
rath
| resolving 5 conflicts are easier than 10.... | 21:21 |
| ← thl0 left | 21:21 |
| ← geekbri left | 21:21 |
| ← Gitzilla left | 21:21 |
| → FernandoBasso joined | 21:22 |
| ← freeed left | 21:23 |
| ← shashin left | 21:23 |
| → Liir joined | 21:23 |
|
cbreak
| rath: I rebase a lot, and rarely I have to solve the same conflict over and over | 21:24 |
|
| because every commit gets "merged" individually | 21:24 |
| → n1x joined | 21:24 |
|
cbreak
| using merge for such things instead would be more convenient :D | 21:24 |
| ← ckoch786 left | 21:26 |
|
rath
| It's actually meant as a merge... | 21:26 |
| → Element9 joined | 21:27 |
| ← tplaner left | 21:28 |
| ← bauruine left | 21:29 |
|
rath
| I merge a pretty old branch.... 1) i merge it as it is...i'll get 50 files conflicted and i don't know what to do since i don't know where the chances from the branch are from ... 2) i merge to commit 10....resolve...good....merge to 20...good.... next day....merge to 30... | 21:29 |
| → laurav joined | 21:30 |
| → rednaks joined | 21:31 |
| ← _iron left | 21:31 |
| → warthog9 joined | 21:31 |
|
rath
| but i see there's no way to get the single commit within a merge for a separate hunk of a file.... | 21:33 |
|
cbreak
| rath: you can merge them piecewise | 21:34 |
|
| and then reset --soft all the merge commits away | 21:34 |
|
| and commit them as one single merge commit | 21:34 |
| ← Villadelfia left | 21:34 |
|
rath
| oh....and that would be the same as a "normal" merge? | 21:35 |
|
NfNitLoop
| Or, if your old branch has a smaller number of commits, it may be easier to merge "in the other direction". check out your destination branch and merge your old branch on top of it. Then 'git annotate' should be able to find out when particular lines were changed. | 21:35 |
| → __BigO__ joined | 21:35 |
| ← jason237 left | 21:36 |
| ← SeySayux left | 21:36 |
|
cbreak
| rath: the effect would be | 21:36 |
| → Xethron joined | 21:36 |
| → babilen joined | 21:37 |
|
cbreak
| rath: I'd probably use git commit-tree with the correct parents and trees | 21:37 |
|
rath
| cool.... thx cbreak ... I haven't thought about this implication | 21:37 |
| ← johnthebear left | 21:37 |
| → thl0 joined | 21:38 |
| ← sayd left | 21:38 |
| → SeySayux joined | 21:38 |
| → ckoch786 joined | 21:39 |
| ← pppaul left | 21:40 |
| → chisler joined | 21:41 |
| → prudnikov joined | 21:41 |
| → deadmund joined | 21:42 |
| ← deadmund left | 21:42 |
| → Villadelfia joined | 21:42 |
| → ncd|leeN joined | 21:43 |
| → lb_ joined | 21:44 |
| ← leeN left | 21:44 |
|
Ziber
| When would be a scenario to cherry-pick? | 21:44 |
|
NfNitLoop
| cbreak: recommending plumbing commands to newbies? Are you trolling? :p | 21:45 |
| ← svetlyak40wt left | 21:45 |
| ← rideh left | 21:46 |
|
cbreak
| NfNitLoop: no. It's probably the easiest. | 21:46 |
|
| NfNitLoop: he can reset and recommit with reset --soft and git commit | 21:46 |
|
| but then he'd not get a merge | 21:46 |
| → svetlyak40wt joined | 21:47 |
|
cbreak
| he can just reset --hard, then retry the merge, and resolve all the conflicts with git checkout oldresolution -- ., but I don't trust that as much | 21:47 |
| → Heimdall joined | 21:48 |
| ← skoop left | 21:48 |
|
Heimdall
| hi, I have deleted branches locally, they still exist remotely, how can I delete them there too? | 21:48 |
|
cbreak
| Heimdall: man git-push | 21:48 |
|
gitinfo
| Heimdall: the git-push manpage is available at http://jk.gs/git-push.html | 21:48 |
|
cbreak
| look for --delete | 21:48 |
| ← svetlyak40wt left | 21:49 |
|
Heimdall
| ah ok thx | 21:49 |
| ← GeertV left | 21:50 |
| trout → constant | 21:50 |
| ← thl0 left | 21:51 |
| ← marthinal left | 21:51 |
| ← abcdefg_ left | 21:52 |
| ← amccloud left | 21:52 |
| → Davey joined | 21:55 |
| ← __BigO__ left | 21:55 |
| ← dbck left | 21:56 |
| → thl0 joined | 21:56 |
| ← nkr left | 21:56 |
| → kcj joined | 21:58 |
| → normanrichards joined | 21:58 |
| ← sysadminAli left | 21:58 |
| ← prudnikov left | 21:59 |
| ← sebuba left | 21:59 |
| ← Chryyz left | 21:59 |
| ← mikef_ left | 21:59 |
| → jcao219 joined | 22:01 |
| → Chryyz joined | 22:01 |
| ← Cromulent left | 22:02 |
| → AdrienBrault joined | 22:03 |
| → myme joined | 22:04 |
| → Ziggy` joined | 22:04 |
| ← glennpratt left | 22:05 |
| ← tavisto left | 22:07 |
|
shennyg
| I'm having trouble with git completion on osx. I'm using this guide: http://johnfgibb.com/how-to-install-git-autocompletion but I get this: ".git-completion.bash: line 66: syntax error near unexpected token `}'" | 22:07 |
|
grawity
| What does `git version` output? | 22:08 |
| → fletch` joined | 22:08 |
| → bauruine joined | 22:09 |
|
shennyg
| grawity: git version 1.8.1.1 | 22:09 |
| → maletor joined | 22:09 |
| ← Noldorin left | 22:10 |
| → wongon_ joined | 22:10 |
| ← basmoura left | 22:10 |
| ← rath left | 22:10 |
| ← wongon left | 22:10 |
| wongon_ → wongon | 22:10 |
| → skoop joined | 22:10 |
| → svetlyak40wt joined | 22:11 |
| ← Xethron left | 22:11 |
| ← Grum left | 22:11 |
| ← bgerber left | 22:11 |
| → prudnikov joined | 22:11 |
| → Grum joined | 22:12 |
| → eijk joined | 22:12 |
| → seanh_ joined | 22:12 |
| ← john_anderson left | 22:13 |
|
grawity
| shennyg: And bash version? (Ctrl+X Ctrl+V) | 22:13 |
| → hoschi joined | 22:13 |
| ← cmmagid left | 22:13 |
|
shennyg
| GNU bash, version 3.2.48(1)-release (x86_64-apple-darwin12) | 22:15 |
| ← hoschi left | 22:15 |
| ← recurrence left | 22:16 |
| ← drizzd left | 22:16 |
| → abf joined | 22:17 |
| → basmoura joined | 22:17 |
| → bgerber joined | 22:18 |
|
shennyg
| grawity: should I be installing it a different way? | 22:18 |
| ← thl0 left | 22:18 |
| ← normanrichards left | 22:19 |
| → john_anderson joined | 22:19 |
| ← tinti left | 22:20 |
| → jashsu joined | 22:21 |
| gitinfo set mode: +v | 22:21 |
| ← maletor left | 22:21 |
| → cmmagid joined | 22:21 |
| SamB_ → SamB | 22:22 |
| → maletor joined | 22:22 |
| ← n1x left | 22:22 |
| ← tenmilestereo left | 22:23 |
| → Vampire0 joined | 22:23 |
| ← Vampire0 left | 22:23 |
| → Vampire0 joined | 22:23 |
| ← Vampire0 left | 22:24 |
| ← lb_ left | 22:24 |
| ← RobertLaptop left | 22:25 |
| ← hellopat left | 22:25 |
| → jnavila joined | 22:25 |
| ← laurav left | 22:26 |
| ← ash4 left | 22:26 |
| → amccloud joined | 22:27 |
| → RobertLaptop joined | 22:28 |
| theoros → lrnt | 22:28 |
| ← Goles left | 22:28 |
| lrnt → theoros | 22:28 |
| ← mmitchell left | 22:29 |
| → lresende joined | 22:29 |
| → shashin joined | 22:29 |
| → mmitchell joined | 22:29 |
| ← todd_dsm left | 22:29 |
|
Caelum
| git diff HEAD is hanging for me | 22:30 |
|
| very strange | 22:30 |
| ← wongon left | 22:30 |
|
grawity
| strace to the rescue? | 22:30 |
|
| Caelum nods. | 22:30 |
| → wongon joined | 22:30 |
| → ferdev_ joined | 22:30 |
|
Caelum
| ah it's my pager | 22:32 |
| ← dijonyummy left | 22:32 |
| ← jnavila left | 22:33 |
| ← maletor left | 22:33 |
| → rakl joined | 22:33 |
|
Caelum
| still, I don't get it, the pager works fine for all other files | 22:34 |
| ← breakingthings left | 22:34 |
|
Caelum
| q | 22:35 |
|
NfNitLoop
| Ziber: I cherry-pick when I accidentally commit a change to a branch that I didn't mean to. "Oh yeah, I meant to put this over in my feature branch. git checkout myFeature; git cherry-pick theWrongBranch;" (Then I'll need to remember to reset theWrongBanch to remove it from its history before I accidentally push it somewhere.) :p | 22:35 |
|
| Ziber: You might also cherry pick if you're backporting some fixes from your master branch to an older release. In that case, I recommend the -x flag. | 22:36 |
|
Caelum
| weird, I ran into some sort of vim bug | 22:37 |
| ← rockfruit left | 22:37 |
| → milStaja joined | 22:37 |
| → samuel02 joined | 22:37 |
| ← seanh_ left | 22:37 |
| ← ryanplas left | 22:38 |
| → dlaban joined | 22:38 |
|
shennyg
| grawity: it's something strange with my current profile. If I remove everything else it works fine. thanks. | 22:39 |
| ferdev_ → ferdev | 22:39 |
| ← eijk left | 22:41 |
| ← peppyheppy left | 22:41 |
|
Caelum
| the pager I maintain hangs if you try to feed it binary files | 22:41 |
| ← basmoura left | 22:41 |
|
Caelum
| I should fix that at some point :/ | 22:41 |
| ← sobhan left | 22:43 |
| ← rednaks left | 22:44 |
| ← dlaban left | 22:44 |
| ← macabre left | 22:44 |
| ← aspotashev left | 22:44 |
| ← whowantstolivef1 left | 22:44 |
| → kadoban joined | 22:46 |
| ← Ziggy` left | 22:46 |
| ← R1KRDO left | 22:48 |
| → pppaul joined | 22:48 |
| → thl0 joined | 22:49 |
| ← ojacobson left | 22:49 |
| ← mmitchell left | 22:51 |
| → maletor joined | 22:53 |
| → skywalkerhere_ joined | 22:54 |
| ← john2496 left | 22:54 |
| ← youf left | 22:54 |
| ← skywalkerhere left | 22:55 |
| ← willob left | 22:56 |
| ← Chryyz left | 22:56 |
| → skywalkerhere joined | 22:57 |
| ← thl0 left | 22:57 |
| ← svetlyak40wt left | 22:58 |
| ← skywalkerhere_ left | 22:59 |
| ← aberrant left | 22:59 |
| → thl0 joined | 22:59 |
| → jnavila joined | 23:00 |
| → relipse joined | 23:01 |
| ← fisted left | 23:01 |
| → pfFred joined | 23:01 |
| ← Anders_J left | 23:01 |
| ← revyd left | 23:02 |
| ← cmmagid left | 23:02 |
| → fisted joined | 23:02 |
| ← techhelp left | 23:02 |
| ← pfFredd left | 23:03 |
| ← michaelmartinez left | 23:03 |
| ← dwmw2_gone left | 23:04 |
| → dwmw2_gone joined | 23:04 |
| ← dwmw2_gone left | 23:05 |
| → dwmw2_gone joined | 23:06 |
| ← trungqtran left | 23:06 |
| → sysadminAli joined | 23:06 |
| → mutt joined | 23:08 |
| ← sq-one left | 23:08 |
| ← grn left | 23:08 |
| ← axl_ left | 23:09 |
| → trungqtran joined | 23:09 |
| ← TonyM left | 23:09 |
| → Ziggy` joined | 23:10 |
| ← thl0 left | 23:10 |
| ← sysadminAli left | 23:11 |
| dwmw2_gone → dwmw2_STR | 23:12 |
| → otherj joined | 23:14 |
| ← dwmw2_STR left | 23:14 |
| → dwmw2_gone joined | 23:14 |
| → revyd joined | 23:15 |
| ← jnavila left | 23:15 |
| ← otherj left | 23:16 |
| ← jaequery left | 23:16 |
| → virako joined | 23:16 |
| → jaequery joined | 23:17 |
| → jason237 joined | 23:17 |
| → davidbanham joined | 23:18 |
| ← v0n left | 23:18 |
| → mishok13 joined | 23:19 |
| ← jdunck left | 23:20 |
| → huoxito joined | 23:21 |
| ← Gentlecat left | 23:21 |
| ← gustavnils left | 23:21 |
| ← TheFuzzball left | 23:21 |
| → michaelmartinez joined | 23:22 |
| → jdunck joined | 23:22 |
| → amcsi joined | 23:22 |
| ← amcsi left | 23:22 |
| ← alunduil left | 23:23 |
| ← Davey left | 23:23 |
| ← dwmw2_gone left | 23:23 |
| ← LeMike left | 23:23 |
| → dwmw2_gone joined | 23:23 |
| ← RaceCondition left | 23:24 |
| ← Shurakai left | 23:24 |
| ← mutt left | 23:25 |
| → unnamedwill joined | 23:26 |
| ← hobodave left | 23:26 |
| → Davey joined | 23:26 |
| hays_ → hays | 23:28 |
| → nicekiwi_ joined | 23:28 |
| ← Davey left | 23:28 |
| ← dwmw2_gone left | 23:29 |
| → dwmw2_gone joined | 23:29 |
| → TheFuzzball joined | 23:31 |
| → johnw joined | 23:32 |
| → n4irc joined | 23:33 |
| ← rugged left | 23:33 |
| ← michaelmartinez left | 23:34 |
| ← chisler left | 23:35 |
| → eletuchy joined | 23:36 |
| ← dwmw2_gone left | 23:36 |
| → dwmw2_gone joined | 23:36 |
| → anderse joined | 23:37 |
| → ash4 joined | 23:37 |
| ← SuperKing left | 23:37 |
| ← john_anderson left | 23:38 |
| ← Fox- left | 23:38 |
| → SuperKing joined | 23:39 |
| ← SuperKing left | 23:39 |
| ← davidbanham left | 23:39 |
| → SuperKing joined | 23:39 |
| ← SuperKing left | 23:39 |
| → SuperKing joined | 23:40 |
| ← SuperKing left | 23:40 |
| ← pfFred left | 23:40 |
| → SuperKing joined | 23:40 |
| ← SuperKing left | 23:40 |
| → SuperKing joined | 23:41 |
| ← SuperKing left | 23:41 |
| → Shurakai joined | 23:41 |
| → SuperKing joined | 23:41 |
| ← SuperKing left | 23:41 |
| → boombatower joined | 23:42 |
| ← kristofers left | 23:42 |
| → SuperKing joined | 23:42 |
| ← SuperKing left | 23:42 |
| → SuperKing joined | 23:42 |
| ← SuperKing left | 23:42 |
| ← p4tux left | 23:42 |
| ← dwmw2_gone left | 23:43 |
| → dwmw2_gone joined | 23:43 |
| → SuperKing joined | 23:43 |
| ← SuperKing left | 23:43 |
| ← kermit left | 23:43 |
| → SuperKing joined | 23:43 |
| ← SuperKing left | 23:43 |
| → mmitchell joined | 23:43 |
| → samholmes joined | 23:44 |
| ← samholmes left | 23:44 |
| → SuperKing joined | 23:44 |
| ← SuperKing left | 23:44 |
| → SuperKing joined | 23:44 |
| ← SuperKing left | 23:44 |
| ← apok left | 23:45 |
| → SuperKing joined | 23:45 |
| ← SuperKing left | 23:45 |
| ← aspiers left | 23:45 |
| → SuperKing joined | 23:45 |
| ← SuperKing left | 23:45 |
| → SuperKing joined | 23:46 |
| ← SuperKing left | 23:46 |
| → Davey joined | 23:46 |
| → SuperKing joined | 23:46 |
| ← SuperKing left | 23:46 |
| ← maxmanders left | 23:47 |
| → SuperKing joined | 23:47 |
| ← SuperKing left | 23:47 |
| → SuperKing joined | 23:47 |
| ← SuperKing left | 23:47 |
| → SuperKing joined | 23:48 |
| ← SuperKing left | 23:48 |
| ← kaen left | 23:48 |
| → SuperKing joined | 23:49 |
| ← SuperKing left | 23:49 |
| ← dwmw2_gone left | 23:49 |
| → SuperKing joined | 23:49 |
| ← SuperKing left | 23:49 |
| → dwmw2_gone joined | 23:49 |
| → SuperKing joined | 23:50 |
| ← SuperKing left | 23:50 |
| → SuperKing joined | 23:50 |
| ← SuperKing left | 23:50 |
| → SuperKing joined | 23:51 |
| ← SuperKing left | 23:51 |
| ← natechan left | 23:51 |
| → kermit joined | 23:51 |
| → SuperKing joined | 23:51 |
| ← SuperKing left | 23:51 |
| → SuperKing joined | 23:52 |
| ← SuperKing left | 23:52 |
| → SuperKing joined | 23:52 |
| ← SuperKing left | 23:52 |
| → tavist0 joined | 23:52 |
| → sirdancealot7 joined | 23:53 |
| → SuperKing joined | 23:53 |
| ← SuperKing left | 23:53 |
| → SuperKing joined | 23:53 |
| ← SuperKing left | 23:53 |
| → SuperKing joined | 23:54 |
| ← SuperKing left | 23:54 |
| → SuperKing joined | 23:54 |
| ← SuperKing left | 23:54 |
| → SuperKing joined | 23:55 |
| ← SuperKing left | 23:55 |
| → SuperKing joined | 23:55 |
| ← SuperKing left | 23:55 |
| ← pantsman left | 23:55 |
| ← xiangfu left | 23:55 |
| → SuperKing joined | 23:56 |
| ← SuperKing left | 23:56 |
| ← dwmw2_gone left | 23:56 |
| → dwmw2_gone joined | 23:56 |
| → SuperKing joined | 23:56 |
| ← SuperKing left | 23:56 |
| ← pppaul left | 23:56 |
| → SuperKing joined | 23:57 |
| ← SuperKing left | 23:57 |
| → SuperKing joined | 23:57 |
| ← SuperKing left | 23:57 |
| → SuperKing joined | 23:58 |
| ← SuperKing left | 23:58 |
| → SuperKing joined | 23:58 |
| ← SuperKing left | 23:58 |
| → SuperKing joined | 23:59 |
| ← SuperKing left | 23:59 |
| → pppaul joined | 23:59 |
| ← FernandoBasso left | 23:59 |
| → SuperKing joined | 23:59 |
| ← SuperKing left | 23:59 |