summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 850844e)
raw | patch | inline | side by side (parent: 850844e)
author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
Wed, 17 Jan 2007 15:32:41 +0000 (16:32 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 17 Jan 2007 16:44:32 +0000 (08:44 -0800) |
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 files changed:
index 95bea66374a6054ee6823b760dbc73d5b84cd5a0..a5051aad6bfdf748976430452206e40838c75ca6 100644 (file)
Interactive mode
----------------
When the command enters the interactive mode, it shows the
-output of the 'status' subcommand, and then goes into ints
+output of the 'status' subcommand, and then goes into its
interactive command loop.
The command loop shows the list of subcommands available, and
index bdfc6669285dc895a69fc0037246810bfa979de5..b14e7940778da2295f1b61ab4096c3ba29b908f9 100644 (file)
interface briefly mentioned in the following paragraph.
Apart from supporting file annotation, git also supports searching the
-development history for when a code snippet occured in a change. This makes it
+development history for when a code snippet occurred in a change. This makes it
possible to track when a code snippet was added to a file, moved or copied
between files, and eventually deleted or replaced. It works by searching for
a text string in the diff. A small example:
--------------------
In this format, each line is output after a header; the
-header at the minumum has the first line which has:
+header at the minimum has the first line which has:
- 40-byte SHA-1 of the commit the line is attributed to;
- the line number of the line in the original file;
header elements later.
-SPECIFIYING RANGES
-------------------
+SPECIFYING RANGES
+-----------------
Unlike `git-blame` and `git-annotate` in older git, the extent
of annotation can be limited to both line ranges and revision
index e872fc89fc17caefc844bd5129f74040bada5cb9..d5f81182610cf842bd543ea85f83c991778436b9 100644 (file)
List both remote-tracking branches and local branches.
-v::
- Show sha1 and commit subjectline for each head.
+ Show sha1 and commit subject line for each head.
--abbrev=<length>::
Alter minimum display length for sha1 in output listing,
index 9c8435306845cd417ce014d24240a52e8110e42d..bd1c22b3165a4b73f4d80b3d9472851bbce244e2 100644 (file)
are concluding a conflicted merge.
-q|--quiet::
- Supress commit summary message.
+ Suppress commit summary message.
\--::
Do not interpret any more arguments as options.
index 5c402de2675024c9286e2ee72506cb1d0a56fc31..44713949a59283b68567369088e2b74f073e57d0 100644 (file)
Substitute the character "/" in branch names with <subst>
-A <author-conv-file>::
- CVS by default uses the unix username when writing its
+ CVS by default uses the Unix username when writing its
commit logs. Using this option and an author-conv-file
in this format
index 2bf6aef73522e3ba7e5212d3eb1bce02a257e069..06e7ab1ec127cb511e7d403ea3979b59893141ba 100644 (file)
Iterate over all refs that match `<pattern>` and show them
according to the given `<format>`, after sorting them according
to the given set of `<key>`. If `<max>` is given, stop after
-showing that many refs. The interporated values in `<format>`
+showing that many refs. The interpolated values in `<format>`
can optionally be quoted as string literals in the specified
host language allowing their direct evaluation in that language.
index 73d78c15e8a30ac11e919f43888ec589ac701e37..2bcc9491a3a985a62d86dc93d83b217f0220e3dc 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
are not part of the current branch should remain available in
this repository. These types of entries are generally created as
a result of using `git commit \--amend` or `git rebase` and are the
-commits prior to the amend or rebase occuring. Since these changes
+commits prior to the amend or rebase occurring. Since these changes
are not part of the current project most users will want to expire
them sooner. This option defaults to '30 days'.
index bfbece9864a3c6d8b38dd526e2483fea0fb0b58f..0140c8e3580c7be90648f5ea0186a5c925ee1584 100644 (file)
combined by 'or'.
--and | --or | --not | ( | )::
- Specify how multiple patterns are combined using boolean
+ Specify how multiple patterns are combined using Boolean
expressions. `--or` is the default operator. `--and` has
higher precedence than `--or`. `-e` has to be used for all
patterns.
index c8a4c5a4d9d2bead8686f1b582e985531a7f3591..c254005ca39e6872b8ec7b729246d18757df31d1 100644 (file)
-u <exec>, --upload-pack=<exec>::
Specify the full path of gitlink:git-upload-pack[1] on the remote
host. This allows listing references from repositories accessed via
- SSH and where the SSH deamon does not use the PATH configured by the
+ SSH and where the SSH daemon does not use the PATH configured by the
user. Also see the '--exec' option for gitlink:git-peek-remote[1].
<repository>::
index 08a055713cd7bc83e6e0385d8e9ed3b7d9951742..c65c59e8612691bf769a5c8fe62c73164bac812d 100644 (file)
This resets the metadata used by rerere if a merge resolution is to be
is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
-[--skip|--abort] will automatcally invoke this command.
+[--skip|--abort] will automatically invoke this command.
'diff'::
index 95fa9010c1539e4c93d6d402ffd4bb670fd32910..b0df92e8192bc494e5d4db1707c233790560afb8 100644 (file)
of author alphabetic order.
-s::
- Supress commit description and provide a commit count summary only.
+ Suppress commit description and provide a commit count summary only.
FILES
-----
index 9ed721118b7dd446657fe28968e1294ab9fbf421..321083d4614b9d01ab20b7187628a3d20d9649f5 100644 (file)
'commit-diff'::
Commits the diff of two tree-ish arguments from the
- command-line. This command is intended for interopability with
+ command-line. This command is intended for interoperability with
git-svnimport and does not rely on being inside an git-svn
init-ed repository. This command takes three arguments, (a) the
original tree to diff against, (b) the new tree result, (c) the