- 06 2月, 2014 1 次提交
-
-
由 Øystein Walle 提交于
Signed-off-by: NØystein Walle <oystwa@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 9月, 2013 1 次提交
-
-
由 Sebastian Schuberth 提交于
AsciiDoc's "link" is supposed to create hyperlinks for HTML output, so prefer a "link" to point to an HTML file instead of a text file if an HTML version of the file is being generated. For RelNotes, keep pointing to text files as no equivalent HTML files are generated. If appropriate, also update the link description to not contain the linked file's extension. Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 8月, 2013 11 次提交
-
-
由 Thomas Ackermann 提交于
"git prune" is safe in case of concurrent accesses to a repository but using it in such a case is not recommended. Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Sorry Jon, but this might not be of any help to new Git users ;) Acked-by: NJon Loeliger <jdl@jdl.com> Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Add some missing punctuation. Simplify description of "git branch -d/-D". Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Combine the two cases for "git add" into one. Add verb "use" to "git rm" case. Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
"git pull ." works, but "git merge" is the recommended way for new users to do things. (The old description also should have read "The former is actually *not* very commonly used".) Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 7月, 2013 1 次提交
-
-
由 Ondřej Bílka 提交于
The name marc.theaimsgroup.com is no longer active, and has migrated to marc.info. Signed-off-by: NOndřej Bílka <neleai@seznam.cz> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 6月, 2013 1 次提交
-
-
由 Kevin Bracey 提交于
git am was previously modified to provide --continue for consistency with rebase, merge etc, and the documentation changed to showing --continue as the primary form. Complete the work by replacing remaining uses of --resolved by --continue, most notably in suggested command reminders. Signed-off-by: NKevin Bracey <kevin@bracey.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 6月, 2013 3 次提交
-
-
由 W. Trevor King 提交于
They've grown since d19fbc3c (Documentation: add git user's manual, 2007-01-07) when the stats were initially added. I've rounded download sizes up to the nearest multiple of ten MiB to decrease the precision and give a bit of growing room. Exact sizes: $ git clone git://git.kernel.org/pub/scm/git/git.git Initialized empty Git repository in /tmp/git/.git/ remote: Counting objects: 156872, done. remote: Compressing objects: 100% (40826/40826), done. remote: Total 156872 (delta 115322), reused 155492 (delta 114094) Receiving objects: 100% (156872/156872), 37.29 MiB | 7.54 MiB/s, done. Resolving deltas: 100% (115322/115322), done. $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Initialized empty Git repository in /tmp/linux/.git/ remote: Counting objects: 3057404, done. remote: Compressing objects: 100% (474769/474769), done. Receiving objects: 100% (3057404/3057404), 634.33 MiB | 27.95 MiB/s, done. remote: Total 3057404 (delta 2570385), reused 3040910 (delta 2554408) Resolving deltas: 100% (2570385/2570385), done. Checking out files: 100% (43012/43012), done. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
The 3.x tree has been out for a while now. The -2.6 repository name survived the initial release [1], but kernel.org now only lists 'linux.git' (for aegl as well as torvalds) [2]. [1]: http://article.gmane.org/gmane.linux.kernel/1147422 On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote: > ... yes, that means that my git tree is still called > "linux-2.6.git" on kernel.org. [2]: http://git.kernel.org/cgit/Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
linux-nfs.org seems to have restructured their repository layout since 8391c60b (git-remote.txt: fix example url, 2007-11-02), and Bruce's repo is now at git://git.linux-nfs.org/projects/bfields/linux.git. Bruce also has a more richer internal branch structure (master, everything, for-3.1, ...), so updating the existing example to use his current repo may be confusing. To simplify, I've replaced the NFS repo with Greg's staging repo. I've also updated the output of the surrounding commands to match the output of a current run through. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 19 6月, 2013 1 次提交
-
-
由 Phil Hord 提交于
Documentation and some comments still refer to files in builtin/ as 'builtin-*.[cho]'. Update these to show the correct location. Signed-off-by: NPhil Hord <hordp@cisco.com> Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Assisted-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 26 2月, 2013 1 次提交
-
-
由 W. Trevor King 提交于
I tried to always use backticks for: * Paths and filenames (e.g. `.git/config`) * Compound refs (e.g. `origin/HEAD`) * Git commands (e.g. `git log`) * Command arguments (e.g. `--pretty`) * URLs (e.g. `git://`), as a subset of command arguments * Special characters (e.g. `+` in diffs). * Config options (e.g. `branch.<name>.remote`) Branch and tag names are sometimes set off with double quotes, sometimes set off with backticks, and sometimes left bare. I tried to judge when the intention was introducing new terms or conventions (double quotes), to reference a recently used command argument (backticks), or to reference the abstract branch/commit (left bare). Obviously these are not particularly crisp definitions, so my decisions are fairly arbitrary ;). When a reference had already been introduced, I changed further double-quoted instances to backticked instances. When new backticks increased the length of a line beyond others in that block, I re-wrapped blocks to 72 columns. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 25 2月, 2013 1 次提交
-
-
由 David Aguilar 提交于
Make the usage string in the example script consistent with Git. Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 2月, 2013 3 次提交
-
-
由 W. Trevor King 提交于
If you try and update a submodule with a dirty working directory, you get an error message like: $ git submodule update error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting ... Mention this in the submodule notes. The previous phrase was short enough that I originally thought it might have been referring to the reflog note (obviously, uncommitted changes will not show up in the reflog either ;). Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
Less work and more error checking (e.g. does a merge base exist?). Add an explicit push before request-pull to satisfy request-pull, which checks to make sure the references are publically available. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
I think this interface is often more convenient than extended cherry picking or using 'git format-patch'. In fact, I removed the cherry-pick section entirely. The entry-level suggestions for rerolling are now: 1. git commit --amend 2. git format-patch origin git reset --hard origin ...edit and reorder patches... git am *.patch 3. git rebase -i origin Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 19 2月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
Noticed by Drew Northup Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 2月, 2013 5 次提交
-
-
由 W. Trevor King 提交于
This functionality was introduced by 0e804e09 (archive: provide builtin .tar.gz filter, 2011-07-21) for v1.7.7. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
A simple command line call is easier than spawning an editor, especially for folks new to ideas like the "command line" and "text editors". This is also the approach suggested by 'git commit' if you try and commit without having configured user.name or user.email. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
I hardly ever setup remote.<name>.url using 'git config'. While it may be instructive to do so, we should also point out 'git remote add'. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
This mirrors existing language in the description of 'git fetch'. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
There is no need to use here documents to setup this configuration. It is easier, less confusing, and more robust to use `git remote add` directly. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 2月, 2013 1 次提交
-
-
由 W. Trevor King 提交于
acd2a45b (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs. 7d182f52 (Documentation: receive.denyCurrentBranch defaults to 'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to update the user manual. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 2月, 2013 4 次提交
-
-
由 W. Trevor King 提交于
This should have happened back in 2007, when `git gc` learned about auto (e9831e83, git-gc --auto: add documentation, 2007-09-17). Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
Use an em-dash, not a hyphen, to join these clauses. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
HTTP is an acronym which has not (yet) made the transition to word status (unlike "laser", probably because lasers are inherently cooler than HTTP ;). Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
The clause "so `git log ...` will return no commits..." is independent, not a description of "both", so a semicolon is more appropriate. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 2月, 2013 2 次提交
-
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Ackermann 提交于
In the earlier days, we used to spell the name of the system as GIT, to simulate as if it were typeset with capital G and IT in small caps. Later we stopped doing so at around 1.6.5 days. Let's stop doing so throughout the documentation. The name to refer to the whole system (and the concept it embodies) is "Git"; the command end-users type is "git". And document this in the coding guideline. Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 26 10月, 2012 1 次提交
-
-
由 Philip Oakley 提交于
Show that git format-patch can have a cover letter, include patch commentary below the three dashes, and notes can also be included. Signed-off-by: NPhilip Oakley <philipoakley@iee.org> Signed-off-by: NJeff King <peff@peff.net>
-
- 14 9月, 2012 1 次提交
-
-
由 Jeremy White 提交于
The discussion of email subject throughout the documentation is misleading; it indicates that the first line will always become the subject. In fact, the subject is generally all lines up until the first full blank line. This patch refines that, and makes more use of the concept of a commit title, with the title being all text up to the first blank line. Signed-off-by: NJeremy White <jwhite@codeweavers.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 8月, 2012 1 次提交
-
-
由 Štěpán Němec 提交于
- (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: NŠtěpán Němec <stepnem@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-