From a3fd83c02508738c186c6e04d6a306d992b78ed9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 2 Mar 2007 10:34:36 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0.2-273-g8ab3 --- RelNotes-1.5.1.txt | 2 +- git-add.html | 4 +- git-add.txt | 2 +- git-bundle.html | 10 +-- git-bundle.txt | 8 +- git-diff-tree.html | 150 +++++++++++++++++++++++++++++++++- git-log.html | 150 +++++++++++++++++++++++++++++++++- git-quiltimport.html | 9 +-- git-quiltimport.txt | 8 +- git-rev-list.html | 150 +++++++++++++++++++++++++++++++++- git-send-email.html | 17 +--- git-send-email.txt | 12 +-- git-show.html | 150 +++++++++++++++++++++++++++++++++- git-svn.html | 187 ++++++++++++++++++++++++------------------- git-svn.txt | 121 ++++++++++++++++------------ git.html | 2 +- pretty-formats.txt | 44 ++++++++++ 17 files changed, 843 insertions(+), 183 deletions(-) diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt index 5ce385b44..aa371be1d 100644 --- a/RelNotes-1.5.1.txt +++ b/RelNotes-1.5.1.txt @@ -50,7 +50,7 @@ Updates since v1.5.0 LF at the end of lines. Currently, which paths to consider 'text' (i.e. be subjected to the autocrlf mechanism) is decided purely based on the contents, but the plan is to - allow users to explicitly override this heuristics based on + allow users to explicitly override this heuristic based on paths. - The behaviour of 'git-apply', when run in a subdirectory, diff --git a/git-add.html b/git-add.html index 82cee8add..4df0c8c3b 100644 --- a/git-add.html +++ b/git-add.html @@ -334,7 +334,7 @@ commit.

-\i, --interactive +-i, --interactive

@@ -536,7 +536,7 @@ diff

diff --git a/git-add.txt b/git-add.txt index b73a99d61..755d7186f 100644 --- a/git-add.txt +++ b/git-add.txt @@ -52,7 +52,7 @@ OPTIONS -f:: Allow adding otherwise ignored files. -\i, \--interactive:: +-i, \--interactive:: Add modified contents in the working tree interactively to the index. diff --git a/git-bundle.html b/git-bundle.html index c413dd129..c81cbe88e 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -282,7 +282,7 @@ git-bundle(1) Manual Page

Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected so the interactive git protocols (git, ssh, -rsync, http) cannot be used. This command provides suport for +rsync, http) cannot be used. This command provides support for git-fetch and git-pull to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using git-fetch(1) and git-pull(1) @@ -345,7 +345,7 @@ unbundle <file>

- A list of arguments, accepatble to git-rev-parse and + A list of arguments, acceptable to git-rev-parse and git-rev-list, that specify the specific objects and references to transport. For example, "master~10..master" causes the current master reference to be packaged along with all objects @@ -361,7 +361,7 @@ unbundle <file>

A list of references used to limit the references reported as available. This is principally of use to git-fetch, which - expects to recieve only those references asked for and not + expects to receive only those references asked for and not necessarily everything in the pack (in this case, git-bundle is acting like git-fetch-pack(1)).

@@ -379,7 +379,7 @@ contained in the union of the given bases. Each basis can be specified explicitly (e.g., ^master~10), or implicitly (e.g., master~10..master, master --since=10.days.ago).

It is very important that the basis used be held by the destination. -It is ok to err on the side of conservatism, causing the bundle file +It is okay to err on the side of conservatism, causing the bundle file to contain objects already in the destination as these are ignored when unpacking at the destination.

@@ -423,7 +423,7 @@ network.

