From f5a9362a72a5a586926fce49c90c93a75cbad2b5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 Jul 2008 03:23:57 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.6.3-384-gfcab4 --- git-am.html | 6 +++--- git-am.txt | 4 ++-- git-diff-tree.html | 12 +++++++++++- git-log.html | 12 +++++++++++- git-rebase.html | 4 ++-- git-rebase.txt | 2 +- git-rev-list.html | 12 +++++++++++- git-show.html | 12 +++++++++++- git-whatchanged.html | 12 +++++++++++- pretty-formats.txt | 2 ++ user-manual.html | 4 ++-- user-manual.txt | 2 +- 12 files changed, 68 insertions(+), 16 deletions(-) diff --git a/git-am.html b/git-am.html index 4c7a7b7ee..cbff300d4 100644 --- a/git-am.html +++ b/git-am.html @@ -549,9 +549,9 @@ hand resolve the conflict in the working directory, and update

-

The command refuses to process new mailboxes while .dotest +

The command refuses to process new mailboxes while .git/rebase directory exists, so if you decide to start over from scratch, -run rm -f -r .dotest before running the command with mailbox +run rm -f -r .git/rebase before running the command with mailbox names.

Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple @@ -577,7 +577,7 @@ errors in the "From:" lines).

diff --git a/git-am.txt b/git-am.txt index 1395c7d98..2d7f16259 100644 --- a/git-am.txt +++ b/git-am.txt @@ -140,9 +140,9 @@ aborts in the middle,. You can recover from this in one of two ways: the index file to bring it in a state that the patch should have produced. Then run the command with '--resolved' option. -The command refuses to process new mailboxes while `.dotest` +The command refuses to process new mailboxes while `.git/rebase` directory exists, so if you decide to start over from scratch, -run `rm -f -r .dotest` before running the command with mailbox +run `rm -f -r .git/rebase` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the diff --git a/git-diff-tree.html b/git-diff-tree.html index 931e3a2ea..52f90644f 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1167,6 +1167,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%aN: author name (respecting .mailmap) +

    +
    • +
  • +

    %ae: author email

    • @@ -1202,6 +1207,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%cN: committer name (respecting .mailmap) +

    +
    • +
  • +

    %ce: committer email

    • @@ -1845,7 +1855,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-log.html b/git-log.html index 068a9df47..f48d4592d 100644 --- a/git-log.html +++ b/git-log.html @@ -1552,6 +1552,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%aN: author name (respecting .mailmap) +

    +
    • +
  • +

    %ae: author email

    • @@ -1587,6 +1592,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%cN: committer name (respecting .mailmap) +

    +
    • +
  • +

    %ce: committer email

    • @@ -2020,7 +2030,7 @@ reversible operation.

    diff --git a/git-rebase.html b/git-rebase.html index 04fd39f3b..13743b180 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -348,7 +348,7 @@ with a different commit message or timestamp will be skipped).

    completely automatic. You will have to resolve any such merge failure and run git rebase --continue. Another option is to bypass the commit that caused the merge failure with git rebase --skip. To restore the -original <branch> and remove the .dotest working files, use the command +original <branch> and remove the .git/rebase working files, use the command git rebase --abort instead.

    Assume the following history exists and the current branch is "topic":

    @@ -907,7 +907,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

    diff --git a/git-rebase.txt b/git-rebase.txt index e30f6a698..51afc87e1 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -39,7 +39,7 @@ It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To restore the -original and remove the .dotest working files, use the command +original and remove the .git/rebase working files, use the command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": diff --git a/git-rev-list.html b/git-rev-list.html index 7706492d2..b7f5bd6e2 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1179,6 +1179,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%aN: author name (respecting .mailmap) +

    +
    • +
  • +

    %ae: author email

    • @@ -1214,6 +1219,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%cN: committer name (respecting .mailmap) +

    +
    • +
  • +

    %ce: committer email

    • @@ -1335,7 +1345,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-show.html b/git-show.html index ac2d52e15..289e08937 100644 --- a/git-show.html +++ b/git-show.html @@ -567,6 +567,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%aN: author name (respecting .mailmap) +

    +
    • +
  • +

    %ae: author email

    • @@ -602,6 +607,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%cN: committer name (respecting .mailmap) +

    +
    • +
  • +

    %ce: committer email

    • @@ -840,7 +850,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-whatchanged.html b/git-whatchanged.html index 622487484..35b1eb658 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -599,6 +599,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%aN: author name (respecting .mailmap) +

    +
    • +
  • +

    %ae: author email

    • @@ -634,6 +639,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%cN: committer name (respecting .mailmap) +

    +
    • +
  • +

    %ce: committer email

    • @@ -779,7 +789,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/pretty-formats.txt b/pretty-formats.txt index 69e6d2fa4..c11d49577 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -101,6 +101,7 @@ The placeholders are: - '%P': parent hashes - '%p': abbreviated parent hashes - '%an': author name +- '%aN': author name (respecting .mailmap) - '%ae': author email - '%ad': author date - '%aD': author date, RFC2822 style @@ -108,6 +109,7 @@ The placeholders are: - '%at': author date, UNIX timestamp - '%ai': author date, ISO 8601 format - '%cn': committer name +- '%cN': committer name (respecting .mailmap) - '%ce': committer email - '%cd': committer date - '%cD': committer date, RFC2822 style diff --git a/user-manual.html b/user-manual.html index bafdc13cf..3be7ee71b 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,4 +1,4 @@ -Git User's Manual (for version 1.5.3 or newer)

    Git User's Manual (for version 1.5.3 or newer)

    Table of Contents

    Preface
    1. Repositories and Branches
    How to get a git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git-fetch
    Fetching branches from other repositories
    2. Exploring git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with git
    Telling git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git-pull
    Submitting patches to a project
    Importing patches to a project
    Public git repositories
    Setting up a public repository
    Exporting a git repository via the git protocol
    Exporting a git repository via http
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git-rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git-fetch to do non-fast-forward updates
    Configuring remote branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level git operations
    Object access and manipulation
    The Workflow
    working directory -> index
    index -> object database
    object database -> index
    index -> working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking git
    Object storage format
    A birds-eye view of Git's source code
    11. GIT Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Preface

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX +Git User's Manual (for version 1.5.3 or newer)

    Git User's Manual (for version 1.5.3 or newer)

    Table of Contents

    Preface
    1. Repositories and Branches
    How to get a git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git-fetch
    Fetching branches from other repositories
    2. Exploring git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with git
    Telling git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git-pull
    Submitting patches to a project
    Importing patches to a project
    Public git repositories
    Setting up a public repository
    Exporting a git repository via the git protocol
    Exporting a git repository via http
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git-rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git-fetch to do non-fast-forward updates
    Configuring remote branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level git operations
    Object access and manipulation
    The Workflow
    working directory -> index
    index -> object database
    object database -> index
    index -> working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking git
    Object storage format
    A birds-eye view of Git's source code
    11. GIT Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Preface

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.

    Chapter 1, Repositories and Branches and Chapter 2, Exploring git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -1001,7 +1001,7 @@ the result would create a new merge commit, like this:

    git-rebase(1):
    $ git checkout mywork
    
 $ git rebase origin
    This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".dotest"), update mywork to
+them as patches (in a directory named ".git/rebase"), update mywork to
 point at the latest version of origin, then apply each of the saved
 patches to the new mywork.  The result will look like:
     o--o--O--o--o--o <-- origin
                  \
diff --git a/user-manual.txt b/user-manual.txt
index 92d400753..8761ee7e7 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2431,7 +2431,7 @@ $ git rebase origin
 -------------------------------------------------
 
 This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".dotest"), update mywork to
+them as patches (in a directory named ".git/rebase"), update mywork to
 point at the latest version of origin, then apply each of the saved
 patches to the new mywork.  The result will look like:
 
-- 
2.26.2