Re: [git-users] After git -am commit changed files are not in repo

I ran the following commands but still get the 'Your branch is ahead…' 1. git reset --hard origin/master 2. git pull Already up-to-date. 3. git status # On branch master # Changed but not updated: # (use "git add/rm ..." to update what will be committed) # (use "git checkout -- ..." to discar

Re: [git-users] After git -am commit changed files are not in repo

Without the -s 'git status' returns 'Your branch is ahead of 'origin/master' by 1 commit. root@ip-xxx-xx-x-xxx:/var/www/myprojecgt# git status # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # nothing to commit (working directory clean) On Thu, Nov 14, 2013 at 9:30 PM,

Re: [git-users] After git -am commit changed files are not in repo

No the 'deleted' file, application.log, is still in the repo and the other commits I made are not showing up in the repo. I can't understand where the committed files went? On Thursday, November 14, 2013 8:28:22 PM UTC-8, Peter J Weisberg wrote: > > On Nov 14, 2013 7:53 PM, "Dave Kennedy" > > w

Re: [git-users] After git -am commit changed files are not in repo

On Nov 14, 2013 7:53 PM, "Dave Kennedy" wrote: > > I have a git repository cloned to an AWS server. > But my commits are not showing up in the repository even though there is no error when I commit a file. > Is it OK to make commits as root or do I need to login with a git user name ? > > root@ip

[git-users] After git -am commit changed files are not in repo

I have a git repository cloned to an AWS server. But my commits are not showing up in the repository even though there is no error when I commit a file. Is it OK to make commits as root or do I need to login with a git user name ? root@ip-xxx-xx-x-xxx:/var/www/myproject# git config --global use

[git-users] git pull --rebase ?

We've recently switched to Git and Gerrit, and are drafting the best practices workflow for our development team. One thing we want to avoid is "merge" commits that have two parents since if these commits fail Gerrit's review it is hard to rebase them. I know that "git pull" will do the "fetch

Re: [git-users] .gitignore question

> From: wtriker@gmail.com > > I have some files that I want to ignore but can't seem to come up with the > correct format. There are multiple sub-directories with the same path that > I want to ignore. Specifically, the are '/system/cache' and > all start with 'cache.'. The .gitignore entry

Re: [git-users] files case name changes detection.

On Thu, 14 Nov 2013 02:37:20 -0800 (PST) Gabby Romano wrote: [...] > regarding a change+rename you mentioned - if you declare you are > looking for 100% in the similarity index + the rename flag from git - > so we are covered, as you said. Really? Not so fast, please. ;-) Looking for R100 mark

Re: [git-users] Question on Git Hooks

On Thu, 14 Nov 2013 08:18:56 -0500 lingfei ouyang wrote: [...] > > The problem is that by (stupid) default it's not an error in a POSIX > > shell to attempt to expand a parameter which does not exist. > > I mean, if you have a script myscript.sh reading [...] > Thanks a lot Konstantin for the inf

Re: [git-users] Question on Git Hooks

Thanks a lot Konstantin for the information, will doing research on this. On Thu, Nov 14, 2013 at 8:03 AM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Wed, 13 Nov 2013 12:00:00 -0500 > lingfei ouyang wrote: > > > and one more quick question? > > > > What is the correct

Re: [git-users] Question on Git Hooks

On Wed, 13 Nov 2013 12:00:00 -0500 lingfei ouyang wrote: > and one more quick question? > > What is the correct way for define the variable in pre-commit hooks > in Git bash so I can using those three variables to run git commands, > i.e. > > git show $newrev > git merge-base $oldreve $newrev >

[git-users] Re: .gitignore question

Thanks for the reply. Unfortunately it is not that simple. There are other directories named 'cache' that are not in 'system' that need to be tracked. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and s

Re: [git-users] Sync repository remote with local after git reset

Thank brother! Em quinta-feira, 14 de novembro de 2013 10h22min41s UTC-2, Konstantin Khomoutov escreveu: > > On Thu, 14 Nov 2013 03:44:56 -0800 (PST) > Diogo Machado > wrote: > > > Hi, I'm necessity rollback 2 commits, I try: > > > > git reset --hard HEAD~2 > > > > Now, how can I synchroniz

Re: [git-users] Sync repository remote with local after git reset

On Thu, 14 Nov 2013 03:44:56 -0800 (PST) Diogo Machado wrote: > Hi, I'm necessity rollback 2 commits, I try: > > git reset --hard HEAD~2 > > Now, how can I synchronize with my remote repository? Depends on how do you specify "synchronize". Do you want to send the updated contents of your loca

[git-users] Sync repository remote with local after git reset

Hi, I'm necessity rollback 2 commits, I try: git reset --hard HEAD~2 Now, how can I synchronize with my remote repository? -- 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

Re: [git-users] files case name changes detection.

thanks a lot Konstantin for the detailed answer. great help indeed. I was well aware of the similarity index of git diff and planned to use it. however, your global view of the issue made it much clearer for me. I do think I will need to go through all the commits in between since when applied d

[git-users] Ignoring files

Hello!! I have a (newbie) problem with GIT. I want to have two branches in a project, one for development and one for production and I want to push everything in Dev and then, if everything is ok, merge them to Prod. But there is some files that always will be different in dev and in prod, so I