diff --git a/git-bundle.txt b/git-bundle.txt index 4ea9e85d5..92e7a6872 100644 --- a/git-bundle.txt +++ b/git-bundle.txt @@ -19,7 +19,7 @@ DESCRIPTION Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected so the interactive git protocols (git, ssh, -rsync, http) cannot be used. This command provides suport for +rsync, http) cannot be used. This command provides support for git-fetch and git-pull to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using gitlink:git-fetch[1] and gitlink:git-pull[1] @@ -58,7 +58,7 @@ unbundle :: gitlink:git-fetch[1]. [git-rev-list-args...]:: - A list of arguments, accepatble to git-rev-parse and + A list of arguments, acceptable to git-rev-parse and git-rev-list, that specify the specific objects and references to transport. For example, "master~10..master" causes the current master reference to be packaged along with all objects @@ -70,7 +70,7 @@ unbundle :: [refname...]:: A list of references used to limit the references reported as available. This is principally of use to git-fetch, which - expects to recieve only those references asked for and not + expects to receive only those references asked for and not necessarily everything in the pack (in this case, git-bundle is acting like gitlink:git-fetch-pack[1]). @@ -87,7 +87,7 @@ specified explicitly (e.g., ^master~10), or implicitly (e.g., master~10..master, master --since=10.days.ago). It is very important that the basis used be held by the destination. -It is ok to err on the side of conservatism, causing the bundle file +It is okay to err on the side of conservatism, causing the bundle file to contain objects already in the destination as these are ignored when unpacking at the destination. diff --git a/git-diff-tree.html b/git-diff-tree.html index e37c93479..575c0b424 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -861,8 +861,154 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account.

+
  • +

    +format: +

    +

    The format: format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with %n +instead of \n.

    +
    • + +

    E.g, format:"The author of %h was %an, %ar%nThe title was >>%s<<" +would show something like this:

    +

    The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<

    +

    The placeholders are:

    +

    Limiting Output

    @@ -1297,7 +1445,7 @@ two unresolved merge parents with the working tree file
    diff --git a/git-log.html b/git-log.html index 5d60cedc4..362f3ac84 100644 --- a/git-log.html +++ b/git-log.html @@ -414,8 +414,154 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account.

    +
  • +

    +format: +

    +

    The format: format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with %n +instead of \n.

    +
    • + +

    E.g, format:"The author of %h was %an, %ar%nThe title was >>%s<<" +would show something like this:

    +

    The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<

    +

    The placeholders are:

    +

    Examples

    @@ -598,7 +746,7 @@ reversible operation.

    diff --git a/git-quiltimport.html b/git-quiltimport.html index c41b50515..22b88e210 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -319,12 +319,9 @@ preserved as the 1 line subject in the git description.

    The directory to find the quilt patches and the quilt series file.

    -
    -
    -
    The default for the patch directory is patches
+
    The default for the patch directory is patches
 or the value of the $QUILT_PATCHES environment
