diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 18:27:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 22:27:52 (GMT) |
| commit | 33e8fc87407505c3a96792fc47189d57b97b34c3 (patch) | |
| tree | 19f879dcf9af22e72f1d0c61411d661bb77bf4d6 /Documentation/git-patch-id.txt | |
| parent | 3c3d3f629a6176b401ebec455c5dd59ed1b5f910 (diff) | |
| download | git-33e8fc87407505c3a96792fc47189d57b97b34c3.zip git-33e8fc87407505c3a96792fc47189d57b97b34c3.tar.gz git-33e8fc87407505c3a96792fc47189d57b97b34c3.tar.bz2 | |
usage: do not insist that standard input must come from a file
The synopsys text and the usage string of subcommands that read list
of things from the standard input are often shown like this:
git gostak [--distim] < <list-of-doshes>
This is problematic in a number of ways:
* The way to use these commands is more often to feed them the
output from another command, not feed them from a file.
* Manual pages outside Git, commands that operate on the data read
from the standard input, e.g "sort", "grep", "sed", etc., are not
described with such a "< redirection-from-file" in their synopsys
text. Our doing so introduces inconsistency.
* We do not insist on where the output should go, by saying
git gostak [--distim] < <list-of-doshes> > <output>
* As it is our convention to enclose placeholders inside <braket>,
the redirection operator followed by a placeholder filename
becomes very hard to read, both in the documentation and in the
help text.
Let's clean them all up, after making sure that the documentation
clearly describes the modes that take information from the standard
input and what kind of things are expected on the input.
[jc: stole example for fmt-merge-msg from Jonathan]
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-patch-id.txt')
| -rw-r--r-- | Documentation/git-patch-id.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index 31efc58..cf71fba 100644 --- a/Documentation/git-patch-id.txt +++ b/Documentation/git-patch-id.txt @@ -8,10 +8,12 @@ git-patch-id - Compute unique ID for a patch SYNOPSIS -------- [verse] -'git patch-id' [--stable | --unstable] < <patch> +'git patch-id' [--stable | --unstable] DESCRIPTION ----------- +Read a patch from the standard input and compute the patch ID for it. + A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored. As such, it's "reasonably stable", but at the same time also reasonably unique, i.e., two patches that |