On Oct 22, 2013 11:21 AM, "Vicki Kozel" <vickiko...@gmail.com> wrote: > > This is what git status shows after I modified the file and ran "git add": > > git status > # On branch fix99 > # Changes to be committed: > # (use "git reset HEAD <file>..." to unstage) > # > # modified: COMMON/pom.xml > # > > > This is what git commit with amend shows: > > git commit COMMON/pom.xml --amend > # On branch fix99 > # No changes > You asked to amend the most recent commit, but doing so would make > it empty. You can repeat your command with --allow-empty, or you can > remove the commit entirely with "git reset HEAD^".
It's because you added the "--amend" option. You're telling git that you want a commit that introduces no changes, and git is asking if you're really sure about that, and suggesting something you might want to do instead. It sounds to me like what you want to do is just not merge the commit into master. I.e., do nothing. Why are you even working with this branch if you're just trying to discard it? -- 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/groups/opt_out.