-variable.
    -
    +variable.

    @@ -342,7 +339,7 @@ variable. diff --git a/git-quiltimport.txt b/git-quiltimport.txt index 6e9a8c369..296937a41 100644 --- a/git-quiltimport.txt +++ b/git-quiltimport.txt @@ -42,10 +42,10 @@ OPTIONS --patches :: The directory to find the quilt patches and the quilt series file. - - The default for the patch directory is patches - or the value of the $QUILT_PATCHES environment - variable. ++ +The default for the patch directory is patches +or the value of the $QUILT_PATCHES environment +variable. Author ------ diff --git a/git-rev-list.html b/git-rev-list.html index b484d4a53..8eeaf54a8 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -466,8 +466,154 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account.

    +
  • +

    +format: +

    +

    The format: format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with %n +instead of \n.

    +
    • + +

    E.g, format:"The author of %h was %an, %ar%nThe title was >>%s<<" +would show something like this:

    +

    The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<

    +

    The placeholders are:

    +

    Diff Formatting

    Below are listed options that control the formatting of diff output. Some of them are specific to git-rev-list(1), however other diff @@ -814,7 +962,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-send-email.html b/git-send-email.html index 8ca40b4a3..6a6e9aa29 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -292,10 +292,7 @@ enabled interface to provide the necessary information.

    Specify a "Bcc:" value for each email.

    -
    -
    -
    The --bcc option must be repeated for each user you want on the bcc list.
    -
    +

    The --bcc option must be repeated for each user you want on the bcc list.

    --cc @@ -304,10 +301,7 @@ enabled interface to provide the necessary information.

    Specify a starting "Cc:" value for each email.

    -
    -
    -
    The --cc option must be repeated for each user you want on the cc list.
    -
    +

    The --cc option must be repeated for each user you want on the cc list.

    --chain-reply-to, --no-chain-reply-to @@ -412,10 +406,7 @@ enabled interface to provide the necessary information.

    Generally, this will be the upstream maintainer of the project involved.

    -
    -
    -
    The --to option must be repeated for each user you want on the to list.
    -
    +

    The --to option must be repeated for each user you want on the to list.

    @@ -435,7 +426,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

    diff --git a/git-send-email.txt b/git-send-email.txt index 4c8d907bd..35b0104e4 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -26,13 +26,13 @@ The options available are: --bcc:: Specify a "Bcc:" value for each email. - - The --bcc option must be repeated for each user you want on the bcc list. ++ +The --bcc option must be repeated for each user you want on the bcc list. --cc:: Specify a starting "Cc:" value for each email. - - The --cc option must be repeated for each user you want on the cc list. ++ +The --cc option must be repeated for each user you want on the cc list. --chain-reply-to, --no-chain-reply-to:: If this is set, each email will be sent as a reply to the previous @@ -87,8 +87,8 @@ The options available are: Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. - - The --to option must be repeated for each user you want on the to list. ++ +The --to option must be repeated for each user you want on the to list. Author diff --git a/git-show.html b/git-show.html index b6d7badef..af7835103 100644 --- a/git-show.html +++ b/git-show.html @@ -429,8 +429,154 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account.

    +
  • +

    +format: +

    +

    The format: format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with %n +instead of \n.

    +
    • + +

    E.g, format:"The author of %h was %an, %ar%nThe title was >>%s<<" +would show something like this:

    +

    The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<

    +

    The placeholders are:

    +
      +
    • +

      +%H: commit hash +

      +
      • +
    • +

      +%h: abbreviated commit hash +

      +
      • +
    • +

      +%T: tree hash +

      +
      • +
    • +

      +%t: abbreviated tree hash +

      +
      • +
    • +

      +%P: parent hashes +

      +
      • +
    • +

      +%p: abbreviated parent hashes +

      +
      • +
    • +

      +%an: author name +

      +
      • +
    • +

      +%ae: author email +

      +
      • +
    • +

      +%ad: author date +

      +
      • +
    • +

      +%aD: author date, RFC2822 style +

      +
      • +
    • +

      +%ar: author date, relative +

      +
      • +
    • +

      +%at: author date, UNIX timestamp +

      +
      • +
    • +

      +%cn: committer name +

      +
      • +
    • +

      +%ce: committer email +

      +
      • +
    • +

      +%cd: committer date +

      +
      • +
    • +

      +%cD: committer date, RFC2822 style +

      +
      • +
    • +

      +%cr: committer date, relative +

      +
      • +
    • +

      +%ct: committer date, UNIX timestamp +

      +
      • +
    • +

      +%e: encoding +

      +
      • +
    • +

      +%s: subject +

      +
      • +
    • +

      +%b: body +

      +
      • +
    • +

      +%Cred: switch color to red +

      +
      • +
    • +

      +%Cgreen: switch color to green +

      +
      • +
    • +

      +%Cblue: switch color to blue +

      +
      • +
    • +

      +%Creset: reset color +

      +
      • +
    • +

      +%n: newline +

      +
      --encoding[=<encoding>]
      @@ -444,6 +590,8 @@ simplification into account.

      +
      • +

    EXAMPLES

    @@ -578,7 +726,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-svn.html b/git-svn.html index 2fd6550c4..ba80e48ad 100644 --- a/git-svn.html +++ b/git-svn.html @@ -373,14 +373,20 @@ branches, tags directories).

    transports (eg svn+ssh://), you must include the username in the URL, eg svn+ssh://foo@svn.bar.com/project

    -

    --prefix=<prefix> + +

    +--prefix=<prefix> +
    +
    +

    This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified. The prefix does not automatically include a trailing slash, so be sure you include one in the argument if that is what you want. This is useful if you wish to track multiple projects that share a common - repository.

    + repository. +

    fetch @@ -417,23 +423,14 @@ branches, tags directories).

    This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it.

    -
    -
    -
    This works similarly to 'svn update' or 'git-pull' except that
-it preserves linear history with 'git-rebase' instead of
-'git-merge' for ease of dcommit-ing with git-svn.
    -
    -
    -
    -
    This accepts all options that 'git-svn fetch' and 'git-rebase'
-accepts.  However '--fetch-all' only fetches from the current
-[svn-remote], and not all [svn-remote] definitions.
    -
    -
    -
    -
    Like 'git-rebase'; this requires that the working tree be clean
