Re: [git-users] Newbie lost track of state, unsure how to read anything

[Gergely Polonkai]

Hello,

Most of your questions (especially the one on colors) should be asked on
the list of SmartGit.

About the many branches issue: most of them seem to be remote branches, ie.
the state of branches other machines know. I would suggest reading an
article or two about branches[1] and remotes[2]. Also, getting familiar
with the command line tools of Git is a very good idea before start using
any GUIs. It will get you familiar with the basics faster.

Best,
Gergely

[1] https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
[2] https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches
Hi everyone. I develop addons for World of Warcraft, and started using Git
to try to be more professional about my development and to easily update my
projects on multiple websites. Unfortunately, I've found myself frustrated
several times by the tools and I'm now very lost. I've stalled out because
I'm unsure of what to do next, and I would really appreciate some guidance.

I've attached a screenshot from SmartGit showing an overview of my project
(gitlost.png). I do all of my development on this one machine, and have no
collaborators. When I'm ready to release, I can push an
appropriately-tagged commit to WoWInterface and Curse, which automatically
package the code for distribution through their automatic updaters and for
manual downloads via their website. Hopefully, that helps explain how I got
to where I am.

Most of the work since mid-April was done to a new feature, and I
eventually realized that I'd made some poor structural choices. My thinking
was to save the current state of the project just in case, then begin the
work of restructuring on another branch. That's the label MoversFirst...
I think. Frankly, I don't know how to read or navigate any of this and I'm
not sure if I accomplished that.

Would any number of persons please try to explain:
- Why are there so many branches on the left?
- What is the meaning of the colors and iconography in the list of commits?
- I tried jumping between commits to try to figure out what code was where.
The popup shown in checkout.png comes up. I don't understand the
consequences of the choices offered, and why is a remote anything involved
in the first place?

Please, and a desperate thank you to anyone who responds.

-- 
You received this message because you are subscribed to the Google Groups
Git for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an
email to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Re: I'm stuck

[Daniel Cortes]

I just wanted to thank Luis Pereira, it was a pain trying to figure out how 
to save in VIM, CTRL+S was definitely not it, your suggestion worked. thank 
you!

On Wednesday, July 9, 2008 at 12:03:11 AM UTC-4, Ruby Freak wrote:

 I am (attempting) to follow the peepcode get tutorial, which has me 
 rather in the mood for a rant at the moment. that's better. 
 Geoffrey had me do a 'git commit -v' which didn't look at all like his 
 screen as I am on Ubuntu. Vim appeared and asked me to type in a 
 commit message at the top of the screen. I did that, but couldn't 
 figure out how to save the damn thing. nothing worked, it just added 
 to the message. I finally just closed vim and then I had a lock file. 
 I deleted the lock file and now everything is hosed. I finaly just 
 deleted the whole .git directory and started over. 


 after I do a 'git commit -v', how do I save the commit message at the 
 top of the screen in VIM? 

 also When I edit the .gitignore file git tells me about it when I run 
 git status. 
 what do I do about that? just treat it as any other file? 

 Thanks in advance 



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: Fw: [git-users] Re: How report an error in the Spanish traduction?

[Eric Romanenghi]

Thank you a lot!

