summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2008-05-08Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
* maint: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
2008-05-08Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano2-2/+5
* maint-1.5.4: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
2008-05-08Merge branch 'sg/merge-options' (early part)Libravatar Junio C Hamano5-52/+67
* 'sg/merge-options' (early part): merge, pull: add '--(no-)log' command line option fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable add 'merge.stat' config variable merge, pull: introduce '--(no-)stat' option doc: moved merge.* config variables into separate merge-config.txt
2008-05-08Merge branch 'cc/help'Libravatar Junio C Hamano3-6/+84
* cc/help: documentation: web--browse: add a note about konqueror documentation: help: add info about "man.<tool>.cmd" config var help: use "man.<tool>.cmd" as custom man viewer command documentation: help: add "man.<tool>.path" config variable help: use man viewer path from "man.<tool>.path" config var
2008-05-08Merge branch 'dm/cherry-pick-s'Libravatar Junio C Hamano2-2/+8
* dm/cherry-pick-s: Allow cherry-pick (and revert) to add signoff line
2008-05-08Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"Libravatar Dustin Sallings1-1/+2
Signed-off-by: Dustin Sallings <dustin@spy.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-08doc: clarify definition of "update" for git-add -uLibravatar Jeff King1-1/+3
The "-u" option is described only in terms of "updating" files, which in turn is described only as "similar to what git commit -a does". Let's be a little more specific about what updating entails. Suggested by Geoffrey Irving. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-08Documentation: bisect: add a few "git bisect run" examplesLibravatar Christian Couder1-0/+49
Before this patch, there were no "git bisect run" example. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-08Documentation/config.txt: Add git-gui optionsLibravatar Gustaf Hendeby1-0/+30
The 'git gui' has a number of options that can be specified using the options dialog. Sometimes it is convenient to be able to specify these from the command line, therefor document these options. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Shawn O. Pearce <speace@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-06Documentation: improve "add", "pull" and "format-patch" examplesLibravatar Christian Couder3-69/+108
Before this patch in "git-add.txt" and "git-format-patch.txt", the commands used in the examples were "git-CMD" instead of "git CMD". This patch fixes that. In "git-pull.txt" only the last example had the code sample in an asciidoc "Listing Block", and in the other two files, none. This patch fixes that by putting all code samples in listing blocks. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-05Merge branch 'bc/filter-branch'Libravatar Junio C Hamano1-4/+10
* bc/filter-branch: filter-branch.sh: support nearly proper tag name filtering
2008-05-05Merge branch 'lh/git-file'Libravatar Junio C Hamano1-1/+4
* lh/git-file: Teach GIT-VERSION-GEN about the .git file Teach git-submodule.sh about the .git file Teach resolve_gitlink_ref() about the .git file Add platform-independent .git "symlink"
2008-05-05Merge branch 'lh/branch-merged'Libravatar Junio C Hamano1-1/+24
* lh/branch-merged: Add tests for `branch --[no-]merged` git-branch.txt: compare --contains, --merged and --no-merged git-branch: add support for --merged and --no-merged
2008-05-05Merge branch 'pb/remote-mirror-config'Libravatar Junio C Hamano3-3/+11
* pb/remote-mirror-config: Add a remote.*.mirror configuration option
2008-05-05post-merge: Add it's not executed if merge failed.Libravatar Jörg Sommer1-1/+2
Signed-off-by: J��rg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-05Documentation: Add create-ignore to git svn manualLibravatar Gustaf Hendeby1-0/+6
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-03Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
* maint: checkout: don't rfc2047-encode oneline on detached HEAD filter-branch: Documentation fix.
2008-05-03Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-2/+2
* maint-1.5.4: filter-branch: Documentation fix.
2008-05-03Documentation: hooks: fix missing verb in pre-applypatch descriptionLibravatar Christian Couder1-4/+5
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-03filter-branch: Documentation fix.Libravatar Florian Ragwitz1-2/+2
It's --msg-filter, not --message-filter. Signed-off-by: Florian Ragwitz <rafl@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-29Documentation: point git-prune users to git-gcLibravatar Jeff King2-1/+22
Most users should be using git-gc instead of directly calling prune. For those who really do want more information on pruning, let's point them at git-fsck, which goes into slightly more detail on reachability. And since we're pointing users there, let's make sure reflogs are mentioned in git-fsck(1). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-29Documentation on --git-dir and --work-treeLibravatar Liu Yubao2-3/+15
2008-04-29Documentation gitk: Describe what --merge doesLibravatar Richard Quirk1-0/+6
Signed-off-by: Richard Quirk <richard.quirk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-29Add otherwise missing --strict option to unpack-objects summary.Libravatar Jon Loeliger1-1/+1
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-27git checkout: add -t alias for --trackLibravatar Miklos Vajna1-1/+1
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"Libravatar Christian Couder1-0/+5
Currently "git rev-parse --verify <something>" is often used with its error output redirected to /dev/null. This patch makes it easier to do that. The -q|--quiet option is designed to work the same way as it does for "git symbolic-ref". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26documentation: web--browse: add a note about konquerorLibravatar Christian Couder1-1/+23
This note explains how to work around the fact that we try to use kfmclient to launch konqueror. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26documentation: help: add info about "man.<tool>.cmd" config varLibravatar Christian Couder2-5/+48
This patch also describes the current behavior for "konqueror" and how to modify it using "man.<tool>.cmd" if needed. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26documentation: help: add "man.<tool>.path" config variableLibravatar Christian Couder2-0/+13
This patch documents the "man.<tool>.path" configuration variable. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26Allow cherry-pick (and revert) to add signoff lineLibravatar Dan McGee2-2/+8
I often find myself pulling patches off of other peoples trees using cherry-pick, and following it with an immediate 'git commit --amend -s' command. Eliminate the need for a double commit by allowing signoff on a cherry-pick or revert. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-25Merge branch 'ho/shared'Libravatar Junio C Hamano2-2/+13
* ho/shared: Make core.sharedRepository more generic
2008-04-24Merge branch 'maint'Libravatar Junio C Hamano2-1/+17
* maint: remote: create fetch config lines with '+' push: allow unqualified dest refspecs to DWIM doc/git-gc: add a note about what is collected t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects
2008-04-24Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-1/+2
* maint-1.5.4: t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects
2008-04-24doc/git-gc: add a note about what is collectedLibravatar Jeff King1-0/+15
It seems to be a FAQ that people try running git-gc, and then get puzzled about why the size of their .git directory didn't change. This note mentions the reasons why things might unexpectedly get kept. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23Linked glossary from cvs-migration pageLibravatar Matt Graham1-1/+2
Coming from CVS, I found the git glossary vital to learning git and learning how terms in git correlate to the cvs terminology with which I am familiar. This patch links the glossary from the cvs-migration page so cvs users will be able to fine the glossary as soon as they start looking at git documents. Signed-off-by: Matt Graham <mdg149@gmail.com> Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23Merge branch 'maint'Libravatar Junio C Hamano5-35/+27
* maint: Amend git-push refspec documentation git-gc --prune is deprecated svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status Don't force imap.host to be set when imap.tunnel is set git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory
2008-04-22Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-1/+2
* maint-1.5.4: svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory
2008-04-22Amend git-push refspec documentationLibravatar Sam Vilain1-10/+13
These paragraphs are a little confusing. Also, make it clearer when you have to specify the full name for <dst> Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-22git-gc --prune is deprecatedLibravatar Dmitry Potapov2-20/+3
25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option deprecated and removed its description from the git-gc man page. This patch removes all references to this option from the rest of the Git documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-22diff options documentation: refer to --diff-filter in --name-statusLibravatar Miklos Vajna1-1/+2
git diff --name-status outputs letters, but the meaning of those letters is documented elsewhere. Add a note to make the manpage more intuitive. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-22git-clone.txt: Adjust note to --shared for new pruning behavior of git-gcLibravatar Brandon Casey1-4/+9
Since git-gc now always calls prune, even with --auto, unreferenced objects may be removed by more operations than just git-gc. This is important for clones created using --shared or --reference. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-22Merge branch 'maint'Libravatar Junio C Hamano1-0/+8
* maint: post-receive-email: fix accidental removal of a trailing space in signature line Escape project names before creating pathinfo URLs Escape project name in regexp bash: Add completion for git diff --base --ours --theirs diff-options.txt: document the new "--dirstat" option
2008-04-21diff-options.txt: document the new "--dirstat" optionLibravatar Gerrit Pape1-0/+8
This commit adds the documentation for the new option added by 7df7c01 (Add "--dirstat" for some directory statistics, 2008-02-12). Noticed by Clint Adams, reported through http://bugs.debian.org/476437 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20Add a remote.*.mirror configuration optionLibravatar Paolo Bonzini3-3/+11
This patch adds a remote.*.mirror configuration option that, when set, automatically puts git-push in --mirror mode for that remote. Furthermore, the option is set automatically by `git remote add --mirror'. The code in remote.c to parse remote.*.skipdefaultupdate had a subtle problem: a comment in the code indicated that special care was needed for boolean options, but this care was not used in parsing the option. Since I was touching related code, I did this fix too. [jc: and I further fixed up the "ignore boolean" code.] Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20git-branch.txt: compare --contains, --merged and --no-mergedLibravatar Lars Hjemli1-0/+21
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20git-branch: add support for --merged and --no-mergedLibravatar Lars Hjemli1-1/+3
These options filter the output from git branch to only include branches whose tip is either merged or not merged into HEAD. The use-case for these options is when working with integration of branches from many remotes: `git branch --no-merged -a` will show a nice list of merge candidates while `git branch --merged -a` will show the progress of your integration work. Also, a plain `git branch --merged` is a quick way to find local branches which you might want to delete. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20First batch of post 1.5.5 updatesLibravatar Junio C Hamano1-0/+59
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20Merge branch 'maint'Libravatar Junio C Hamano2-0/+47
* maint: GIT 1.5.5.1
2008-04-20GIT 1.5.5.1Libravatar Junio C Hamano2-0/+47
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-19Merge branch 'mv/defer-gc'Libravatar Junio C Hamano1-0/+7
* mv/defer-gc: contrib/hooks: add an example pre-auto-gc hook Documentation/hooks: add pre-auto-gc hook git-gc --auto: add pre-auto-gc hook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 03:18:10 +0000