-and have no uncommitted changes.
    -
    +

    This works similarly to svn update or git-pull except that +it preserves linear history with git-rebase instead of +git-merge for ease of dcommit-ing with git-svn.

    +

    This accepts all options that git-svn fetch and git-rebase +accepts. However --fetch-all only fetches from the current +[svn-remote], and not all [svn-remote] definitions.

    +

    Like git-rebase; this requires that the working tree be clean +and have no uncommitted changes.

    dcommit @@ -453,6 +450,8 @@ and have no uncommitted changes. cleaner, more linear history.

    + +
    log
    @@ -461,36 +460,68 @@ and have no uncommitted changes. This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers.

    -
    -
    -
    The following features from `svn log' are supported:
    -
    -
    -
    -
    --revision=<n>[:<n>] - is supported, non-numeric args are not:
-                       HEAD, NEXT, BASE, PREV, etc ...
--v/--verbose         - it's not completely compatible with
-                       the --verbose output in svn log, but
-                       reasonably close.
---limit=<n>          - is NOT the same as --max-count,
-                       doesn't count merged/excluded commits
---incremental        - supported
    -
    -
    -
    -
    New features:
    -
    -
    -
    -
    --show-commit        - shows the git commit sha1, as well
---oneline            - our version of --pretty=oneline
    -
    -
    -
    -
    Any other arguments are passed directly to `git log'
    -
    +

    The following features from `svn log' are supported:

    +
    +
    +--revision=<n>[:<n>] +
    +
    +

    + is supported, non-numeric args are not: + HEAD, NEXT, BASE, PREV, etc … +

    +
    +
    +-v/--verbose +
    +
    +

    + it's not completely compatible with the --verbose + output in svn log, but reasonably close. +

    +
    +
    +--limit=<n> +
    +
    +

    + is NOT the same as --max-count, doesn't count + merged/excluded commits +

    +--incremental +
    +
    +

    + supported +

    +
    +
    +

    New features:

    +
    +
    +--show-commit +
    +
    +

    + shows the git commit sha1, as well +

    +
    +
    +--oneline +
    +
    +

    + our version of --pretty=oneline +

    +
    +
    +

    Any other arguments are passed directly to `git log'

    + +
    +
    +
    set-tree
    @@ -659,24 +690,21 @@ after the authors-file is modified should continue operation.

    --repack[=<n>]
    +
    +--repack-flags=<flags> +

    ---repack-flags=<flags> - These should help keep disk usage sane for large fetches - with many revisions. +These should help keep disk usage sane for large fetches +with many revisions.

    -
    -
    -
    --repack takes an optional argument for the number of revisions
+
    --repack takes an optional argument for the number of revisions
 to fetch before repacking.  This defaults to repacking every
-1000 commits fetched if no argument is specified.
    -
    -
    -
    -
    --repack-flags are passed directly to gitlink:git-repack[1].
    -
    -

    config key: svn.repack -config key: svn.repackflags

    +1000 commits fetched if no argument is specified.

    +

    --repack-flags are passed directly to git-repack(1).

    +
    +
    config key: svn.repack +config key: svn.repackflags
    -m @@ -768,20 +796,14 @@ svn-remote.<name>.noMetadata

    - This gets rid of the git-svn-id: lines at the end of every commit. +This gets rid of the git-svn-id: lines at the end of every commit.

    -
    -
    -
    If you lose your .git/svn/git-svn/.rev_db file, git-svn will not
+
    If you lose your .git/svn/git-svn/.rev_db file, git-svn will not
 be able to rebuild it and you won't be able to fetch again,
-either.  This is fine for one-shot imports.
    -
    -
    -
    -
    The 'git-svn log' command will not work on repositories using
-this, either.  Using this conflicts with the 'useSvmProps'
-option for (hopefully) obvious reasons.
    -
    +either. This is fine for one-shot imports.

    +

    The git-svn log command will not work on repositories using +this, either. Using this conflicts with the useSvmProps +option for (hopefully) obvious reasons.

    svn.useSvmProps @@ -791,19 +813,16 @@ svn-remote.<name>.useSvmProps

    - This allows git-svn to re-map repository URLs and UUIDs from - mirrors created using SVN::Mirror (or svk) for metadata. +This allows git-svn to re-map repository URLs and UUIDs from +mirrors created using SVN::Mirror (or svk) for metadata.

    -
    -
    -
    If an SVN revision has a property, "svm:headrev", it is likely
