Skip to content

Instantly share code, notes, and snippets.

@jperkin
Created July 20, 2012 19:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jperkin/3152796 to your computer and use it in GitHub Desktop.
Save jperkin/3152796 to your computer and use it in GitHub Desktop.
Why is git treating these two files differently, and why is the status
changing in between 'status' and 'commit'? I want to ensure that the
history of gcc47/buildlink3.mk is preserved.
Irrelevant lines have been omitted.
$ git status
# Changes to be committed:
# renamed: gcc47/buildlink3.mk -> gcc47-compiler/buildlink3.mk
# renamed: gcc47/Makefile -> gcc47/Makefile.common
# Changes not staged for commit:
# modified: gcc47-compiler/buildlink3.mk
# modified: gcc47/Makefile.common
$ git commit -a
# Changes to be committed:
# new file: gcc47-compiler/buildlink3.mk
# renamed: gcc47/Makefile -> gcc47/Makefile.common
# deleted: gcc47/buildlink3.mk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment