git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brent Goodrick <bgoodr@gmail.com>
To: git@vger.kernel.org
Subject: How to list files that are pending for commit from a merge, including  hand modified files
Date: Sat, 21 Feb 2009 15:20:21 -0800	[thread overview]
Message-ID: <e38bce640902211520j3f3c2787y28640b0ebcba5e27@mail.gmail.com> (raw)

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

             reply	other threads:[~2009-02-21 23:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-21 23:20 Brent Goodrick [this message]
2009-02-21 23:29 ` How to list files that are pending for commit from a merge, including hand modified files Linus Torvalds
2009-02-22  2:09   ` Brent Goodrick

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e38bce640902211520j3f3c2787y28640b0ebcba5e27@mail.gmail.com \
    --to=bgoodr@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).