aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Sync with 1.5.6.5Junio C Hamano2008-08-06
|\
| * GIT 1.5.6.5v1.5.6.5Junio C Hamano2008-08-06
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * fix diff-tree --stdin documentationJunio C Hamano2008-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long time ago, the feature of "diff-tree --stdin" to take a commit and its parents on one line was broken, and did not support the common: git rev-list --parents $commits... -- $paths... | git diff-tree --stdin -v -p usage pattern by Porcelains properly. For diff-tree to talk sensibly about commits, it needs to see commits, not just trees; the code was fixed to take list of commits on the standard input in 1.2.0. However we left the documentation stale for a long time, until Karl Hasselström finally noticed it very recently. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: typos / spelling fixesMike Ralphson2008-08-05
| | | | | | | | | | Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2008-08-05
|\ \ | |/ | | | | | | | | | | | | * maint: RelNotes 1.5.6.5 updates diff.renamelimit is a basic diff configuration git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. Documentation: typos / spelling fixes in older RelNotes
| * RelNotes 1.5.6.5 updatesJunio C Hamano2008-08-05
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation: typos / spelling fixes in older RelNotesMike Ralphson2008-08-05
| | | | | | | | | | Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix reference to Everyday Git, which is an HTML document and not a man page.Jon Jensen2008-08-02
| | | | | | | | | | Signed-off-by: Jon Jensen <jon@endpoint.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | clone: Add an option to set up a mirrorJohannes Schindelin2008-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line $ git clone --mirror $URL is now a short-hand for $ git clone --bare $URL $ (cd $(basename $URL) && git remote add --mirror origin $URL) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2008-08-02
|\ \ | |/ | | | | | | | | | | | | | | * maint: git-name-rev: allow --name-only in combination with --stdin builtin-name-rev.c: split deeply nested part from the main function Conflicts: Documentation/git-name-rev.txt
| * git-name-rev: allow --name-only in combination with --stdinPieter de Bie2008-08-02
| | | | | | | | | | Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2008-08-01
|\ \ | |/
| * Start 1.5.6.5 RelNotes to describe accumulated fixesJunio C Hamano2008-08-01
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Make git-add -i accept ranges like 7-Ciaran McCreesh2008-08-01
| | | | | | | | | | | | | | | | | | git-add -i ranges expect number-number. But for the supremely lazy, typing in that second number when selecting "from patch 7 to the end" is wasted effort. So treat an empty second number in a range as "until the last item". Signed-off-by: Ciaran McCreesh <ciaran.mccreesh@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Update my e-mail addressJunio C Hamano2008-08-01
| | | | | | | | | | | | The old cox.net address is still getting mails from gitters. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git-diff(1): "--c" -> "--cc" typo fixJonathan Nieder2008-08-01
| | | | | | | | | | | | | | git diff does not take a --c option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation: clarify diff --ccJunio C Hamano2008-08-01
| | | | | | | | | | | | The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation: fix diff.external exampleAnders Melchiorsen2008-08-01
| | | | | | | | | | | | | | | | The diff.external examples pass a flag to gnu-diff, but GNU diff does not follow the GIT_EXTERNAL_DIFF interface. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen2008-07-30
| | | | | | | | | | | | | | | | | | When the SYNOPSIS says e.g. "<path>...", it is nice if the DESCRIPTION also mentions "<path>..." and says the specified "paths" (note plural) are used for $whatever. This fixes the obvious mismatches. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | documentation: user-manual: update "using-bisect" sectionChristian Couder2008-07-30
| | | | | | | | | | | | | | | | | | | | | | | | Since version 1.5.6 "git bisect" doesn't use a "bisect" branch any more, but the user manual had not been updated to reflect this. So this patch does that and while at it also adds a few words about "git bisect skip" and points user to the "git bisect" man page for more information. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Replace uses of "git-var" with "git var"Todd Zullinger2008-07-30
| | | | | | | | | | Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-rev-parse.txt: update for new git-describe output formatCesar Eduardo Barros2008-07-30
| | | | | | | | | | Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Support copy and rename detection in fast-export.Alexander Gavrilov2008-07-29
| | | | | | | | | | | | | | | | | | | | | | | | Although it does not matter for Git itself, tools that export to systems that explicitly track copies and renames can benefit from such information. This patch makes fast-export output correct action logs when -M or -C are enabled. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: Remove mentions of git-svnimport.Brian Gernhardt2008-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | git-svnimport is no longer supported, so don't mention it in the documentation. This also updates the description, removing the historical discussion, since it mostly dealt with how it differed from svnimport. The new description gives some starting points into the rest of the documentation. Noticed by Jurko Gospodnetić <jurko.gospodnetic@docte.hr> Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make it clear that push can take multiple refspecsAbhijit Menon-Sen2008-07-29
| | | | | | | | | | Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | `git submodule add` now requires a <path>Abhijit Menon-Sen2008-07-29
| | | | | | | | | | Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make use of stat.ctime configurableAlex Riesen2008-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A new configuration variable 'core.trustctime' is introduced to allow ignoring st_ctime information when checking if paths in the working tree has changed, because there are situations where it produces too much false positives. Like when file system crawlers keep changing it when scanning and using the ctime for marking scanned files. The default is to notice ctime changes. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: clarify what is shown in "git-ls-files -s" outputJunio C Hamano2008-07-28
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | ls-tree documentation: enhance notes on subdirectory and pathspec behaviourJunio C Hamano2008-07-28
| | | | | | | | | | | | | | | | When run in a working copy subdirectory, git-ls-tree will automagically add the prefix to the pathspec, which can result in an unexpected behavior when the tree object accessed is not the root tree object. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.6.0-rc1v1.6.0-rc1Junio C Hamano2008-07-27
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-submodule.txt: fix doubled wordCesar Eduardo Barros2008-07-27
| | | | | | | | | | Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: fix diff.external exampleAnders Melchiorsen2008-07-27
| | | | | | | | | | | | | | | | The diff.external examples pass a flag to gnu-diff, but GNU diff does not follow the GIT_EXTERNAL_DIFF interface. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Clarify that "git log x.c y.h" lists commits that touch either fileAbhijit Menon-Sen2008-07-27
| | | | | | | | | | Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Remove references to git-fetch-pack from "git clone" documentation.Steve Haslam2008-07-25
| | | | | | | | | | | | | | | | | | "git clone" no longer calls "git-fetch-pack", so the documentation is a bit stale. Instead, state that the -u option is to be used when accessing a repository over ssh. Signed-off-by: Steve Haslam <shaslam@lastminute.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: clarify how to disable elements in core.whitespaceJunio C Hamano2008-07-25
| | | | | | | | | | | | Noticed by Peter Valdemar Mørch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | document that git-tag can tag more than headsJonathan Nieder2008-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After looking the git-tag manpage, someone on #git wondered how to tag a commit that is not a branch head. This patch changes the synopsis to say "<commit> | <object>" instead of "<head>" to address his question. Samuel Bronson had the idea of putting "<commit> | <object>" for "<object>" because most tags point to commits (and for the rest of the manpage, all tags point to commits). Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | checkout: mention '--' in the docsSZEDER Gábor2008-07-24
| | | | | | | | | | | | | | | | 'git checkout' uses '--' to separate options from paths, but it was not mentioned in the documentation Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"Petr Baudis2008-07-23
| | | | | | | | | | | | | | | | | | The example to remove paths using index-filter was done with "git update-index --remove"; "git rm --cached" would be more familiar to new people and is sufficient for this particular case. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: clarify diff --ccJunio C Hamano2008-07-23
| | | | | | | | | | | | The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | am --abort: Add to bash-completion and mention in git-rerere documentationStephan Beyer2008-07-23
| | | | | | | | | | | | | | | | | | The git-rerere documentation talks about commands that invoke "git rerere clear" automatically. git am --abort is added and a typo is fixed additionally. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix two leftovers from path_list->string_listJohannes Schindelin2008-07-22
| | | | | | | | | | | | | | | | In the documentation, where you cannot get compile errors for using the wrong member name, there were two mentions of 'path' left. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-diff(1): "--c" -> "--cc" typo fixJonathan Nieder2008-07-21
| | | | | | | | | | | | | | git diff does not take a --c option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Rename path_list to string_listJohannes Schindelin2008-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name path_list was correct for the first usage of that data structure, but it really is a general-purpose string list. $ perl -i -pe 's/path-list/string-list/g' $(git grep -l path-list) $ perl -i -pe 's/path_list/string_list/g' $(git grep -l path_list) $ git mv path-list.h string-list.h $ git mv path-list.c string-list.c $ perl -i -pe 's/has_path/has_string/g' $(git grep -l has_path) $ perl -i -pe 's/path/string/g' string-list.[ch] $ git mv Documentation/technical/api-path-list.txt \ Documentation/technical/api-string-list.txt $ perl -i -pe 's/strdup_paths/strdup_strings/g' $(git grep -l strdup_paths) ... and then fix all users of string-list to access the member "string" instead of "path". Documentation/technical/api-string-list.txt needed some rewrapping, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-21
| | | | | | | | | | | | | | | | | | | | With git-am, it sounds awkward to have the patches in ".git/rebase/", but for technical reasons, we have to keep the same directory name for git-am and git-rebase. ".git/rebase-apply" seems to be a good compromise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update my e-mail addressJunio C Hamano2008-07-21
| | | | | | | | | | | | The old cox.net address is still getting mails from gitters. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'ns/am-abort'Junio C Hamano2008-07-20
|\ \ | | | | | | | | | | | | * ns/am-abort: git am --abort
| * | git am --abortNanako Shiraishi2008-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After failing to apply patches in the middle of a series, "git am --abort" lets you go back to the original commit. [jc: doc/help update from Olivier, and fixups for "am -3" squashed in] Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-add --all: documentationJunio C Hamano2008-07-19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Getting closer to 1.6.0-rc0Junio C Hamano2008-07-19
| | | | | | | | | | | | | | | | | | Update the links to "stale" versions of documentation to link to 1.5.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint'Junio C Hamano2008-07-19
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.6.4 builtin-rm: fix index lock file path http-fetch: do not SEGV after fetching a bad pack idx file rev-list: honor --quiet option api-run-command.txt: typofix