+
    If an SVN revision has a property, "svm:headrev", it is likely
 that the revision was created by SVN::Mirror (also used by SVK).
 The property contains a repository UUID and a revision.  We want
 to make it look like we are mirroring the original URL, so
 introduce a helper function that returns the original identity
 URL and UUID, and use it when generating metadata in commit
-messages.
    -
    +messages.

    svn.useSvnsyncProps @@ -837,7 +856,9 @@ and these settings should never be changed once they are set.

    section because they affect the git-svn-id: metadata line.

    -

    Basic Examples

    + +

    BASIC EXAMPLES

    +

    Tracking and contributing to a the trunk of a Subversion-managed project:

    @@ -870,7 +891,7 @@ section because they affect the git-svn-id: metadata line.

    # with the appropriate name): git reset --hard remotes/trunk # You may only dcommit to one branch/tag/trunk at a time. The usage -# of dcommit/rebase/show-ignore should be teh same as above. +# of dcommit/rebase/show-ignore should be the same as above.

    REBASE VS. PULL/MERGE

    @@ -945,7 +966,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index cf094ca35..9b5a3d619 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -63,7 +63,7 @@ COMMANDS transports (eg svn+ssh://), you must include the username in the URL, eg svn+ssh://foo@svn.bar.com/project ---prefix= +--prefix=:: This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified. The prefix does not automatically include a @@ -94,16 +94,16 @@ COMMANDS This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it. - This works similarly to 'svn update' or 'git-pull' except that - it preserves linear history with 'git-rebase' instead of - 'git-merge' for ease of dcommit-ing with git-svn. +This works similarly to 'svn update' or 'git-pull' except that +it preserves linear history with 'git-rebase' instead of +'git-merge' for ease of dcommit-ing with git-svn. - This accepts all options that 'git-svn fetch' and 'git-rebase' - accepts. However '--fetch-all' only fetches from the current - [svn-remote], and not all [svn-remote] definitions. +This accepts all options that 'git-svn fetch' and 'git-rebase' +accepts. However '--fetch-all' only fetches from the current +[svn-remote], and not all [svn-remote] definitions. - Like 'git-rebase'; this requires that the working tree be clean - and have no uncommitted changes. +Like 'git-rebase'; this requires that the working tree be clean +and have no uncommitted changes. 'dcommit':: Commit each diff from a specified head directly to the SVN @@ -117,29 +117,40 @@ COMMANDS alternative to HEAD. This is advantageous over 'set-tree' (below) because it produces cleaner, more linear history. +-- 'log':: This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers. ++ +The following features from `svn log' are supported: ++ +-- +--revision=[:];; + is supported, non-numeric args are not: + HEAD, NEXT, BASE, PREV, etc ... +-v/--verbose;; + it's not completely compatible with the --verbose + output in svn log, but reasonably close. +--limit=;; + is NOT the same as --max-count, doesn't count + merged/excluded commits +--incremental;; + supported +-- ++ +New features: ++ +-- +--show-commit;; + shows the git commit sha1, as well +--oneline;; + our version of --pretty=oneline +-- ++ +Any other arguments are passed directly to `git log' - The following features from `svn log' are supported: - - --revision=[:] - is supported, non-numeric args are not: - HEAD, NEXT, BASE, PREV, etc ... - -v/--verbose - it's not completely compatible with - the --verbose output in svn log, but - reasonably close. - --limit= - is NOT the same as --max-count, - doesn't count merged/excluded commits - --incremental - supported - - New features: - - --show-commit - shows the git commit sha1, as well - --oneline - our version of --pretty=oneline - - Any other arguments are passed directly to `git log' - +-- 'set-tree':: You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on @@ -256,16 +267,18 @@ config key: svn.authorsfile Make git-svn less verbose. --repack[=]:: ---repack-flags= - These should help keep disk usage sane for large fetches - with many revisions. +--repack-flags=:: + +These should help keep disk usage sane for large fetches +with many revisions. - --repack takes an optional argument for the number of revisions - to fetch before repacking. This defaults to repacking every - 1000 commits fetched if no argument is specified. +--repack takes an optional argument for the number of revisions +to fetch before repacking. This defaults to repacking every +1000 commits fetched if no argument is specified. - --repack-flags are passed directly to gitlink:git-repack[1]. +--repack-flags are passed directly to gitlink:git-repack[1]. +[verse] config key: svn.repack config key: svn.repackflags @@ -323,28 +336,30 @@ CONFIG FILE-ONLY OPTIONS svn.noMetadata:: svn-remote..noMetadata:: - This gets rid of the git-svn-id: lines at the end of every commit. - If you lose your .git/svn/git-svn/.rev_db file, git-svn will not - be able to rebuild it and you won't be able to fetch again, - either. This is fine for one-shot imports. +This gets rid of the git-svn-id: lines at the end of every commit. + +If you lose your .git/svn/git-svn/.rev_db file, git-svn will not +be able to rebuild it and you won't be able to fetch again, +either. This is fine for one-shot imports. - The 'git-svn log' command will not work on repositories using - this, either. Using this conflicts with the 'useSvmProps' - option for (hopefully) obvious reasons. +The 'git-svn log' command will not work on repositories using +this, either. Using this conflicts with the 'useSvmProps' +option for (hopefully) obvious reasons. svn.useSvmProps:: svn-remote..useSvmProps:: - This allows git-svn to re-map repository URLs and UUIDs from - mirrors created using SVN::Mirror (or svk) for metadata. - If an SVN revision has a property, "svm:headrev", it is likely - that the revision was created by SVN::Mirror (also used by SVK). - The property contains a repository UUID and a revision. We want - to make it look like we are mirroring the original URL, so - introduce a helper function that returns the original identity - URL and UUID, and use it when generating metadata in commit - messages. +This allows git-svn to re-map repository URLs and UUIDs from +mirrors created using SVN::Mirror (or svk) for metadata. + +If an SVN revision has a property, "svm:headrev", it is likely +that the revision was created by SVN::Mirror (also used by SVK). +The property contains a repository UUID and a revision. We want +to make it look like we are mirroring the original URL, so +introduce a helper function that returns the original identity +URL and UUID, and use it when generating metadata in commit +messages. svn.useSvnsyncProps:: svn-remote..useSvnsyncprops:: @@ -369,8 +384,8 @@ section because they affect the 'git-svn-id:' metadata line. -- -Basic Examples -~~~~~~~~~~~~~~ +BASIC EXAMPLES +-------------- Tracking and contributing to a the trunk of a Subversion-managed project: @@ -405,7 +420,7 @@ Tracking and contributing to an entire Subversion-managed project # with the appropriate name): git reset --hard remotes/trunk # You may only dcommit to one branch/tag/trunk at a time. The usage -# of dcommit/rebase/show-ignore should be teh same as above. +# of dcommit/rebase/show-ignore should be the same as above. ------------------------------------------------------------------------ REBASE VS. PULL/MERGE diff --git a/git.html b/git.html index e1c12ff87..2d311cea3 100644 --- a/git.html +++ b/git.html @@ -2298,7 +2298,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/pretty-formats.txt b/pretty-formats.txt index fb0b0b958..2fe6c3196 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -77,9 +77,53 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account. + * 'format:' ++ +The 'format:' format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with '%n' +instead of '\n'. + +E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<"' +would show something like this: + +The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p for traditional diff input.<< + +The placeholders are: + +- '%H': commit hash +- '%h': abbreviated commit hash +- '%T': tree hash +- '%t': abbreviated tree hash +- '%P': parent hashes +- '%p': abbreviated parent hashes +- '%an': author name +- '%ae': author email +- '%ad': author date +- '%aD': author date, RFC2822 style +- '%ar': author date, relative +- '%at': author date, UNIX timestamp +- '%cn': committer name +- '%ce': committer email +- '%cd': committer date +- '%cD': committer date, RFC2822 style +- '%cr': committer date, relative +- '%ct': committer date, UNIX timestamp +- '%e': encoding +- '%s': subject +- '%b': body +- '%Cred': switch color to red +- '%Cgreen': switch color to green +- '%Cblue': switch color to blue +- '%Creset': reset color +- '%n': newline + + --encoding[=]:: The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. + -- 2.26.2