gistfile1.txt

KonstantinKeller@gooey:~/pcf_aosp/frameworks/base$ git commit -a -m "derp"
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       core/java/android/content/pm/BaseThemeInfo.java
#       core/java/android/content/pm/ThemeInfo.aidl
#       core/java/android/content/pm/ThemeInfo.java
#       core/java/android/content/res/CustomTheme.java
#       core/java/android/content/res/PackageRedirectionMap.aidl
#       core/java/android/content/res/PackageRedirectionMap.java
#       core/java/com/android/internal/app/IAssetRedirectionManager.aidl
#       core/java/com/android/internal/app/ThemeUtils.java
#       core/jni/android_util_PackageRedirectionMap.cpp
#       include/androidfw/PackageRedirectionMap.h
#       include/androidfw/ZipEntry.h
#       include/androidfw/ZipFile.h
#       libs/androidfw/PackageRedirectionMap.cpp
#       services/java/com/android/server/AppsLaunchFailureReceiver.java
#       services/java/com/android/server/AssetRedirectionManagerService.java
nothing added to commit but untracked files present (use "git add" to track)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'