2015-08-05 20:42 GMT-03:00 Philip Oakley philipoak...@iee.org:

 [cc'ing Git users list again]

 Hi Eric,

 Thanks for that.

 As Jiang had noted on the main Git list (
 http://thread.gmane.org/gmane.comp.version-control.git/275141 and
 http://article.gmane.org/gmane.comp.version-control.git/275142), the
 Ubuntu folks have an independent translation.

 quote
 Some linux distribution, such as Ubuntu, has its own l10n workflow for
 each package (including git.git), and not works well with the upstream.
 For example, Ubuntu makes a one-time import from our Git translations
 (from some obsoleted version) into their l10n databases, and their
 contributors will start to translate using their web UI, and never sync
 with our upstream again.  They ubuntu may have more languages
 support, but they may also have more bugs.  Sometime,  their bugs
 will be reported to our upstream, for example:

 *
 http://thread.gmane.org/gmane.comp.version-control.git/239130/focus=239130
 /quote
 The Ubuntu wiki is
 https://wiki.ubuntu.com/Translations/KnowledgeBase/TranslationsPrecedence 
 which
 has a link for reporting.

 I may see if I can follow up on their stated policy regarding upstream
 translations seeing as git/git does not yet have an es.po at the moment.

 Hope this helps in your reporting of the translations. (I'm not a Spanish
 speaker)

 regards

 - Original Message -
 *From:* Eric Romanenghi ericromanen...@gmail.com
 *To:* Philip Oakley philipoak...@iee.org
 *Sent:* Wednesday, August 05, 2015 1:50 PM
 *Subject:* Re: Fw: [git-users] Re: How report an error in the Spanish
 traduction?

 I've looking for the es.po file in the git repository, and i could not
 find it.

 Do you know where the file is?

 Thanks!

 Eric

 P.S.: The error is still present. And we my teammates found other correct
 but strange translations, for example: use «git add archivo...» para
 actualizar lo que se ejecutará. What is the meaning of para actualizar lo
 que se ejecutará? That has no sense.



 2015-08-05 9:39 GMT-03:00 Eric Romanenghi ericromanen...@gmail.com:

 Hi!

 My version of Git is: git version 1.9.1

 And my OS is: GNU/Linux - 14.04.1-Ubuntu x86_64 - Linux 3.16.0-45-generic

 If you want, i can colaborate with the translation to the Spanish. There
 is any repo or something?

 Thanks you!

 Eric

 2015-08-05 4:39 GMT-03:00 Philip Oakley philipoak...@iee.org:

 Hi Eric,

 Which OS/Git distribution are you using ?

 Philip

 - Original Message -
 *From:* Eric Romanenghi ericromanen...@gmail.com
 *To:* Philip Oakley philipoak...@iee.org
 *Sent:* Saturday, August 01, 2015 9:20 PM
 *Subject:* Re: Fw: [git-users] Re: How report an error in the Spanish
 traduction?

 Thank you!

 2015-08-01 10:35 GMT-03:00 Philip Oakley philipoak...@iee.org:

 Hi Eric,

 Not sure if you saw my reply on the list. I had missed one layer of
 indirection..

 While the po/es translation is still not part of the main gt/git
 translations, I am putting forward a small patch to help clear up the
 instructions in the po/README regarding how to process mistranslations,
 especially for those not held by git/git.

 I hope this helps a little.

 Philip

 - Original Message -
 *From:* Philip Oakley philipoak...@iee.org
 *To:* git-users@googlegroups.com
 *Cc:* Renán Romero Ruiz renanrom...@gmail.com
 *Sent:* Sunday, July 19, 2015 11:54 AM
 *Subject:* Re: [git-users] Re: How report an error in the Spanish
 traduction?

 Hi Renán,

 Junio, the primary Git maintainer, has noted that currently Spanish is
 not one of the translations managed through his Internationalisation [for
 codes, see 1], as coordinated by Jiang Xin.

 What distribution of Git are you using (i.e. where is it provided from,
 what's it's licence/copyright)?

 Initially the translation mistake should be reported to that upstream.

 I believe the Git team would still welcome the contribution of a
 Spanish transalation [2] if you or the upstream would like to contribute.
 The current transalation teams are at [3].

 regards

 Philip

 [1] https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 [2] Code Indo-European :: Spanish :: español :: es (from 1)
 [3] https://github.com/git-l10n/git-po/blob/master/po/TEAMS

 - Original Message -
 *From:* Philip Oakley philipoak...@iee.org
 *To:* git-users@googlegroups.com
 *Cc:* Git List g...@vger.kernel.org
 *Sent:* Saturday, July 18, 2015 12:32 AM
 *Subject:* Re: [git-users] Re: How report an error in the Spanish
 traduction?

 copying the main Git List g...@vger.kernel.org message regarding
 Internationalisation (I10n).
 The mail list public record is at
 http://news.gmane.org/gmane.comp.version-control.git.

 See the last paragraph:


 14 July 2015 00:54

 [L10N] Kickoff of translation for Git 2.5.0 round 2
 Hi,

 Thanks to all the l10n teams, and the 1st round of translations for Git
 2.5.0
 has been merged.  While there are some new messages need to be
 translated for the new released Git v2.5.0-rc2, let's start