mirror of
https://github.com/git/git.git
synced 2024-11-19 23:44:50 +01:00
Merge commit 'v1.7.5' into svn-fe
* commit 'v1.7.5': (436 commits) Git 1.7.5 Git 1.7.5-rc3 Git 1.7.4.5 git-svn.txt: Document --mergeinfo Revert "run-command: prettify -D_FORTIFY_SOURCE workaround" ...
This commit is contained in:
Jonathan Nieder
commit
59445b0b02
435 changed files with 11463 additions and 5112 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -43,7 +43,6 @@
|
|||
/git-fast-export
|
||||
/git-fast-import
|
||||
/git-fetch
|
||||
/git-fetch--tool
|
||||
/git-fetch-pack
|
||||
/git-filter-branch
|
||||
/git-fmt-merge-msg
|
||||
|
|
@ -107,7 +106,6 @@
|
|||
/git-reflog
|
||||
/git-relink
|
||||
/git-remote
|
||||
/git-remote-curl
|
||||
/git-remote-http
|
||||
/git-remote-https
|
||||
/git-remote-ftp
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ Writing Documentation:
|
|||
when writing or modifying command usage strings and synopsis sections
|
||||
in the manual pages:
|
||||
|
||||
Placeholders are enclosed in angle brackets:
|
||||
Placeholders are spelled in lowercase and enclosed in angle brackets:
|
||||
<file>
|
||||
--sort=<key>
|
||||
--abbrev[=<n>]
|
||||
|
|
|
|||
58
Documentation/RelNotes/1.7.4.2.txt
Normal file
58
Documentation/RelNotes/1.7.4.2.txt
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
Git v1.7.4.2 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.4.1
|
||||
--------------------
|
||||
|
||||
* Many documentation updates to match "git cmd -h" output and the
|
||||
git-cmd manual page.
|
||||
|
||||
* We used to keep one file descriptor open for each and every packfile
|
||||
that we have a mmap window on it (read: "in use"), even when for very
|
||||
tiny packfiles. We now close the file descriptor early when the entire
|
||||
packfile fits inside one mmap window.
|
||||
|
||||
* "git bisect visualize" tried to run "gitk" in windowing
|
||||
environments even when "gitk" is not installed, resulting in a
|
||||
strange error message.
|
||||
|
||||
* "git clone /no/such/path" did not fail correctly.
|
||||
|
||||
* "git commit" did not correctly error out when the user asked to use a
|
||||
non existent file as the commit message template.
|
||||
|
||||
* "git diff --stat -B" ran on binary files counted the changes in lines,
|
||||
which was nonsensical.
|
||||
|
||||
* "git diff -M" opportunistically detected copies, which was not
|
||||
necessarily a good thing, especially when it is internally run by
|
||||
recursive merge.
|
||||
|
||||
* "git difftool" didn't tell (g)vimdiff that the files it is reading are
|
||||
to be opened read-only.
|
||||
|
||||
* "git merge" didn't pay attention to prepare-commit-msg hook, even
|
||||
though if a merge is conflicted and manually resolved, the subsequent
|
||||
"git commit" would have triggered the hook, which was inconsistent.
|
||||
|
||||
* "git patch-id" (and commands like "format-patch --ignore-in-upstream"
|
||||
that use it as their internal logic) handled changes to files that end
|
||||
with incomplete lines incorrectly.
|
||||
|
||||
* The official value to tell "git push" to push the current branch back
|
||||
to update the upstream branch it forked from is now called "upstream".
|
||||
The old name "tracking" is and will be supported.
|
||||
|
||||
* "git submodule update" used to honor the --merge/--rebase option (or
|
||||
corresponding configuration variables) even for a newly cloned
|
||||
subproject, which made no sense (so/submodule-no-update-first-time).
|
||||
|
||||
* gitweb's "highlight" interface mishandled tabs.
|
||||
|
||||
* gitweb didn't understand timezones with GMT offset that is not
|
||||
multiple of a whole hour.
|
||||
|
||||
* gitweb had a few forward-incompatible syntactic constructs and
|
||||
also used incorrect variable when showing the file mode in a diff.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
32
Documentation/RelNotes/1.7.4.3.txt
Normal file
32
Documentation/RelNotes/1.7.4.3.txt
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
Git v1.7.4.3 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.4.2
|
||||
--------------------
|
||||
|
||||
* "git apply" used to confuse lines updated by previous hunks as lines
|
||||
that existed before when applying a hunk, contributing misapplication
|
||||
of patches with offsets.
|
||||
|
||||
* "git branch --track" (and "git checkout --track --branch") used to
|
||||
allow setting up a random non-branch that does not make sense to follow
|
||||
as the "upstream". The command correctly diagnoses it as an error.
|
||||
|
||||
* "git checkout $other_branch" silently removed untracked symbolic links
|
||||
in the working tree that are in the way in order to check out paths
|
||||
under it from the named branch.
|
||||
|
||||
* "git cvsimport" did not bail out immediately when the cvs server cannot
|
||||
be reached, spewing unnecessary error messages that complain about the
|
||||
server response that it never got.
|
||||
|
||||
* "git diff --quiet" did not work very well with the "--diff-filter"
|
||||
option.
|
||||
|
||||
* "git grep -n" lacked a long-hand synonym --line-number.
|
||||
|
||||
* "git stash apply" reported the result of its operation by running
|
||||
"git status" from the top-level of the working tree; it should (and
|
||||
now does) run it from the user's working directory.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
35
Documentation/RelNotes/1.7.4.4.txt
Normal file
35
Documentation/RelNotes/1.7.4.4.txt
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
Git v1.7.4.4 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.4.3
|
||||
--------------------
|
||||
|
||||
* Compilation of sha1_file.c on BSD platforms were broken due to our
|
||||
recent use of getrlimit() without including <sys/resource.h>.
|
||||
|
||||
* "git config" did not diagnose incorrect configuration variable names.
|
||||
|
||||
* "git format-patch" did not wrap a long subject line that resulted from
|
||||
rfc2047 encoding.
|
||||
|
||||
* "git instaweb" should work better again with plackup.
|
||||
|
||||
* "git log --max-count=4 -Sfoobar" now shows 4 commits that changes the
|
||||
number of occurrences of string "foobar"; it used to scan only for 4
|
||||
commits and then emitted only matching ones.
|
||||
|
||||
* "git log --first-parent --boundary $c^..$c" segfaulted on a merge.
|
||||
|
||||
* "git pull" into an empty branch should have behaved as if
|
||||
fast-forwarding from emptiness to the version being pulled, with
|
||||
the usual protection against overwriting untracked files.
|
||||
|
||||
* "git submodule" that is run while a merge in the superproject is in
|
||||
conflicted state tried to process each conflicted submodule up to
|
||||
three times.
|
||||
|
||||
* "git status" spent all the effort to notice racily-clean index entries
|
||||
but didn't update the index file to help later operations go faster in
|
||||
some cases.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
4
Documentation/RelNotes/1.7.4.5.txt
Normal file
4
Documentation/RelNotes/1.7.4.5.txt
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
Git v1.7.4.5 Release Notes
|
||||
==========================
|
||||
|
||||
This contains only minor documentation fixes accumulated since 1.7.4.4.
|
||||
132
Documentation/RelNotes/1.7.5.txt
Normal file
132
Documentation/RelNotes/1.7.5.txt
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
Git v1.7.5 Release Notes
|
||||
========================
|
||||
|
||||
Updates since v1.7.4
|
||||
--------------------
|
||||
|
||||
* Various MinGW portability fixes.
|
||||
|
||||
* Various git-p4 enhancements (in contrib).
|
||||
|
||||
* Various vcs-svn, git-svn and gitk enhancements and fixes.
|
||||
|
||||
* Various git-gui updates (0.14.0).
|
||||
|
||||
* Update to more modern HP-UX port.
|
||||
|
||||
* The codebase is getting prepared for i18n/l10n; no translated
|
||||
strings nor translation mechanism in the code yet, but the strings
|
||||
are being marked for l10n.
|
||||
|
||||
* The bash completion script can now complete symmetric difference
|
||||
for "git diff" command, e.g. "git diff ...bra<TAB>".
|
||||
|
||||
* The default minimum length of abbreviated and unique object names
|
||||
can now be configured by setting the core.abbrev configuration
|
||||
variable.
|
||||
|
||||
* "git apply -v" reports offset lines when the patch does not apply at
|
||||
the exact location recorded in the diff output.
|
||||
|
||||
* "git config" used to be also known as "git repo-config", but the old
|
||||
name is now officially deprecated.
|
||||
|
||||
* "git checkout --detach <commit>" is a more user friendly synonym for
|
||||
"git checkout <commit>^0".
|
||||
|
||||
* "git checkout" performed on detached HEAD gives a warning and
|
||||
advice when the commit being left behind will become unreachable from
|
||||
any branch or tag.
|
||||
|
||||
* "git cherry-pick" and "git revert" can be told to use a custom merge
|
||||
strategy, similar to "git rebase".
|
||||
|
||||
* "git cherry-pick" remembers which commit failed to apply when it is
|
||||
stopped by conflicts, making it unnecessary to use "commit -c $commit"
|
||||
to conclude it.
|
||||
|
||||
* "git cvsimport" bails out immediately when the cvs server cannot be
|
||||
reached, without spewing unnecessary error messages that complain about
|
||||
the server response it never got.
|
||||
|
||||
* "git fetch" vs "git upload-pack" transfer learned 'no-done'
|
||||
protocol extension to save one round-trip after the content
|
||||
negotiation is done. This saves one HTTP RPC, reducing the overall
|
||||
latency for a trivial fetch.
|
||||
|
||||
* "git fetch" can be told to recursively fetch submodules on-demand.
|
||||
|
||||
* "git grep -f <filename>" learned to treat "-" as "read from the
|
||||
standard input stream".
|
||||
|
||||
* "git grep --no-index" did not honor pathspecs correctly, returning
|
||||
paths outside the specified area.
|
||||
|
||||
* "git init" learned the --separate-git-dir option to allow the git
|
||||
directory for a new repository created elsewhere and linked via the
|
||||
gitdir mechanism. This is primarily to help submodule support later
|
||||
to switch between a branch of superproject that has the submodule
|
||||
and another that does not.
|
||||
|
||||
* "git log" type commands now understand globbing pathspecs. You
|
||||
can say "git log -- '*.txt'" for example.
|
||||
|
||||
* "git log" family of commands learned --cherry and --cherry-mark
|
||||
options that can be used to view two diverged branches while omitting
|
||||
or highlighting equivalent changes that appear on both sides of a
|
||||
symmetric difference (e.g. "log --cherry A...B").
|
||||
|
||||
* A lazy "git merge" that didn't say what to merge used to be an error.
|
||||
When run on a branch that has an upstream defined, however, the command
|
||||
now merges from the configured upstream.
|
||||
|
||||
* "git mergetool" learned how to drive "beyond compare 3" as well.
|
||||
|
||||
* "git rerere forget" without pathspec used to forget all the saved
|
||||
conflicts that relate to the current merge; it now requires you to
|
||||
give it pathspecs.
|
||||
|
||||
* "git rev-list --objects $revs -- $pathspec" now limits the objects listed
|
||||
in its output properly with the pathspec, in preparation for narrow
|
||||
clones.
|
||||
|
||||
* "git push" with no parameters gives better advice messages when
|
||||
"tracking" is used as the push.default semantics or there is no remote
|
||||
configured yet.
|
||||
|
||||
* A possible value to the "push.default" configuration variable,
|
||||
'tracking', gained a synonym that more naturally describes what it
|
||||
does, 'upstream'.
|
||||
|
||||
* "git rerere" learned a new subcommand "remaining" that is similar to
|
||||
"status" and lists the paths that had conflicts which are known to
|
||||
rerere, but excludes the paths that have already been marked as
|
||||
resolved in the index from its output. "git mergetool" has been
|
||||
updated to use this facility.
|
||||
|
||||
Also contains various documentation updates.
|
||||
|
||||
|
||||
Fixes since v1.7.4
|
||||
------------------
|
||||
|
||||
All of the fixes in the v1.7.4.X maintenance series are included in this
|
||||
release, unless otherwise noted.
|
||||
|
||||
* "git fetch" from a client that is mostly following the remote
|
||||
needlessly told all of its refs to the server for both sides to
|
||||
compute the set of objects that need to be transferred efficiently,
|
||||
instead of stopping when the server heard enough. In a project with
|
||||
many tags, this turns out to be extremely wasteful, especially over
|
||||
the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1).
|
||||
|
||||
* "git fetch" run from a repository that uses the same repository as
|
||||
its alternate object store as the repository it is fetching from
|
||||
did not tell the server that it already has access to objects
|
||||
reachable from the refs in their common alternate object store,
|
||||
causing it to fetch unnecessary objects (jc/maint-fetch-alt).
|
||||
|
||||
* "git remote add --mirror" created a configuration that is suitable for
|
||||
doing both a mirror fetch and a mirror push at the same time, which
|
||||
made little sense. We now warn and require the command line to specify
|
||||
either --mirror=fetch or --mirror=push.
|
||||
|
|
@ -10,10 +10,18 @@ Checklist (and a short version for the impatient):
|
|||
description (50 characters is the soft limit, see DISCUSSION
|
||||
in git-commit(1)), and should skip the full stop
|
||||
- the body should provide a meaningful commit message, which:
|
||||
- uses the imperative, present tense: "change",
|
||||
not "changed" or "changes".
|
||||
- includes motivation for the change, and contrasts
|
||||
its implementation with previous behaviour
|
||||
. explains the problem the change tries to solve, iow, what
|
||||
is wrong with the current code without the change.
|
||||
. justifies the way the change solves the problem, iow, why
|
||||
the result with the change is better.
|
||||
. alternate solutions considered but discarded, if any.
|
||||
- describe changes in imperative mood, e.g. "make xyzzy do frotz"
|
||||
instead of "[This patch] makes xyzzy do frotz" or "[I] changed
|
||||
xyzzy to do frotz", as if you are giving orders to the codebase
|
||||
to change its behaviour.
|
||||
- try to make sure your explanation can be understood without
|
||||
external resources. Instead of giving a URL to a mailing list
|
||||
archive, summarize the relevant points of the discussion.
|
||||
- add a "Signed-off-by: Your Name <you@example.com>" line to the
|
||||
commit message (or just use the option "-s" when committing)
|
||||
to confirm that you agree to the Developer's Certificate of Origin
|
||||
|
|
@ -90,7 +98,10 @@ your commit head. Instead, always make a commit with complete
|
|||
commit message and generate a series of patches from your
|
||||
repository. It is a good discipline.
|
||||
|
||||
Describe the technical detail of the change(s).
|
||||
Give an explanation for the change(s) that is detailed enough so
|
||||
that people can judge if it is good thing to do, without reading
|
||||
the actual patch text to determine how well the code does what
|
||||
the explanation promises to do.
|
||||
|
||||
If your description starts to get too long, that's a sign that you
|
||||
probably need to split up your commit to finer grained pieces.
|
||||
|
|
@ -99,9 +110,8 @@ help reviewers check the patch, and future maintainers understand
|
|||
the code, are the most beautiful patches. Descriptions that summarise
|
||||
the point in the subject well, and describe the motivation for the
|
||||
change, the approach taken by the change, and if relevant how this
|
||||
differs substantially from the prior version, can be found on Usenet
|
||||
archives back into the late 80's. Consider it like good Netiquette,
|
||||
but for code.
|
||||
differs substantially from the prior version, are all good things
|
||||
to have.
|
||||
|
||||
Oh, another thing. I am picky about whitespaces. Make sure your
|
||||
changes do not trigger errors with the sample pre-commit hook shipped
|
||||
|
|
@ -266,7 +276,7 @@ don't hide your real name.
|
|||
|
||||
If you like, you can put extra tags at the end:
|
||||
|
||||
1. "Reported-by:" is used to to credit someone who found the bug that
|
||||
1. "Reported-by:" is used to credit someone who found the bug that
|
||||
the patch attempts to fix.
|
||||
2. "Acked-by:" says that the person who is more familiar with the area
|
||||
the patch attempts to modify liked the patch.
|
||||
|
|
@ -598,4 +608,3 @@ following commands:
|
|||
Just make sure to disable line wrapping in the email client (GMail web
|
||||
interface will line wrap no matter what, so you need to use a real
|
||||
IMAP client).
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ Internal whitespace within a variable value is retained verbatim.
|
|||
|
||||
The values following the equals sign in variable assign are all either
|
||||
a string, an integer, or a boolean. Boolean values may be given as yes/no,
|
||||
0/1, true/false or on/off. Case is not significant in boolean values, when
|
||||
1/0, true/false or on/off. Case is not significant in boolean values, when
|
||||
converting value to the canonical form using '--bool' type specifier;
|
||||
'git config' will ensure that the output is "true" or "false".
|
||||
|
||||
|
|
@ -320,7 +320,7 @@ core.worktree::
|
|||
Set the path to the root of the working tree.
|
||||
This can be overridden by the GIT_WORK_TREE environment
|
||||
variable and the '--work-tree' command line option.
|
||||
The value can an absolute path or relative to the path to
|
||||
The value can be an absolute path or relative to the path to
|
||||
the .git directory, which is either specified by --git-dir
|
||||
or GIT_DIR, or automatically discovered.
|
||||
If --git-dir or GIT_DIR is specified but none of
|
||||
|
|
@ -376,15 +376,6 @@ core.warnAmbiguousRefs::
|
|||
If true, git will warn you if the ref name you passed it is ambiguous
|
||||
and might match multiple refs in the .git/refs/ tree. True by default.
|
||||
|
||||
core.abbrevguard::
|
||||
Even though git makes sure that it uses enough hexdigits to show
|
||||
an abbreviated object name unambiguously, as more objects are
|
||||
added to the repository over time, a short name that used to be
|
||||
unique will stop being unique. Git uses this many extra hexdigits
|
||||
that are more than necessary to make the object name currently
|
||||
unique, in the hope that its output will stay unique a bit longer.
|
||||
Defaults to 0.
|
||||
|
||||
core.compression::
|
||||
An integer -1..9, indicating a default compression level.
|
||||
-1 is the zlib default. 0 means no compression,
|
||||
|
|
@ -567,6 +558,12 @@ core.sparseCheckout::
|
|||
Enable "sparse checkout" feature. See section "Sparse checkout" in
|
||||
linkgit:git-read-tree[1] for more information.
|
||||
|
||||
core.abbrev::
|
||||
Set the length object names are abbreviated to. If unspecified,
|
||||
many commands abbreviate to 7 hexdigits, which may not be enough
|
||||
for abbreviated object names to stay unique for sufficiently long
|
||||
time.
|
||||
|
||||
add.ignore-errors::
|
||||
add.ignoreErrors::
|
||||
Tells 'git add' to continue adding files when some files cannot be
|
||||
|
|
@ -900,9 +897,13 @@ diff.wordRegex::
|
|||
characters are *ignorable* whitespace.
|
||||
|
||||
fetch.recurseSubmodules::
|
||||
A boolean value which changes the behavior for fetch and pull, the
|
||||
default is to not recursively fetch populated submodules unless
|
||||
configured otherwise.
|
||||
This option can be either set to a boolean value or to 'on-demand'.
|
||||
Setting it to a boolean changes the behavior of fetch and pull to
|
||||
unconditionally recurse into submodules when set to true or to not
|
||||
recurse at all when set to false. When set to 'on-demand' (the default
|
||||
value), fetch and pull will only recurse into a populated submodule
|
||||
when its superproject retrieves a commit that updates the submodule's
|
||||
reference.
|
||||
|
||||
fetch.unpackLimit::
|
||||
If the number of objects fetched over the git native
|
||||
|
|
@ -1101,6 +1102,12 @@ All gitcvs variables except for 'gitcvs.usecrlfattr' and
|
|||
is one of "ext" and "pserver") to make them apply only for the given
|
||||
access method.
|
||||
|
||||
grep.lineNumber::
|
||||
If set to true, enable '-n' option by default.
|
||||
|
||||
grep.extendedRegexp::
|
||||
If set to true, enable '--extended-regexp' option by default.
|
||||
|
||||
gui.commitmsgwidth::
|
||||
Defines how wide the commit message window is in the
|
||||
linkgit:git-gui[1]. "75" is the default.
|
||||
|
|
@ -1591,7 +1598,8 @@ push.default::
|
|||
* `matching` - push all matching branches.
|
||||
All branches having the same name in both ends are considered to be
|
||||
matching. This is the default.
|
||||
* `tracking` - push the current branch to its upstream branch.
|
||||
* `upstream` - push the current branch to its upstream branch.
|
||||
* `tracking` - deprecated synonym for `upstream`.
|
||||
* `current` - push the current branch to a branch of the same name.
|
||||
|
||||
rebase.stat::
|
||||
|
|
@ -1819,7 +1827,7 @@ submodule.<name>.update::
|
|||
linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
|
||||
|
||||
submodule.<name>.fetchRecurseSubmodules::
|
||||
This option can be used to enable/disable recursive fetching of this
|
||||
This option can be used to control recursive fetching of this
|
||||
submodule. It can be overridden by using the --[no-]recurse-submodules
|
||||
command line option to "git fetch" and "git pull".
|
||||
This setting will override that from in the linkgit:gitmodules[5]
|
||||
|
|
|
|||
|
|
@ -74,10 +74,13 @@ separate lines indicate the old and the new mode.
|
|||
combined diff format
|
||||
--------------------
|
||||
|
||||
"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
|
||||
'--cc' option to produce 'combined diff'. For showing a merge commit
|
||||
with "git log -p", this is the default format; you can force showing
|
||||
full diff with the '-m' option.
|
||||
Any diff-generating command can take the `-c` or `--cc` option to
|
||||
produce a 'combined diff' when showing a merge. This is the default
|
||||
format when showing merges with linkgit:git-diff[1] or
|
||||
linkgit:git-show[1]. Note also that you can give the `-m' option to any
|
||||
of these commands to force generation of diffs with individual parents
|
||||
of a merge.
|
||||
|
||||
A 'combined diff' format looks like this:
|
||||
|
||||
------------
|
||||
|
|
|
|||
|
|
@ -65,14 +65,33 @@ ifndef::git-pull[]
|
|||
specified with the remote.<name>.tagopt setting. See
|
||||
linkgit:git-config[1].
|
||||
|
||||
--[no-]recurse-submodules::
|
||||
This option controls if new commits of all populated submodules should
|
||||
be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
|
||||
--recurse-submodules[=yes|on-demand|no]::
|
||||
This option controls if and under what conditions new commits of
|
||||
populated submodules should be fetched too. It can be used as a
|
||||
boolean option to completely disable recursion when set to 'no' or to
|
||||
unconditionally recurse into all populated submodules when set to
|
||||
'yes', which is the default when this option is used without any
|
||||
value. Use 'on-demand' to only recurse into a populated submodule
|
||||
when the superproject retrieves a commit that updates the submodule's
|
||||
reference to a commit that isn't already in the local submodule
|
||||
clone.
|
||||
|
||||
--no-recurse-submodules::
|
||||
Disable recursive fetching of submodules (this has the same effect as
|
||||
using the '--recurse-submodules=no' option).
|
||||
|
||||
--submodule-prefix=<path>::
|
||||
Prepend <path> to paths printed in informative messages
|
||||
such as "Fetching submodule foo". This option is used
|
||||
internally when recursing over submodules.
|
||||
|
||||
--recurse-submodules-default=[yes|on-demand]::
|
||||
This option is used internally to temporarily provide a
|
||||
non-negative default value for the --recurse-submodules
|
||||
option. All other methods of configuring fetch's submodule
|
||||
recursion (such as settings in linkgit:gitmodules[5] and
|
||||
linkgit:git-config[1]) override this option, as does
|
||||
specifying --[no-]recurse-submodules directly.
|
||||
endif::git-pull[]
|
||||
|
||||
-u::
|
||||
|
|
|
|||
|
|
@ -378,14 +378,6 @@ linkgit:git-mv[1]
|
|||
linkgit:git-commit[1]
|
||||
linkgit:git-update-index[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways:
|
|||
the index file to bring it into a state that the patch should
|
||||
have produced. Then run the command with the '--resolved' option.
|
||||
|
||||
The command refuses to process new mailboxes while the `.git/rebase-apply`
|
||||
directory exists, so if you decide to start over from scratch,
|
||||
run `rm -f -r .git/rebase-apply` before running the command with mailbox
|
||||
The command refuses to process new mailboxes until the current
|
||||
operation is finished, so if you decide to start over from scratch,
|
||||
run `git am --abort` before running the command with mailbox
|
||||
names.
|
||||
|
||||
Before any patches are applied, ORIG_HEAD is set to the tip of the
|
||||
|
|
@ -189,15 +189,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-apply[1].
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -27,10 +27,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-blame[1]
|
||||
|
||||
AUTHOR
|
||||
------
|
||||
Written by Ryan Anderson <ryan@michonline.com>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ DESCRIPTION
|
|||
-----------
|
||||
Reads the supplied diff output (i.e. "a patch") and applies it to files.
|
||||
With the `--index` option the patch is also applied to the index, and
|
||||
with the `--cache` option the patch is only applied to the index.
|
||||
with the `--cached` option the patch is only applied to the index.
|
||||
Without these options, the command applies the patch only to files,
|
||||
and does not require them to be in a git repository.
|
||||
|
||||
|
|
@ -246,20 +246,10 @@ If `--index` is not specified, then the submodule commits in the patch
|
|||
are ignored and only the absence or presence of the corresponding
|
||||
subdirectory is checked and (if possible) updated.
|
||||
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-am[1].
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -107,14 +107,6 @@ OPTIONS
|
|||
Archive/branch identifier in a format that `tla log` understands.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Martin Langhoff <martin@laptop.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -98,7 +98,8 @@ tar.umask::
|
|||
tar archive entries. The default is 0002, which turns off the
|
||||
world write bit. The special value "user" indicates that the
|
||||
archiving user's umask will be used instead. See umask(2) for
|
||||
details.
|
||||
details. If `--remote` is used then only the configuration of
|
||||
the remote repository takes effect.
|
||||
|
||||
ATTRIBUTES
|
||||
----------
|
||||
|
|
@ -153,14 +154,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:gitattributes[5]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Franck Bui-Huu and Rene Scharfe.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -241,7 +241,12 @@ exit(3) manual page), as the value is chopped with "& 0377".
|
|||
|
||||
The special exit code 125 should be used when the current source code
|
||||
cannot be tested. If the script exits with this code, the current
|
||||
revision will be skipped (see `git bisect skip` above).
|
||||
revision will be skipped (see `git bisect skip` above). 125 was chosen
|
||||
as the highest sensible value to use for this purpose, because 126 and 127
|
||||
are used by POSIX shells to signal specific error status (127 is for
|
||||
command not found, 126 is for command found but not executable---these
|
||||
details do not matter, as they are normal errors in the script, as far as
|
||||
"bisect run" is concerned).
|
||||
|
||||
You may often find that during a bisect session you want to have
|
||||
temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a
|
||||
|
|
@ -274,61 +279,68 @@ $ git bisect start HEAD origin -- # HEAD is bad, origin is good
|
|||
$ git bisect run make test # "make test" builds and tests
|
||||
------------
|
||||
|
||||
* Automatically bisect a broken test suite:
|
||||
+
|
||||
------------
|
||||
$ cat ~/test.sh
|
||||
#!/bin/sh
|
||||
make || exit 125 # this skips broken builds
|
||||
make test # "make test" runs the test suite
|
||||
$ git bisect start v1.3 v1.1 -- # v1.3 is bad, v1.1 is good
|
||||
$ git bisect run ~/test.sh
|
||||
------------
|
||||
+
|
||||
Here we use a "test.sh" custom script. In this script, if "make"
|
||||
fails, we skip the current commit.
|
||||
+
|
||||
It is safer to use a custom script outside the repository to prevent
|
||||
interactions between the bisect, make and test processes and the
|
||||
script.
|
||||
+
|
||||
"make test" should "exit 0", if the test suite passes, and
|
||||
"exit 1" otherwise.
|
||||
|
||||
* Automatically bisect a broken test case:
|
||||
+
|
||||
------------
|
||||
$ cat ~/test.sh
|
||||
#!/bin/sh
|
||||
make || exit 125 # this skips broken builds
|
||||
~/check_test_case.sh # does the test case passes ?
|
||||
~/check_test_case.sh # does the test case pass?
|
||||
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
|
||||
$ git bisect run ~/test.sh
|
||||
------------
|
||||
+
|
||||
Here "check_test_case.sh" should "exit 0" if the test case passes,
|
||||
Here we use a "test.sh" custom script. In this script, if "make"
|
||||
fails, we skip the current commit.
|
||||
"check_test_case.sh" should "exit 0" if the test case passes,
|
||||
and "exit 1" otherwise.
|
||||
+
|
||||
It is safer if both "test.sh" and "check_test_case.sh" scripts are
|
||||
It is safer if both "test.sh" and "check_test_case.sh" are
|
||||
outside the repository to prevent interactions between the bisect,
|
||||
make and test processes and the scripts.
|
||||
|
||||
* Automatically bisect a broken test suite:
|
||||
* Automatically bisect with temporary modifications (hot-fix):
|
||||
+
|
||||
------------
|
||||
$ cat ~/test.sh
|
||||
#!/bin/sh
|
||||
|
||||
# tweak the working tree by merging the hot-fix branch
|
||||
# and then attempt a build
|
||||
if git merge --no-commit hot-fix &&
|
||||
make
|
||||
then
|
||||
# run project specific test and report its status
|
||||
~/check_test_case.sh
|
||||
status=$?
|
||||
else
|
||||
# tell the caller this is untestable
|
||||
status=125
|
||||
fi
|
||||
|
||||
# undo the tweak to allow clean flipping to the next commit
|
||||
git reset --hard
|
||||
|
||||
# return control
|
||||
exit $status
|
||||
------------
|
||||
+
|
||||
This applies modifications from a hot-fix branch before each test run,
|
||||
e.g. in case your build or test environment changed so that older
|
||||
revisions may need a fix which newer ones have already. (Make sure the
|
||||
hot-fix branch is based off a commit which is contained in all revisions
|
||||
which you are bisecting, so that the merge does not pull in too much, or
|
||||
use `git cherry-pick` instead of `git merge`.)
|
||||
|
||||
* Automatically bisect a broken test case:
|
||||
+
|
||||
------------
|
||||
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
|
||||
$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
|
||||
------------
|
||||
+
|
||||
Does the same as the previous example, but on a single line.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
This shows that you can do without a run script if you write the test
|
||||
on a single line.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
|
|
|
|||
|
|
@ -198,10 +198,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-annotate[1]
|
||||
|
||||
AUTHOR
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -232,14 +232,6 @@ linkgit:git-remote[1],
|
|||
link:user-manual.html#what-is-a-branch[``Understanding history: What is
|
||||
a branch?''] in the Git User's Manual.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -201,10 +201,6 @@ You can also see what references it offers:
|
|||
$ git ls-remote mybundle
|
||||
----------------
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Mark Levedahl <mdl123@verizon.net>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -100,14 +100,6 @@ for each object specified on stdin that does not exist in the repository:
|
|||
<object> SP missing LF
|
||||
------------
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -86,15 +86,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:gitattributes[5].
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by James Bowes.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -172,18 +172,6 @@ $ git checkout-index --prefix=.merged- Makefile
|
|||
This will check out the currently cached copy of `Makefile`
|
||||
into the file `.merged-Makefile`.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves,
|
||||
Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git checkout' [-q] [-f] [-m] [<branch>]
|
||||
'git checkout' [-q] [-f] [-m] [--detach] [<commit>]
|
||||
'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
|
||||
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
|
||||
'git checkout' --patch [<tree-ish>] [--] [<paths>...]
|
||||
|
|
@ -22,9 +23,10 @@ branch.
|
|||
|
||||
'git checkout' [<branch>]::
|
||||
'git checkout' -b|-B <new_branch> [<start point>]::
|
||||
'git checkout' [--detach] [<commit>]::
|
||||
|
||||
This form switches branches by updating the index, working
|
||||
tree, and HEAD to reflect the specified branch.
|
||||
tree, and HEAD to reflect the specified branch or commit.
|
||||
+
|
||||
If `-b` is given, a new branch is created as if linkgit:git-branch[1]
|
||||
were called and then checked out; in this case you can
|
||||
|
|
@ -115,6 +117,13 @@ explicitly give a name with '-b' in such a case.
|
|||
Create the new branch's reflog; see linkgit:git-branch[1] for
|
||||
details.
|
||||
|
||||
--detach::
|
||||
Rather than checking out a branch to work on it, check out a
|
||||
commit for inspection and discardable experiments.
|
||||
This is the default behavior of "git checkout <commit>" when
|
||||
<commit> is not a branch name. See the "DETACHED HEAD" section
|
||||
below for details.
|
||||
|
||||
--orphan::
|
||||
Create a new 'orphan' branch, named <new_branch>, started from
|
||||
<start_point> and switch to it. The first commit made on this
|
||||
|
|
@ -204,43 +213,141 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
|
|||
|
||||
|
||||
|
||||
Detached HEAD
|
||||
DETACHED HEAD
|
||||
-------------
|
||||
|
||||
It is sometimes useful to be able to 'checkout' a commit that is
|
||||
not at the tip of one of your branches. The most obvious
|
||||
example is to check out the commit at a tagged official release
|
||||
point, like this:
|
||||
HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each
|
||||
branch refers to a specific commit. Let's look at a repo with three
|
||||
commits, one of them tagged, and with branch 'master' checked out:
|
||||
|
||||
------------
|
||||
$ git checkout v2.6.18
|
||||
HEAD (refers to branch 'master')
|
||||
|
|
||||
v
|
||||
a---b---c branch 'master' (refers to commit 'c')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
Earlier versions of git did not allow this and asked you to
|
||||
create a temporary branch using the `-b` option, but starting from
|
||||
version 1.5.0, the above command 'detaches' your HEAD from the
|
||||
current branch and directly points at the commit named by the tag
|
||||
(`v2.6.18` in the example above).
|
||||
|
||||
You can use all git commands while in this state. You can use
|
||||
`git reset --hard $othercommit` to further move around, for
|
||||
example. You can make changes and create a new commit on top of
|
||||
a detached HEAD. You can even create a merge by using `git
|
||||
merge $othercommit`.
|
||||
|
||||
The state you are in while your HEAD is detached is not recorded
|
||||
by any branch (which is natural --- you are not on any branch).
|
||||
What this means is that you can discard your temporary commits
|
||||
and merges by switching back to an existing branch (e.g. `git
|
||||
checkout master`), and a later `git prune` or `git gc` would
|
||||
garbage-collect them. If you did this by mistake, you can ask
|
||||
the reflog for HEAD where you were, e.g.
|
||||
When a commit is created in this state, the branch is updated to refer to
|
||||
the new commit. Specifically, 'git commit' creates a new commit 'd', whose
|
||||
parent is commit 'c', and then updates branch 'master' to refer to new
|
||||
commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers
|
||||
to commit 'd':
|
||||
|
||||
------------
|
||||
$ edit; git add; git commit
|
||||
|
||||
HEAD (refers to branch 'master')
|
||||
|
|
||||
v
|
||||
a---b---c---d branch 'master' (refers to commit 'd')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
It is sometimes useful to be able to checkout a commit that is not at
|
||||
the tip of any named branch, or even to create a new commit that is not
|
||||
referenced by a named branch. Let's look at what happens when we
|
||||
checkout commit 'b' (here we show two ways this may be done):
|
||||
|
||||
------------
|
||||
$ git checkout v2.0 # or
|
||||
$ git checkout master^^
|
||||
|
||||
HEAD (refers to commit 'b')
|
||||
|
|
||||
v
|
||||
a---b---c---d branch 'master' (refers to commit 'd')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
Notice that regardless of which checkout command we use, HEAD now refers
|
||||
directly to commit 'b'. This is known as being in detached HEAD state.
|
||||
It means simply that HEAD refers to a specific commit, as opposed to
|
||||
referring to a named branch. Let's see what happens when we create a commit:
|
||||
|
||||
------------
|
||||
$ edit; git add; git commit
|
||||
|
||||
HEAD (refers to commit 'e')
|
||||
|
|
||||
v
|
||||
e
|
||||
/
|
||||
a---b---c---d branch 'master' (refers to commit 'd')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
There is now a new commit 'e', but it is referenced only by HEAD. We can
|
||||
of course add yet another commit in this state:
|
||||
|
||||
------------
|
||||
$ edit; git add; git commit
|
||||
|
||||
HEAD (refers to commit 'f')
|
||||
|
|
||||
v
|
||||
e---f
|
||||
/
|
||||
a---b---c---d branch 'master' (refers to commit 'd')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
In fact, we can perform all the normal git operations. But, let's look
|
||||
at what happens when we then checkout master:
|
||||
|
||||
------------
|
||||
$ git checkout master
|
||||
|
||||
HEAD (refers to branch 'master')
|
||||
e---f |
|
||||
/ v
|
||||
a---b---c---d branch 'master' (refers to commit 'd')
|
||||
^
|
||||
|
|
||||
tag 'v2.0' (refers to commit 'b')
|
||||
------------
|
||||
|
||||
It is important to realize that at this point nothing refers to commit
|
||||
'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted
|
||||
by the routine git garbage collection process, unless we create a reference
|
||||
before that happens. If we have not yet moved away from commit 'f',
|
||||
any of these will create a reference to it:
|
||||
|
||||
------------
|
||||
$ git checkout -b foo <1>
|
||||
$ git branch foo <2>
|
||||
$ git tag foo <3>
|
||||
------------
|
||||
|
||||
<1> creates a new branch 'foo', which refers to commit 'f', and then
|
||||
updates HEAD to refer to branch 'foo'. In other words, we'll no longer
|
||||
be in detached HEAD state after this command.
|
||||
|
||||
<2> similarly creates a new branch 'foo', which refers to commit 'f',
|
||||
but leaves HEAD detached.
|
||||
|
||||
<3> creates a new tag 'foo', which refers to commit 'f',
|
||||
leaving HEAD detached.
|
||||
|
||||
If we have moved away from commit 'f', then we must first recover its object
|
||||
name (typically by using git reflog), and then we can create a reference to
|
||||
it. For example, to see the last two commits to which HEAD referred, we
|
||||
can use either of these commands:
|
||||
|
||||
------------
|
||||
$ git reflog -2 HEAD # or
|
||||
$ git log -g -2 HEAD
|
||||
------------
|
||||
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
|
|
@ -315,15 +422,6 @@ $ edit frotz
|
|||
$ git add frotz
|
||||
------------
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -16,6 +16,25 @@ Given one or more existing commits, apply the change each one
|
|||
introduces, recording a new commit for each. This requires your
|
||||
working tree to be clean (no modifications from the HEAD commit).
|
||||
|
||||
When it is not obvious how to apply a change, the following
|
||||
happens:
|
||||
|
||||
1. The current branch and `HEAD` pointer stay at the last commit
|
||||
successfully made.
|
||||
2. The `CHERRY_PICK_HEAD` ref is set to point at the commit that
|
||||
introduced the change that is difficult to apply.
|
||||
3. Paths in which the change applied cleanly are updated both
|
||||
in the index file and in your working tree.
|
||||
4. For conflicting paths, the index file records up to three
|
||||
versions, as described in the "TRUE MERGE" section of
|
||||
linkgit:git-merge[1]. The working tree files will include
|
||||
a description of the conflict bracketed by the usual
|
||||
conflict markers `<<<<<<<` and `>>>>>>>`.
|
||||
5. No other modifications are made.
|
||||
|
||||
See linkgit:git-merge[1] for some hints on resolving such
|
||||
conflicts.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
<commit>...::
|
||||
|
|
@ -152,14 +171,6 @@ the working tree.
|
|||
spending extra time to avoid mistakes based on incorrectly matching
|
||||
context lines.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-revert[1]
|
||||
|
|
|
|||
|
|
@ -63,14 +63,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-patch-id[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -19,14 +19,6 @@ to the less interactive 'git commit' program.
|
|||
'git citool' is actually a standard alias for `git gui citool`.
|
||||
See linkgit:git-gui[1] for more details.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -61,12 +61,6 @@ OPTIONS
|
|||
Remove only files ignored by git. This may be useful to rebuild
|
||||
everything from scratch, but keep manually created files.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Pavel Roskin <proski@gnu.org>
|
||||
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ SYNOPSIS
|
|||
'git clone' [--template=<template_directory>]
|
||||
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
|
||||
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
|
||||
[--separate-git-dir|-L <git dir>]
|
||||
[--depth <depth>] [--recursive|--recurse-submodules] [--] <repository>
|
||||
[<directory>]
|
||||
|
||||
|
|
@ -176,6 +177,15 @@ objects from the source repository into a pack in the cloned repository.
|
|||
repository does not have a worktree/checkout (i.e. if any of
|
||||
`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
|
||||
|
||||
-L=<git dir>::
|
||||
--separate-git-dir=<git dir>::
|
||||
Instead of placing the cloned repository where it is supposed
|
||||
to be, place the cloned repository at the specified directory,
|
||||
then make a filesytem-agnostic git symbolic link to there.
|
||||
The result is git repository can be separated from working
|
||||
tree.
|
||||
|
||||
|
||||
<repository>::
|
||||
The (possibly remote) repository to clone from. See the
|
||||
<<URLS,URLS>> section below for more information on specifying
|
||||
|
|
@ -236,17 +246,6 @@ $ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
|
|||
/pub/scm/.../me/subsys-2.6.git
|
||||
------------
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -93,15 +93,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-write-tree[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -84,9 +84,10 @@ OPTIONS
|
|||
linkgit:git-rebase[1] for details.
|
||||
|
||||
--reset-author::
|
||||
When used with -C/-c/--amend options, declare that the
|
||||
authorship of the resulting commit now belongs of the committer.
|
||||
This also renews the author timestamp.
|
||||
When used with -C/-c/--amend options, or when committing after a
|
||||
a conflicting cherry-pick, declare that the authorship of the
|
||||
resulting commit now belongs of the committer. This also renews
|
||||
the author timestamp.
|
||||
|
||||
--short::
|
||||
When doing a dry-run, give the output in the short-format. See
|
||||
|
|
@ -396,12 +397,6 @@ linkgit:git-mv[1],
|
|||
linkgit:git-merge[1],
|
||||
linkgit:git-commit-tree[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org> and
|
||||
Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -336,15 +336,6 @@ echo "${WS}your whitespace color or blue reverse${RESET}"
|
|||
|
||||
include::config.txt[]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -25,15 +25,6 @@ OPTIONS
|
|||
and number of objects that can be removed by running
|
||||
`git prune-packed`.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -112,14 +112,6 @@ $ cd ~/project_cvs_checkout
|
|||
$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v
|
||||
------------
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Martin Langhoff <martin@laptop.org> and others.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Martin Langhoff <martin@laptop.org> and others.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -217,15 +217,6 @@ more stable in practice:
|
|||
* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
|
||||
* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from
|
||||
various participants of the git-list <git@vger.kernel.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -391,22 +391,6 @@ Dependencies
|
|||
------------
|
||||
'git-cvsserver' depends on DBD::SQLite.
|
||||
|
||||
Copyright and Authors
|
||||
---------------------
|
||||
|
||||
This program is copyright The Open University UK - 2006.
|
||||
|
||||
Authors:
|
||||
|
||||
- Martyn Smith <martyn@catalyst.net.nz>
|
||||
- Martin Langhoff <martin@laptop.org>
|
||||
|
||||
with ideas and patches from participants of the git-list <git@vger.kernel.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@laptop.org>, and Matthias Urlichs <smurf@smurf.noris.de>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -279,17 +279,6 @@ that connected to it, if the IP address is available. REMOTE_ADDR will
|
|||
be available in the environment of hooks called when
|
||||
services are performed.
|
||||
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
|
||||
<yoshfuji@linux-ipv6.org> and the git-list <git@vger.kernel.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -156,17 +156,6 @@ selected and output. Here fewest commits different is defined as
|
|||
the number of commits which would be shown by `git log tag..input`
|
||||
will be the smallest number of commits possible.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>, but somewhat
|
||||
butchered by Junio C Hamano <gitster@pobox.com>. Later significantly
|
||||
updated by Shawn Pearce <spearce@spearce.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -46,15 +46,6 @@ omit diff output for unmerged entries and just show "Unmerged".
|
|||
|
||||
include::diff-format.txt[]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -116,15 +116,6 @@ tell which file is in which state, since the "has been updated" ones
|
|||
show a valid sha1, and the "not in sync with the index" ones will
|
||||
always have the special all-zero sha1.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -162,15 +162,6 @@ in case you care).
|
|||
|
||||
include::diff-format.txt[]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -174,14 +174,6 @@ linkgit:gitdiffcore[7],
|
|||
linkgit:git-format-patch[1],
|
||||
linkgit:git-apply[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ OPTIONS
|
|||
--tool=<tool>::
|
||||
Use the diff tool specified by <tool>.
|
||||
Valid merge tools are:
|
||||
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
|
||||
ecmerge, diffuse, opendiff, p4merge and araxis.
|
||||
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
|
||||
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
|
||||
+
|
||||
If a diff tool is not specified, 'git difftool'
|
||||
will use the configuration variable `diff.tool`. If the
|
||||
|
|
@ -109,15 +109,6 @@ linkgit:git-mergetool[1]::
|
|||
linkgit:git-config[1]::
|
||||
Get and set repository or global options
|
||||
|
||||
|
||||
AUTHOR
|
||||
------
|
||||
Written by David Aguilar <davvid@gmail.com>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -135,15 +135,6 @@ Since 'git fast-import' cannot tag trees, you will not be
|
|||
able to export the linux-2.6.git repository completely, as it contains
|
||||
a tag referencing a tree instead of a commit.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -1350,14 +1350,6 @@ operator can use this facility to peek at the objects and refs from an
|
|||
import in progress, at the cost of some added running time and worse
|
||||
compression.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -90,15 +90,6 @@ OPTIONS
|
|||
$GIT_DIR (e.g. "HEAD", "refs/heads/master"). When
|
||||
unspecified, update from all heads the remote side has.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ pointed by remote tags that it does not yet have, then fetch
|
|||
those missing tags. If the other end has tags that point at
|
||||
branches you are not interested in, you will not get them.
|
||||
|
||||
'git fetch' can fetch from either a single named repository, or
|
||||
'git fetch' can fetch from either a single named repository,
|
||||
or from several repositories at once if <group> is given and
|
||||
there is a remotes.<group> entry in the configuration file.
|
||||
(See linkgit:git-config[1]).
|
||||
|
|
@ -76,20 +76,19 @@ The `pu` branch will be updated even if it is does not fast-forward,
|
|||
because it is prefixed with a plus sign; `tmp` will not be.
|
||||
|
||||
|
||||
BUGS
|
||||
----
|
||||
Using --recurse-submodules can only fetch new commits in already checked
|
||||
out submodules right now. When e.g. upstream added a new submodule in the
|
||||
just fetched commits of the superproject the submodule itself can not be
|
||||
fetched, making it impossible to check out that submodule later without
|
||||
having to do a fetch again. This is expected to be fixed in a future git
|
||||
version.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-pull[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org> and
|
||||
Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ git filter-branch --index-filter \
|
|||
'git ls-files -s | sed "s-\t\"*-&newsubdir/-" |
|
||||
GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
|
||||
git update-index --index-info &&
|
||||
mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD
|
||||
mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
|
||||
---------------------------------------------------------------
|
||||
|
||||
|
||||
|
|
@ -405,16 +405,6 @@ warned.
|
|||
(or if your git-gc is not new enough to support arguments to
|
||||
`\--prune`, use `git repack -ad; git prune` instead).
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Petr "Pasky" Baudis <pasky@suse.cz>,
|
||||
and the git list <git@vger.kernel.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Petr Baudis and the git list.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -67,15 +67,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-merge[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ EXAMPLES
|
|||
--------
|
||||
|
||||
An example directly producing formatted text. Show the most recent
|
||||
3 tagged commits::
|
||||
3 tagged commits:
|
||||
|
||||
------------
|
||||
#!/bin/sh
|
||||
|
|
@ -140,7 +140,7 @@ Ref: %(*refname)
|
|||
|
||||
|
||||
A simple example showing the use of shell eval on the output,
|
||||
demonstrating the use of --shell. List the prefixes of all heads::
|
||||
demonstrating the use of --shell. List the prefixes of all heads:
|
||||
------------
|
||||
#!/bin/sh
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ done
|
|||
|
||||
|
||||
A bit more elaborate report on tags, demonstrating that the format
|
||||
may be an entire script::
|
||||
may be an entire script:
|
||||
------------
|
||||
#!/bin/sh
|
||||
|
||||
|
|
@ -204,3 +204,15 @@ eval=`git for-each-ref --shell --format="$fmt" \
|
|||
refs/tags`
|
||||
eval "$eval"
|
||||
------------
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>.
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -278,15 +278,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-am[1], linkgit:git-send-email[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -15,3 +15,7 @@ DESCRIPTION
|
|||
|
||||
This is a synonym for linkgit:git-fsck[1]. Please refer to the
|
||||
documentation of that command.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -140,14 +140,6 @@ GIT_INDEX_FILE::
|
|||
GIT_ALTERNATE_OBJECT_DIRECTORIES::
|
||||
used to specify additional object database roots (usually unset)
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -151,10 +151,6 @@ linkgit:git-reflog[1]
|
|||
linkgit:git-repack[1]
|
||||
linkgit:git-rerere[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Shawn O. Pearce <spearce@spearce.org>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -22,15 +22,6 @@ return code of 1. This can happen if <tarfile> had not been created
|
|||
using 'git archive' or if the first parameter of 'git archive' had been
|
||||
a tree ID instead of a commit ID or tag.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -31,6 +31,16 @@ Look for specified patterns in the tracked files in the work tree, blobs
|
|||
registered in the index file, or blobs in given tree objects.
|
||||
|
||||
|
||||
CONFIGURATION
|
||||
-------------
|
||||
|
||||
grep.lineNumber::
|
||||
If set to true, enable '-n' option by default.
|
||||
|
||||
grep.extendedRegexp::
|
||||
If set to true, enable '--extended-regexp' option by default.
|
||||
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
--cached::
|
||||
|
|
@ -93,6 +103,7 @@ OPTIONS
|
|||
as a regex).
|
||||
|
||||
-n::
|
||||
--line-number::
|
||||
Prefix the line number to matching lines.
|
||||
|
||||
-l::
|
||||
|
|
@ -203,16 +214,6 @@ git grep --all-match -e NODE -e Unexpected::
|
|||
Looks for a line that has `NODE` or `Unexpected` in
|
||||
files that have lines that match both.
|
||||
|
||||
Author
|
||||
------
|
||||
Originally written by Linus Torvalds <torvalds@osdl.org>, later
|
||||
revamped by Junio C Hamano.
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -121,14 +121,6 @@ or
|
|||
|
||||
or browsed online at http://repo.or.cz/w/git-gui.git/[].
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Shawn O. Pearce <spearce@spearce.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -53,14 +53,6 @@ OPTIONS
|
|||
conversion. If the file is read from standard input then this
|
||||
is always implied, unless the --path option is given.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -171,17 +171,6 @@ $ git config --global web.browser firefox
|
|||
as they are probably more user specific than repository specific.
|
||||
See linkgit:git-config[1] for more information about this.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com> and the git-list
|
||||
<git@vger.kernel.org>.
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Initial documentation was part of the linkgit:git[1] man page.
|
||||
Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
|
||||
little. Maintenance is done by the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -43,14 +43,6 @@ commit-id::
|
|||
Verify that everything reachable from target is fetched. Used after
|
||||
an earlier fetch is interrupted.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -91,15 +91,6 @@ With '--force', the fast-forward check is disabled for all refs.
|
|||
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
|
||||
to disable the fast-forward check only on that ref.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Nick Hengeveld <nickh@reactrix.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Nick Hengeveld
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -124,14 +124,6 @@ Thunderbird in particular is known to be problematic. Thunderbird
|
|||
users may wish to visit this web page for more information:
|
||||
http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email
|
||||
|
||||
Author
|
||||
------
|
||||
Derived from isync 1.0.1 by Mike McCormack.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Mike McCormack
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -85,15 +85,6 @@ new .keep file was successfully created. This is useful to remove a
|
|||
.keep file used as a lock to prevent the race with 'git repack'
|
||||
mentioned above.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Sergey Vlasov <vsu@altlinux.ru>
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation by Sergey Vlasov
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -16,3 +16,7 @@ DESCRIPTION
|
|||
|
||||
This is a synonym for linkgit:git-init[1]. Please refer to the
|
||||
documentation of that command.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -8,9 +8,32 @@ git-init - Create an empty git repository or reinitialize an existing one
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git init' [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]] [directory]
|
||||
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
|
||||
[--separate-git-dir|-L <git dir>]
|
||||
[--shared[=<permissions>]] [directory]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
||||
This command creates an empty git repository - basically a `.git`
|
||||
directory with subdirectories for `objects`, `refs/heads`,
|
||||
`refs/tags`, and template files. An initial `HEAD` file that
|
||||
references the HEAD of the master branch is also created.
|
||||
|
||||
If the `$GIT_DIR` environment variable is set then it specifies a path
|
||||
to use instead of `./.git` for the base of the repository.
|
||||
|
||||
If the object storage directory is specified via the
|
||||
`$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories
|
||||
are created underneath - otherwise the default `$GIT_DIR/objects`
|
||||
directory is used.
|
||||
|
||||
Running 'git init' in an existing repository is safe. It will not
|
||||
overwrite things that are already there. The primary reason for
|
||||
rerunning 'git init' is to pick up newly added templates (or to move
|
||||
the repository to another place if --separate-git-dir is given).
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
||||
|
|
@ -31,6 +54,16 @@ current working directory.
|
|||
Specify the directory from which templates will be used. (See the "TEMPLATE
|
||||
DIRECTORY" section below.)
|
||||
|
||||
-L=<git dir>::
|
||||
--separate-git-dir=<git dir>::
|
||||
|
||||
Instead of initializing the repository where it is supposed to be,
|
||||
place a filesytem-agnostic git symbolic link there, pointing to the
|
||||
specified git path, and initialize a git repository at the path. The
|
||||
result is git repository can be separated from working tree. If this
|
||||
is reinitialization, the repository will be moved to the specified
|
||||
path.
|
||||
|
||||
--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
|
||||
|
||||
Specify that the git repository is to be shared amongst several users. This
|
||||
|
|
@ -74,32 +107,6 @@ line, the command is run inside the directory (possibly after creating it).
|
|||
--
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This command creates an empty git repository - basically a `.git` directory
|
||||
with subdirectories for `objects`, `refs/heads`, `refs/tags`, and
|
||||
template files.
|
||||
An initial `HEAD` file that references the HEAD of the master branch
|
||||
is also created.
|
||||
|
||||
If the `$GIT_DIR` environment variable is set then it specifies a path
|
||||
to use instead of `./.git` for the base of the repository.
|
||||
|
||||
If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY`
|
||||
environment variable then the sha1 directories are created underneath -
|
||||
otherwise the default `$GIT_DIR/objects` directory is used.
|
||||
|
||||
Running 'git init' in an existing repository is safe. It will not overwrite
|
||||
things that are already there. The primary reason for rerunning 'git init'
|
||||
is to pick up newly added templates.
|
||||
|
||||
Note that 'git init' is the same as 'git init-db'. The command
|
||||
was primarily meant to initialize the object database, but over
|
||||
time it has become responsible for setting up the other aspects
|
||||
of the repository, such as installing the default hooks and
|
||||
setting the configuration variables. The old name is retained
|
||||
for backward compatibility reasons.
|
||||
|
||||
TEMPLATE DIRECTORY
|
||||
------------------
|
||||
|
||||
|
|
@ -134,15 +141,6 @@ $ git add . <2>
|
|||
<1> prepare /path/to/my/codebase/.git directory
|
||||
<2> add all existing file to the index
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -84,14 +84,6 @@ If the configuration variable 'instaweb.browser' is not set,
|
|||
'web.browser' will be used instead if it is defined. See
|
||||
linkgit:git-web{litdd}browse[1] for more information about this.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Eric Wong <normalperson@yhbt.net>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Eric Wong <normalperson@yhbt.net>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ OPTIONS
|
|||
|
||||
-<n>::
|
||||
Limits the number of commits to show.
|
||||
Note that this is a commit limiting option, see below.
|
||||
|
||||
<since>..<until>::
|
||||
Show only commits between the named two commits. When
|
||||
|
|
@ -72,16 +73,16 @@ produced by --stat etc.
|
|||
to be prefixed with "\-- " to separate them from options or
|
||||
refnames.
|
||||
|
||||
Common diff options
|
||||
~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
:git-log: 1
|
||||
include::diff-options.txt[]
|
||||
|
||||
include::rev-list-options.txt[]
|
||||
|
||||
include::pretty-formats.txt[]
|
||||
|
||||
Common diff options
|
||||
-------------------
|
||||
|
||||
:git-log: 1
|
||||
include::diff-options.txt[]
|
||||
|
||||
include::diff-generate-patch.txt[]
|
||||
|
||||
Examples
|
||||
|
|
@ -181,14 +182,6 @@ This setting can be disabled by the `--no-standard-notes` option,
|
|||
overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
|
||||
and supplemented by the `--show-notes` option.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -67,15 +67,6 @@ $ git rev-parse not-lost-anymore
|
|||
1ef2b196d909eed523d4f3c9bf54b78cdd6843c6
|
||||
------------
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -209,15 +209,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-read-tree[1], linkgit:gitignore[5]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git ls-remote' [--heads] [--tags] [-u <exec> | --upload-pack <exec>]
|
||||
<repository> <refs>...
|
||||
<repository> [<refs>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -67,10 +67,6 @@ EXAMPLES
|
|||
c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
|
||||
7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -95,18 +95,6 @@ Object size identified by <object> is given in bytes, and right-justified
|
|||
with minimum width of 7 characters. Object size is given only for blobs
|
||||
(file) entries; for other entries `-` character is used in place of size.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Petr Baudis <pasky@suse.cz>
|
||||
Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>,
|
||||
another major rewrite by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list
|
||||
<git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -80,17 +80,6 @@ This can enabled by default with the configuration option mailinfo.scissors.
|
|||
<patch>::
|
||||
The patch extracted from e-mail.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org> and
|
||||
Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -46,16 +46,6 @@ OPTIONS
|
|||
--keep-cr::
|
||||
Do not remove `\r` from lines ending with `\r\n`.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
and Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -102,14 +102,6 @@ both '1' and '2' are merge-bases of A and B. Neither one is better than
|
|||
the other (both are 'best' merge bases). When the `--all` option is not given,
|
||||
it is unspecified which best one is output.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
See also
|
||||
--------
|
||||
linkgit:git-rev-list[1],
|
||||
|
|
|
|||
|
|
@ -86,17 +86,6 @@ git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345::
|
|||
merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
|
||||
`a` and `c` instead of `tmp/a123` and `tmp/c345`.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Johannes Schindelin <johannes.schindelin@gmx.de>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
|
||||
with parts copied from the original documentation of RCS 'merge'.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -73,15 +73,6 @@ merge once anything has returned an error (i.e., `cat` returned an error
|
|||
for the AA file, because it didn't exist in the original, and thus
|
||||
'git merge-index' didn't even try to merge the MM thing).
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
One-shot merge by Petr Baudis <pasky@ucw.cz>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -15,15 +15,6 @@ DESCRIPTION
|
|||
This is the standard helper program to use with 'git merge-index'
|
||||
to resolve a merge after the trivial merge done with 'git read-tree -m'.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>,
|
||||
Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -23,14 +23,6 @@ merge results outside of the index, and stuff the results back into the
|
|||
index. For this reason, the output from the command omits
|
||||
entries that match the <branch1> tree.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ SYNOPSIS
|
|||
[verse]
|
||||
'git merge' [-n] [--stat] [--no-commit] [--squash]
|
||||
[-s <strategy>] [-X <strategy-option>]
|
||||
[--[no-]rerere-autoupdate] [-m <msg>] <commit>...
|
||||
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
|
||||
'git merge' <msg> HEAD <commit>...
|
||||
'git merge' --abort
|
||||
|
||||
|
|
@ -95,8 +95,13 @@ commit or stash your changes before running 'git merge'.
|
|||
|
||||
<commit>...::
|
||||
Commits, usually other branch heads, to merge into our branch.
|
||||
You need at least one <commit>. Specifying more than one
|
||||
<commit> obviously means you are trying an Octopus.
|
||||
Specifying more than one commit will create a merge with
|
||||
more than two parents (affectionately called an Octopus merge).
|
||||
+
|
||||
If no commit is given from the command line, and if `merge.defaultToUpstream`
|
||||
configuration variable is set, merge the remote tracking branches
|
||||
that the current branch is configured to use as its upstream.
|
||||
See also the configuration section of this manual page.
|
||||
|
||||
|
||||
PRE-MERGE CHECKS
|
||||
|
|
@ -312,15 +317,6 @@ linkgit:git-diff[1], linkgit:git-ls-files[1],
|
|||
linkgit:git-add[1], linkgit:git-rm[1],
|
||||
linkgit:git-mergetool[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -41,14 +41,6 @@ run_merge_tool::
|
|||
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
|
||||
for use by the merge tool.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by David Aguilar <davvid@gmail.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ OPTIONS
|
|||
--tool=<tool>::
|
||||
Use the merge resolution program specified by <tool>.
|
||||
Valid merge tools are:
|
||||
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
|
||||
diffuse, tortoisemerge, opendiff, p4merge and araxis.
|
||||
araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
|
||||
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
|
||||
+
|
||||
If a merge resolution program is not specified, 'git mergetool'
|
||||
will use the configuration variable `merge.tool`. If the
|
||||
|
|
@ -82,14 +82,6 @@ Setting the `mergetool.keepBackup` configuration variable to `false`
|
|||
causes `git mergetool` to automatically remove the backup as files
|
||||
are successfully merged.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Theodore Y Ts'o <tytso@mit.edu>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Theodore Y Ts'o.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -32,15 +32,6 @@ exists, is separated by a blank line from the header. The
|
|||
message part may contain a signature that git itself doesn't
|
||||
care about, but that can be verified with gpg.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -34,14 +34,6 @@ OPTIONS
|
|||
optional. Note - if the '-z' option is used, lines are terminated
|
||||
with NUL.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -39,17 +39,6 @@ OPTIONS
|
|||
--dry-run::
|
||||
Do nothing; only show what would happen
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
Rewritten by Ryan Anderson <ryan@michonline.com>
|
||||
Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -70,15 +70,6 @@ Another nice thing you can do is:
|
|||
% git log | git name-rev --stdin
|
||||
------------
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Johannes Schindelin.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ base-name::
|
|||
|
||||
--honor-pack-keep::
|
||||
This flag causes an object already in a local pack that
|
||||
has a .keep file to be ignored, even if it it would have
|
||||
has a .keep file to be ignored, even if it would have
|
||||
otherwise been packed.
|
||||
|
||||
--incremental::
|
||||
|
|
@ -190,15 +190,20 @@ self-contained. Use `git index-pack --fix-thin`
|
|||
(see linkgit:git-index-pack[1]) to restore the self-contained property.
|
||||
|
||||
--delta-base-offset::
|
||||
A packed archive can express base object of a delta as
|
||||
either 20-byte object name or as an offset in the
|
||||
stream, but older version of git does not understand the
|
||||
A packed archive can express the base object of a delta as
|
||||
either a 20-byte object name or as an offset in the
|
||||
stream, but ancient versions of git don't understand the
|
||||
latter. By default, 'git pack-objects' only uses the
|
||||
former format for better compatibility. This option
|
||||
allows the command to use the latter format for
|
||||
compactness. Depending on the average delta chain
|
||||
length, this option typically shrinks the resulting
|
||||
packfile by 3-5 per-cent.
|
||||
+
|
||||
Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]),
|
||||
`git repack` (see linkgit:git-repack[1]) pass this option by default
|
||||
in modern git when they put objects in your repository into pack files.
|
||||
So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
|
||||
|
||||
--threads=<n>::
|
||||
Specifies the number of threads to spawn when searching for best
|
||||
|
|
@ -219,15 +224,6 @@ self-contained. Use `git index-pack --fix-thin`
|
|||
With this option, parents that are hidden by grafts are packed
|
||||
nevertheless.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation by Junio C Hamano
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-rev-list[1]
|
||||
|
|
|
|||
|
|
@ -38,14 +38,6 @@ OPTIONS
|
|||
--verbose::
|
||||
Outputs some statistics to stderr. Has a small performance penalty.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Lukas Sandström <lukass@etek.chalmers.se>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Lukas Sandström <lukass@etek.chalmers.se>
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-pack-objects[1]
|
||||
|
|
|
|||
|
|
@ -56,11 +56,6 @@ a repository with many branches of historical interests.
|
|||
The command usually removes loose refs under `$GIT_DIR/refs`
|
||||
hierarchy after packing them. This option tells it not to.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -17,14 +17,6 @@ routines to parse files under $GIT_DIR/remotes/ and
|
|||
$GIT_DIR/branches/ and configuration variables that are related
|
||||
to fetching, pulling and pushing.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -29,14 +29,6 @@ OPTIONS
|
|||
<patch>::
|
||||
The diff to create the ID of.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -37,14 +37,6 @@ OPTIONS
|
|||
The repository to sync from.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -36,14 +36,6 @@ OPTIONS
|
|||
--quiet::
|
||||
Squelch the progress indicator.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Ryan Anderson <ryan@michonline.com>
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-pack-objects[1]
|
||||
|
|
|
|||
|
|
@ -78,14 +78,6 @@ linkgit:git-fsck[1],
|
|||
linkgit:git-gc[1],
|
||||
linkgit:git-reflog[1]
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ must be given before the options meant for 'git fetch'.
|
|||
--verbose::
|
||||
Pass --verbose to git-fetch and git-merge.
|
||||
|
||||
--[no-]recurse-submodules::
|
||||
--[no-]recurse-submodules[=yes|on-demand|no]::
|
||||
This option controls if new commits of all populated submodules should
|
||||
be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
|
||||
That might be necessary to get the data needed for merging submodule
|
||||
|
|
@ -220,22 +220,19 @@ If you tried a pull which resulted in a complex conflicts and
|
|||
would want to start over, you can recover with 'git reset'.
|
||||
|
||||
|
||||
BUGS
|
||||
----
|
||||
Using --recurse-submodules can only fetch new commits in already checked
|
||||
out submodules right now. When e.g. upstream added a new submodule in the
|
||||
just fetched commits of the superproject the submodule itself can not be
|
||||
fetched, making it impossible to check out that submodule later without
|
||||
having to do a fetch again. This is expected to be fixed in a future git
|
||||
version.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
and Junio C Hamano <gitster@pobox.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Jon Loeliger,
|
||||
David Greaves,
|
||||
Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -406,16 +406,6 @@ Commits A and B would no longer belong to a branch with a symbolic name,
|
|||
and so would be unreachable. As such, these commits would be removed by
|
||||
a `git gc` command on the origin repository.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C
|
||||
by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -49,14 +49,6 @@ The default for the patch directory is patches
|
|||
or the value of the $QUILT_PATCHES environment
|
||||
variable.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Eric Biederman <ebiederm@lnxi.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Eric Biederman <ebiederm@lnxi.com>
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -421,15 +421,6 @@ SEE ALSO
|
|||
linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
|
||||
linkgit:gitignore[5]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -66,8 +66,9 @@ would be:
|
|||
D---E---F---G master
|
||||
------------
|
||||
|
||||
The latter form is just a short-hand of `git checkout topic`
|
||||
followed by `git rebase master`.
|
||||
*NOTE:* The latter form is just a short-hand of `git checkout topic`
|
||||
followed by `git rebase master`. When rebase exits `topic` will
|
||||
remain the checked-out branch.
|
||||
|
||||
If the upstream branch already contains a change you have made (e.g.,
|
||||
because you mailed a patch which was applied upstream), then that commit
|
||||
|
|
@ -658,7 +659,6 @@ The ripple effect of a "hard case" recovery is especially bad:
|
|||
'everyone' downstream from 'topic' will now have to perform a "hard
|
||||
case" recovery too!
|
||||
|
||||
|
||||
BUGS
|
||||
----
|
||||
The todo list presented by `--preserve-merges --interactive` does not
|
||||
|
|
@ -681,15 +681,6 @@ by moving the "pick 4" line will result in the following history:
|
|||
1 --- 2 --- 4 --- 5
|
||||
------------
|
||||
|
||||
Authors
|
||||
------
|
||||
Written by Junio C Hamano <gitster@pobox.com> and
|
||||
Johannes E. Schindelin <johannes.schindelin@gmx.de>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
|
|
@ -151,15 +151,6 @@ SEE ALSO
|
|||
--------
|
||||
linkgit:git-send-pack[1]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue