On Tue, Mar 11, 2014 at 2:50 AM, rhugga wrote:
>
> So .gitignore is used to hide certain file types which is great. But how do
> you have it ignore the file itself?
>
> I put .gitignore in the file itself and that works but seems more like a
> work around than as intended.
The reasons and explana
On Thu, Mar 20, 2014 at 10:55 AM, Senjin Dragon
wrote:
> Let me sketch out what I'm trying to do. I'm not sure if I can use git for
> this or not. I think I can but I'm getting headaches going through the
> documentation and experimenting. It's all a bit confusing to me.
>
> I run a minecraft game
I am interested in a rather old program -- first version was written more
than 40 years ago -- in the Algol era!
Its gone through various IBM/CDC machines until it ran on Irix in the 90s
and briefly Windows until .Net 2003. After that its not exactly runnable.
As may be evident the original progr
On Thu, Oct 9, 2014 at 5:10 PM, Gergely Polonkai
wrote:
> Hello,
>
> GitHub provides you private repositories. If that's OK with you to pay
> them a small sum, that should work. Otherwise, if you need the full
> functionality of GitHub, you may want to check GitLab, which does just
> that. Or, if
Hi
Context is we're using git for collectively editing documents(mostly text
ie not Word etc).
Sharing is on bitbucket.
There are also largish reference-docs -- downloaded pdfs etc that are
referenced but not ours -- dont want these in the repo.
So...
If I make a .gitignore that contains the 'do
Not exactly a git question...
If someone (who prefers git) has to work with a mercurial repo, are
one of the git-mercurial bridges preferred or should one just stick to
mercurial?
If so which bridge is recommended?
--
You received this message because you are subscribed to the Google Groups "Git
Setting up for a project in which both linux and windows will be the OSes.
After spending some time searching for solutions I am as confused as ever.
What are the optimum crlf settings so that files (maybe of designated
types, say
.c and .h files) are CRLF on windows and LF on linux?
--
You rece
On Tue, Jun 2, 2015 at 11:07 PM, Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:
> On Tue, 2 Jun 2015 22:09:46 +0530
> Rustom Mody wrote:
>
> > Setting up for a project in which both linux and windows will be the
> > OSes.
> >
> > After spend
I have two repos R1, R2.
They should have been the same but due to some goofup they diverged.
[R1 was on bitbucket; copied to github as R2; something not quite right
with the copy I guess]
Now R2 has moved ahead.
But R1 has branches b1 b2 that did not get to R2.
How to graft only branch b1, b2 fr
I have a project on github which has been forked (friendly!).
What is the best workflow to examine merge the commits in the fork?
Of course I can git clone it separately but it seems that way I will miss
out on all the git branch etc goodness
--
You received this message because you are subscrib
On Sun, Aug 23, 2015 at 3:26 PM, Philip Oakley wrote:
> I have a project on github which has been forked (friendly!).
>>
>> What is the best workflow to examine merge the commits in the fork?
>>
>> Of course I can git clone it separately but it seems that way I will miss
>> out on all the git bra
I understand that of late shallow clones have improved in various ways
I just tried to clone emacs
Shallow emacs 262M
Full clone 441M
In particular
shallow emacs' .git 38M
Full emacs' .git 228M
Most important it was some 2 hours with full and less than ½ hr with
shallow
However emacs devs prefe
On Fri, Oct 2, 2015 at 5:30 AM, Sascha Manns wrote:
> Hello list,
>
> actually i'm having some trouble by using git. My .gitignore shows:
>
> sascha@sascha-desktop:~/RubymineProjects/hoe-manns$ cat .gitignore
> Index.yml
> hoe-manns.gemspec
> .yardoc
> SetupConfig
> SetupReceipt
> README.txt
> doc
A noob question:
As people may know smartsvn is quite popular among svn clients
The folks making smartsvn have now made smartgit
http://www.syntevo.com/smartgit/index.html
Is this a good way to start using git?
--
You received this message because you are subscribed to the Google Groups "Git
f
Well thanks Konstantin for the answer!
Ive tried a couple of times to post to the group and not succeeded earlier
Did you see this now or earlier? I posted this 10 days ago.
On Mon, Mar 28, 2011 at 2:32 PM, Konstantin Khomoutov
wrote:
> On Fri, 18 Mar 2011 14:02:11 +0530
> Rustom Mody
When I am working with a certain git repo I need to make a 1 line
change to the Makefile (for adapting to my paths)
So then whenever I do git pull I get
error: Your local changes to the following files would be overwritten by merge:
Makefile
Please, commit your changes or stash them befor
On Mon, Nov 21, 2011 at 1:01 AM, Thomas Ferris Nicolaisen
wrote:
> The normal approach is pretty much what the error message says: Either
> commit first, or stash the changes. Example of the latter approach:
>
> $ git pull
>
> $ git stash save
> $ git pull
> $ git stash pop
>
>
>
Beautiful -- Th
On Sun, Nov 20, 2011 at 11:59 PM, radovan bast wrote:
> is it a repo that you only use or a repo where you contribute to?
>
>
> if you also contribute to the repo then i would change your Makefile:
> separate it into a generic part and a specific part (Makefile.config,
> included in Makefile).
As a git noob I am handling my first conflicts.
I find the conflict-marker-ed files hard to decipher
with the
etc
Is it possible to read the same information in emacs with ediff?
I guess its related (or not dunno) how to grok 3 way merge?
--
You received this message because you
On Thu, Mar 8, 2012 at 7:32 AM, Andrew Gray wrote:
> Hi All,
>
> At one client site we are using SVN. Client is a big corporate with
> projects teams spread across 3 buildings on the same site. Project teams
> are often sitting next to each other.
>
> I am trying to convince collegues that we sh
On Sat, Jul 21, 2012 at 2:25 AM, Thomas Ferris Nicolaisen
wrote:
> I suspect that you are in "rebase mode". That is, you're in the middle of
> rewriting som history, and Git is waiting for you to type things like "git
> rebase --abort" or "git rebase --continue". If you just want to get out of
> t
On Sun, Jul 22, 2012 at 2:18 AM, Thomas Ferris Nicolaisen
wrote:
> Well I can kinda see the parallel to vim when it comes to learning curve.
> Git certainly has some areas where the ui can be improved, and the good
> thing is that they are continuously making small steps to improve it (while
> vim
On Mon, Jul 23, 2012 at 11:54 AM, Thomas Ferris Nicolaisen wrote:
>
> Could you point me to that 'git-bash thing'? -- Looks very useful
>>
>
> Note that it only works for zsh (z-shell) and bash, so you'll need to run
> either Linux, Mac, or Windows with Cygwin (or Git Bash).
>
> In the above shel
I am an org-mode (emacs-mode) user.
org-mode uses git -- so those who want to stay upto date with the devel
version use git pull, followed by a re-build.
Recently the build system has been made more elaborate having a number of
makefiles and pre-process makefiles:
http://orgmode.org/worg/dev/org-bu
On Mon, Aug 19, 2013 at 10:34 PM, wrote:
> At some point I added a large file into a git repository.
> It now exists on multiple branches, possibly with some
> changes to it. I'd like to remove it from git, but leave its
> current form (say the one on the master branch) on the
> file system.
Sa
25 matches
Mail list logo
