aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Remove "octopus".Junio C Hamano2005-12-19
| | | | | | | | | We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: stdout of update-hook is connected to /dev/nullJunio C Hamano2005-12-19
| | | | | | Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-archimport: document -o, -a, f, -D optionsEric Wong2005-12-19
| | | | | | | Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* howto/using-topic-branches: Recommend public URL git://git.kernel.org/Junio C Hamano2005-12-19
| | | | | | | Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: typos and small fixes in "everyday".Junio C Hamano2005-12-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* fetch-pack: -k option to keep downloaded pack.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: HTTP needs update-server-info.Junio C Hamano2005-12-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Forbid pattern maching characters in refnames.Junio C Hamano2005-12-16
| | | | | | by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Examples of resetting.Junio C Hamano2005-12-16
| | | | | | | | | | | Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: tutorialJunio C Hamano2005-12-14
| | | | | | | At the beginning of tutorial, refer the reader to everyday if she has not done so yet. Signed-off-by: Junio C Hamano <junkio@cox.net>
* clone-pack: make it usable for partial branch cloning.Junio C Hamano2005-12-14
| | | | | | | | | | | | | | | | clone-pack had some logic to accept subset of remote refs from the command line and clone from there. However, it was never used in practice and its problems were not found out so far. This commit changes the command to output the object names of refs to the standard output instead of making a clone of the remote repository when explicit <head> parameters are given; the output format is the same as fetch-pack. The traditional behaviour of cloning the whole repository by giving no explicit <head> parameters stays the same. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'hold/am'Junio C Hamano2005-12-14
|\
| * git-am support for naked email messages (take 2)H. Peter Anvin2005-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows git-am to accept single-message files as well as mboxes. Unlike the previous version, this one doesn't need to be explicitly told which one it is; rather, it looks to see if the first line is a From line and uses it to select mbox mode or not. I moved the logic to do all this into git-mailsplit, which got a new user interface as result, although the old interface is still available for backwards compatibility. [jc: applied with two obvious fixes.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: topic branchesJunio C Hamano2005-12-14
|/ | | | | | | | | | Recommend git over ssh direct to master.kernel.org, instead of going over rsync to public machines, since this is meant to be a procedure for kernel subsystem maintainers. Also fix an obvious typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Everyday: a bit more examples.Junio C Hamano2005-12-14
| | | | | | | | | | | | Talk about the following as well: * git fetch --tags * Use of "git push" as a one-man distributed development vehicle. * Show example of remotes file for pulling and pushing. * Annotate git-shell setup. * Using Carl's update hook in a CVS-style shared repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: not learning core git commands.Junio C Hamano2005-12-13
| | | | | | | | | | | | | | | | | | | | | | The initial section of tutorial was too heavy on internal workings for the first-time readers, so rewrite the introductory section of git(7) to start with "not learning core git commands" section and refer them to README to grasp the basic concepts, then Everyday to give overview with task/role oriented examples for minimum set of commands, and finally the tutorial. Also add to existing note in the tutorial that many too technical descriptions can be skipped by a casual reader. I initially started to review the tutorial, with the objective of ripping out the detailed technical information altogether, but I found that the level of details in the initial couple of sections that talk about refs and the object database in a hands-on fashion was about rigth, and left all of them there. I feel that reading about fsck-index and repack is too abstract without being aware of these directories and files. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: diff examples.Junio C Hamano2005-12-13
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: fix missing links to git(7)Junio C Hamano2005-12-12
| | | | | | Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: more examples.Junio C Hamano2005-12-12
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Everyday: a bit more example.Junio C Hamano2005-12-12
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Everyday: some examples.Junio C Hamano2005-12-12
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Allow saving an object from a pipeDaniel Barkalow2005-12-10
| | | | | | | | In order to support getting data into git with scripts, this adds a --stdin option to git-hash-object, which will make it read from stdin. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Link Everyday GIT to main documentation tree.Junio C Hamano2005-12-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Everyday GIT with 20 commandsJunio C Hamano2005-12-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-prune: never lose objects reachable from our refs.Junio C Hamano2005-12-08
| | | | | | | | | | | | | Explicit <head> arguments to git-prune replaces, instead of extends, the list of heads used for reachability analysis by fsck-objects. By giving a subset of heads by mistake, objects reachable only from other heads can be removed, resulting in a corrupted repository. This commit stops replacing the list of heads, and makes the command line arguments to add to them instead for safety. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-pruneJunio C Hamano2005-12-08
| | | | | | | | | Not replacing but always including our own refs may be more desirable (and unarguably much safer), but at the same time I have a suspicion that that might be forbidding a useful usage I haven't thought of, so... Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should ↵Nikolai Weibull2005-12-08
| | | | | | | come before OPTIONS). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-update-server-info.txt: Add -f alias for --force to ↵Nikolai Weibull2005-12-08
| | | | | | | documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-http-fetch.txt: Document the commit-id argument.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-repack.txt: Add -l and -n.Nikolai Weibull2005-12-08
| | | | | | | This adds documentation for the -l and -n options to git-repack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-ls-remote.txt: Add -h and -t.Nikolai Weibull2005-12-08
| | | | | | | -h and -t are aliases for --heads and --tags to git-ls-remote. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-format-patch.txt: Add --signoff, --check, and long ↵Nikolai Weibull2005-12-08
| | | | | | | | | | | | option-names. The documentation was lacking descriptions for the --signoff and --check options to git-format-patch. It was also missing the following long option-names: --output-directory (-o), --numbered (-n), --keep-subject (-k), --author (-a), --date (-d), and --mbox (-m). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for the --topo-order option to git-show-branch.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for git-revert and git-cherry-pick.Nikolai Weibull2005-12-08
| | | | | | | | | | * Added the -e option to the documentation of git-cherry-pick. * Added the -e and --no-commit option to git-revert. * Removed redundant case expression for -n as --no-edit (already taken by --no-commit). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-cherry-pick: Add --replay and --no-commit.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-verify-pack.txt: added documentation for --.Nikolai Weibull2005-12-08
| | | | | | | The -- option has been added to the documentation of git-verify-pack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-commit.txt: Add long options and -- to documentation.Nikolai Weibull2005-12-08
| | | | | | | | | | | | | | | Added the following long options to documentation: * --all * --signoff * --verify * --no-verify * --edit Also added documentation for the -- option for terminating option parsing. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use uniform description for the '--' option.Nikolai Weibull2005-12-08
| | | | | | | | All descriptions of the '--' option were the same except for that in Documentation/git-merge-index.txt. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix the description of --utf8 and --keep to git-am.Nikolai Weibull2005-12-08
| | | | | | | | The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the --non-empty command-line option to git-pack-objects.Nikolai Weibull2005-12-08
| | | | | | | | This provides (minimal) documentation for the --non-empty command-line option to the pack-objects command. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-08
| | | | | | We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(tutorial): adjust merge example to the new merge world order.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(cvs-migration): minor cleanups.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(glossary): minor formatting clean-ups.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git.html/git.7Junio C Hamano2005-12-07
| | | | | | | | | Finish each sentence with a full stop. Instead of saying 'directory index' 'directory cache' etc, consistently say 'index'. Signed-off-by: Junio C Hamano <junkio@cox.net>
* update-index: allow --index-info to add higher stages.Junio C Hamano2005-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new merge world order tells the merge strategies to leave the cache unmerged and store the automerge result in the working tree if automerge is not clean. This was done for the resolve strategy and recursive strategy when no rename is involved, but recording a conflicting merge in the rename case could not easily be done by the recursive strategy. This commit adds a new input format, in addition to the exsting two, to "update-index --index-info". (1) mode SP sha1 TAB path The first format is what "git-apply --index-info" reports, and used to reconstruct a partial tree that is used for phony merge base tree when falling back on 3-way merge. (2) mode SP type SP sha1 TAB path The second format is to stuff git-ls-tree output into the index file. (3) mode SP sha1 SP stage TAB path This format is to put higher order stages into the index file and matches git-ls-files --stage output. To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the (3) format. For example, starting with this index: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz $ git update-index --index-info ;# interactive session -- input follows... 0 0000000000000000000000000000000000000000 frotz 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz The first line of the input feeds 0 as the mode to remove the path; the SHA1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz This completes the groundwork for the new merge world order. Signed-off-by: Junio C Hamano <junkio@cox.net>
* checkout-index: allow checking out from higher stages.Junio C Hamano2005-12-07
| | | | | | | | The new option, --stage=<n>, lets you copy out from an unmerged, higher stage. This is to help the new merge world order during a nontrivial merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentaiton (read-tree): update description of 3-wayJunio C Hamano2005-12-05
| | | | | | | | The merge-one-file used to leave the working tree intact, but it has long been changed to leave the merge result there since 2a68a8659f7dc55fd285d235ae2d19e7a8116c30 commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 04:46:49 +0000