Skip to content
Snippets Groups Projects
Commit 0caea62a authored by Junio C Hamano's avatar Junio C Hamano
Browse files

Merge branch 'fe/doc-updates' into maint

Doc updates.

* fe/doc-updates:
  git-describe.1: clarify that "human readable" is also git-readable
  git-column.1: clarify initial description, provide examples
  git-archimport.1: specify what kind of Arch we're talking about
parents 2a98f6c2 55f6bce2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -3,7 +3,7 @@ git-archimport(1)
 
NAME
----
git-archimport - Import an Arch repository into Git
git-archimport - Import a GNU Arch repository into Git
 
 
SYNOPSIS
Loading
Loading
@@ -14,7 +14,8 @@ SYNOPSIS
 
DESCRIPTION
-----------
Imports a project from one or more Arch repositories. It will follow branches
Imports a project from one or more GNU Arch repositories.
It will follow branches
and repositories within the namespaces defined by the <archive/branch>
parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
Loading
Loading
Loading
Loading
@@ -13,7 +13,10 @@ SYNOPSIS
 
DESCRIPTION
-----------
This command formats its input into multiple columns.
This command formats the lines of its standard input into a table with
multiple columns. Each input line occupies one cell of the table. It
is used internally by other git commands to format output into
columns.
 
OPTIONS
-------
Loading
Loading
@@ -23,7 +26,7 @@ OPTIONS
 
--mode=<mode>::
Specify layout mode. See configuration variable column.ui for option
syntax.
syntax in linkgit:git-config[1].
 
--raw-mode=<n>::
Same as --mode but take mode encoded as a number. This is mainly used
Loading
Loading
@@ -43,6 +46,34 @@ OPTIONS
--padding=<N>::
The number of spaces between columns. One space by default.
 
EXAMPLES
------
Format data by columns:
------------
$ seq 1 24 | git column --mode=column --padding=5
1 4 7 10 13 16 19 22
2 5 8 11 14 17 20 23
3 6 9 12 15 18 21 24
------------
Format data by rows:
------------
$ seq 1 21 | git column --mode=row --padding=5
1 2 3 4 5 6 7
8 9 10 11 12 13 14
15 16 17 18 19 20 21
------------
List some tags in a table with unequal column widths:
------------
$ git tag --list 'v2.4.*' --column=row,dense
v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3
v2.4.1 v2.4.10 v2.4.11 v2.4.12 v2.4.2
v2.4.3 v2.4.4 v2.4.5 v2.4.6 v2.4.7
v2.4.8 v2.4.9
------------
GIT
---
Part of the linkgit:git[1] suite
Loading
Loading
@@ -18,7 +18,9 @@ The command finds the most recent tag that is reachable from a
commit. If the tag points to the commit, then only the tag is
shown. Otherwise, it suffixes the tag name with the number of
additional commits on top of the tagged object and the
abbreviated object name of the most recent commit.
abbreviated object name of the most recent commit. The result
is a "human-readable" object name which can also be used to
identify the commit to other git commands.
 
By default (without --all or --tags) `git describe` only shows
annotated tags. For more information about creating annotated tags
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment