aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Remove the version tags from the manpagesJunio C Hamano2005-10-10
| | | | | Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fixes'Junio C Hamano2005-10-09
|\ | | | | | | | | | | with minor hand resolving on git-tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-tag: update usage string and documentation.Junio C Hamano2005-10-09
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | make $prefix available for sub-makefilesKai Ruemmler2005-10-08
| | | | | | | | | | | | | | exports $prefix and makes Documentation/Makefile following it also. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-10-07
|\ \ | |/
| * s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txtKai Ruemmler2005-10-07
| | | | | | | | | | | | | | | | This updates last place where checkout-cache gets mentioned wrongly for checkout-index. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | mailsplit: allow feeding mbox from standard input.Junio C Hamano2005-10-06
| | | | | | | | | | | | | | When mbox argument is missing, read the mailbox from the standard input. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Describe new options to git-format-patch and git-mailsplit.Junio C Hamano2005-10-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fall back to three-way merge when applying a patch.Junio C Hamano2005-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After git-apply fails, attempt to find a base tree that the patch cleanly applies to, and do a three-way merge using that base tree into the current index, if .dotest/.3way file exists. This flag can be controlled by giving -m flag to git-applymbox command. When the fall-back merge fails, the working tree can be resolved the same way as you would normally hand resolve a conflicting merge. When making commit, use .dotest/final-commit as the log message template. Or you could just choose to 'git-checkout-index -f -a' to revert the failed merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Allow "-u" flag to tag signingLinus Torvalds2005-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current "git tag -s" thing always uses the tagger name as the signing user key, which is very irritating, since my key is under my email address, but the tagger key obviously contains the actual machine name too. Now, I could just use "GIT_COMMITTER_EMAIL" and force it to be my real email, but I actually think that it's nice to see which machine I use for my work. So rather than force my tagger ID to have to match the gpg key name, just support the "-u" flag to "git tag" instead. It implicitly enables signing, since it doesn't make any sense without it. Thus: git tag -u <gpg-key-name> <tag-name> [<tagged-object>] will use the named gpg key for signing. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-10-05
|\ \ | |/
| * Fix usage of carets in git-rev-parse(1)Jonas Fonseca2005-10-05
| | | | | | | | | | | | | | ... but using a {caret} attribute. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Some typos and light editing of various manpagesChristian Meder2005-10-05
| | | | | | | | | | | | | | Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply: retire unused/unimplemented --no-merge flag.Junio C Hamano2005-10-04
|/ | | | | | | | The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add missing documentation.Junio C Hamano2005-10-04
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Random documentation fixesJonas Fonseca2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Update git-clone documentationEric W. Biederman2005-10-02
| | | | | | | | | The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Teach git-ls-files about '--' to denote end of options.Fredrik Kuivinen2005-10-02
| | | | | | | Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* update-index: document --stdin and -zJunio C Hamano2005-09-27
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Diff: --name-status output format.Junio C Hamano2005-09-24
| | | | | | The new output format shows only the status letter and paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Diff: -l<num> to limit rename/copy detection.Junio C Hamano2005-09-24
| | | | | | | | When many paths are modified, rename detection takes a lot of time. The new option -l<num> can be used to disable rename detection when more than <num> paths are possibly created as renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-09-24
| | | | | | | | Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-daemon --syslog to log through syslogPetr Baudis2005-09-24
| | | | | | | | | | | | Well, this makes it even more clear that we need the packet reader and friends to use the daemon logging code. :/ Therefore, we at least indicate in the "Disconnect" log message if the child process exitted with an error code or not. Idea by Linus. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Update git-daemon documentation wrt. the --verbose parameterPetr Baudis2005-09-24
| | | | | Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge 'fixes' branch.Junio C Hamano2005-09-23
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] document command to show diff of a commitRobert Watson2005-09-23
| | | | | | | | | | | | | | Document the best way to show the change introduced by a commit, based on the suggestion by Linus on the list. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Retitle 'inspecting what happened' section.Jon Loeliger2005-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | In the tutorial, there is a section entitled "Checking it out" that shows how to use diff log and whatchanged to insect some of the repository state. As the phrase "checkout" ususally carries some baggage WRT other revision control mechanism, I suggest that we re-title this section something like "Inspecting Changes". Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire diff-helper.Junio C Hamano2005-09-22
| | | | | | | | | | | | | | The textual diff generation with built-in '-p' in diff-* brothers has proven to be useful enough that git-diff-helper outlived its usefulness. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire rev-tree.Junio C Hamano2005-09-22
| | | | | | | | | | | | | | | | Some old scripts might still use git-rev-tree, but it really is clearly inferior in every way to git-rev-list that such scripts should be fixed anyway. Fixing them should be pretty easy. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire git-export.Junio C Hamano2005-09-22
| | | | | | | | | | | | | | | | | | | | | | | | git-export was done as a concept example on how easy it is to export the git data to something else. It's much less powerful than any number of trivial one-liner scripts now, and real exporters would not ever use git-export. It's obviously much less powerful than "git-whatchanged", or just about any combination of git-rev-list + git-diff-tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-09-21
|\ \ | |/
| * Fix documentation dependency.Junio C Hamano2005-09-21
| | | | | | | | | | | | | | | | | | | | | | Randal L. Schwartz noticed that 'make install' does not rebuild what is installed. Make the 'install' rule depend on 'man'. I noticed also 'touch' of the source files were used to express include dependencies, which is a no-no. Rewrite it to do dependencies properly, and add missing include dependencies while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update tutorial with Octopus usage.Junio C Hamano2005-09-21
| | | | | | | | | | | | | | Making an Octopus is simply a natural extension of merging just one branch into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Show modified files in git-ls-filesJunio C Hamano2005-09-20
| | | | | | | | | | | | | | | | | | | | Add -m/--modified to show files that have been modified wrt. the index. [jc: The original came from Brian Gerst on Sep 1st but it only checked if the paths were cache dirty without actually checking the files were modified. I also added the usage string and a new test.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document -i flag to git-read-treeJunio C Hamano2005-09-20
| | | | | | | | | | | | | | | | Somehow I missed it when we updated read-tree to support the recursive merge strategy. Also -i should require -m as well, which the command did not check. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov2005-09-20
| | | | | | | | | | | | | | | | | | | | | | | | The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/*.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/*.txt Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Documentation: Add asciidoc.conf file and gitlink: macroSergey Vlasov2005-09-20
|/ | | | | | | | | | | | Introduce an asciidoc.conf file with the purpose of adding a gitlink: macro which will improve the manpage output. Original cogito patch by Jonas Fonseca <fonseca@diku.dk>; asciidoc.conf from that patch was further enhanced to use the proper DocBook tag <citerefentry> for references to man pages. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Arrgh -- another asciidoc caret workaround.Junio C Hamano2005-09-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document extended SHA1 used by git-rev-parse.Junio C Hamano2005-09-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] PATCH Documentation/git-rev-list.txt typo fixPeter Hagervall2005-09-16
| | | | | | | | | | | | An earlier commit causes a mismatch in <emphasis> and <superscript> tags, one way of fixing it is having no more than one caret symbol per line, which is the only solution I found in the asciidoc documentation. Ugly, but it works. [jc: ugly indeed but that is not Peter's fault.] Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Documentation/git-rev-list.txt typo fixjdl@freescale.com2005-09-15
| | | | | | | Fix the "superscript" problem on the git-rev-list doc page. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Document git-fetch optionsSergey Vlasov2005-09-15
| | | | | | Add documentation for git-fetch options Signed-off-by: Junio C Hamano <junkio@cox.net>
* Retire info/rev-cacheJunio C Hamano2005-09-15
| | | | | | | It was one of those things that were well intentioned but did not turn out to be useful in practice. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Use '-d' as the first flag to 'install'Peter Eriksen2005-09-15
| | | | | | | | | ... in order to please Solaris 'install'. GNU install is not harmed with this. [jc: Documentation/Makefile also fixed.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-grep and link it from the main git(7) page.Junio C Hamano2005-09-12
| | | | | | Also adjust missing description in the git.txt page while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] archimport documentation tidyupmartin@catalyst.net.nz2005-09-11
| | | | | | | New "merges" headline, clarified some parts that were not easy to understand. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] archimport documentation updatemartin@catalyst.net.nz2005-09-11
| | | | | | | | Updated and expanded the command description, and added a reference of the command line options. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Escape asciidoc's built-in em-dash replacementYasushi SHOJI2005-09-11
| | | | | | | | | | | | | AsciiDoc replace '--' with em-dash (&#8212) by default. em-dash looks a lot like a single long dash and it's very confusing when we are talking about command options. Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a backslash in front of double dash prevent the replacement. This patch does just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* 'git-merge': Documentation.Junio C Hamano2005-09-10
| | | | | | ... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-10
| | | | | Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 10:29:49 +0000