How to list files that are pending for commit from a merge, including hand modified files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

git-ls-files does not seem to show files pending to be committed. The
-m option does seem to work for files that I might have edited outside
of git via an editor, but not all of the other ones pending for merge.
The -t option "seems" to imply that the info would be shown, but only
lists all files in the repo. Only git-status seems to show these files
but in a fashion that makes filtering a bit clunky. Is there some way
in which to get a listing of the files that git-status shows in its
"changes to be committed" section, but not the "Untracked files"
section, short of postprocessing the git-status output with sed/awk
gymnastics?  E.g., the first section of "modified" files and "new
file" type files, but not the junk/ directory:

# On branch work
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .Xmodmap
#	new file:   .some_file
#	modified:   .gitignore
#	modified:   .zone.profile
#	modified:   Vncviewer
#	new file:   bin/gitw-merge-common.sh
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	junk/

Thanks,
Brent
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux