summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2005-09-24[PATCH] Finish documenting trivial merge rulesLibravatar Daniel Barkalow1-10/+39
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>
2005-09-24[PATCH] git-daemon --syslog to log through syslogLibravatar Petr Baudis1-1/+5
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>
2005-09-24[PATCH] Update git-daemon documentation wrt. the --verbose parameterLibravatar Petr Baudis1-1/+4
Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-23Merge 'fixes' branch.Libravatar Junio C Hamano1-1/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-23[PATCH] document command to show diff of a commitLibravatar Robert Watson1-1/+4
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>
2005-09-22[PATCH] Retitle 'inspecting what happened' section.Libravatar Jon Loeliger1-2/+2
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>
2005-09-22Retire diff-helper.Libravatar Junio C Hamano3-58/+1
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>
2005-09-22Retire rev-tree.Libravatar Junio C Hamano3-93/+2
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>
2005-09-22Retire git-export.Libravatar Junio C Hamano2-34/+0
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>
2005-09-21Merge branch 'fixes'Libravatar Junio C Hamano1-3/+5
2005-09-21Fix documentation dependency.Libravatar Junio C Hamano1-3/+5
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>
2005-09-21Update tutorial with Octopus usage.Libravatar Junio C Hamano1-1/+103
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>
2005-09-20Show modified files in git-ls-filesLibravatar Junio C Hamano1-3/+6
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>
2005-09-20Document -i flag to git-read-treeLibravatar Junio C Hamano1-1/+11
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>
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroLibravatar Sergey Vlasov94-201/+201
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>
2005-09-20[PATCH] Documentation: Add asciidoc.conf file and gitlink: macroLibravatar Sergey Vlasov2-2/+23
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>
2005-09-18Arrgh -- another asciidoc caret workaround.Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-18Document extended SHA1 used by git-rev-parse.Libravatar Junio C Hamano1-0/+34
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-16[PATCH] PATCH Documentation/git-rev-list.txt typo fixLibravatar Peter Hagervall1-2/+5
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>
2005-09-15[PATCH] Documentation/git-rev-list.txt typo fixLibravatar jdl@freescale.com1-2/+2
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>
2005-09-15[PATCH] Document git-fetch optionsLibravatar Sergey Vlasov2-0/+17
Add documentation for git-fetch options Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15Retire info/rev-cacheLibravatar Junio C Hamano5-90/+0
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>
2005-09-15[PATCH] Use '-d' as the first flag to 'install'Libravatar Peter Eriksen1-1/+1
... 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>
2005-09-12Document git-grep and link it from the main git(7) page.Libravatar Junio C Hamano2-3/+53
Also adjust missing description in the git.txt page while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-11[PATCH] archimport documentation tidyupLibravatar martin@catalyst.net.nz1-4/+5
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>
2005-09-11[PATCH] archimport documentation updateLibravatar martin@catalyst.net.nz1-10/+49
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>
2005-09-11[PATCH] Escape asciidoc's built-in em-dash replacementLibravatar Yasushi SHOJI4-12/+12
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>
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano2-0/+55
... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Libravatar Daniel Barkalow1-0/+92
Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10Add 'git bisect replay/log' documentation.Libravatar Junio C Hamano1-1/+11
... lest I get yelled at by a very angry scm ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10[PATCH] Documentation/repository-layout.txt typoLibravatar Sven Verdoolaege1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09show-branch: --list and --independentLibravatar Junio C Hamano1-2/+14
The --list option is what 'git branch' without parameter should have been; it shows the one-line commit message for each branch name. The --independent option is used to filter out commits that can be reachable from other commits, to make detection of fast forward condition in multi-head merge easier. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09[PATCH] fix tutorial typoLibravatar jdl@freescale.com1-1/+1
Fix a minor typo in the tutorial.txt. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09[PATCH] Fix tutorial reference to git-*-scripts.Libravatar jdl@freescale.com1-5/+5
There was a lingering reference to the git-*-scripts in the tutorial. This patch reworks that paragraph a bit. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09Ignore datestamp-only changes when installing webdoc.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-08Show all merge-base candidates from show-branch --merge-baseLibravatar Junio C Hamano1-2/+2
This would make things easier to use for Octopus. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07Documentation updates.Libravatar Junio C Hamano4-28/+74
Fill in more missing documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07Big tool rename.Libravatar Junio C Hamano62-328/+372
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07Documentation updates.Libravatar Junio C Hamano1-12/+12
More commands are documented now; thanks Raymond. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07[PATCH] Docs for git-build-rev-cache.Libravatar A Large Angry SCM1-10/+10
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07[PATCH] Docs for git-show-rev-cache.Libravatar A Large Angry SCM1-10/+9
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07[PATCH] Docs for git-reset-script.Libravatar A Large Angry SCM1-9/+16
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07[PATCH] Docs for git-checkout-script.Libravatar A Large Angry SCM1-9/+14
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07Documentation updates.Libravatar Junio C Hamano4-18/+167
parse-remote and rev-parse gets full documentation. Add skeleton for archimport. Link them from the main git(7) page. Also move git-daemon and git-request-pull out of 'undocumented' section. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06[PATCH] Update documentation for git-get-tar-commit-idLibravatar Rene Scharfe2-15/+13
... and add a copyright notice. [jc: also move its entry in git.txt from undocumented section.] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06[PATCH] git-cvsimport-script: handling of tagsLibravatar H. Peter Anvin1-0/+3
This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06Format fix for asciidoc documentation titles.Libravatar Junio C Hamano3-4/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-05Retire git-clone-dumb-http.Libravatar Junio C Hamano2-39/+0
... and fold it into git-clone-script. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04[PATCH] Update documentation of --compose to git-send-email-script.txtLibravatar Ryan Anderson1-4/+9
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04Add a link from update-server-info documentation to repository layout.Libravatar Junio C Hamano1-2/+21
Signed-off-by: Junio C Hamano <junkio@cox.net>