From: Brent Goodrick Date: Sat, 21 Feb 2009 23:20:21 GMT Subject: How to list files that are pending for commit from a merge, including hand modified files Message-ID: 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 ..." 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 ..." to include in what will be committed) # # junk/ Thanks, Brent