summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2009-01-14Merge branch 'maint'Libravatar Junio C Hamano1-2/+23
* maint: Update draft release notes to 1.6.1.1 Make t3411 executable fix handling of multiple untracked files for git mv -k add test cases for "git mv -k"
2009-01-14Update draft release notes to 1.6.1.1Libravatar Junio C Hamano1-2/+23
2009-01-13Update 1.6.2 draft release notesLibravatar Junio C Hamano1-1/+38
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-13Merge branch 'jc/maint-ls-tree'Libravatar Junio C Hamano1-1/+7
* jc/maint-ls-tree: Document git-ls-tree --full-tree ls-tree: add --full-tree option
2009-01-13Merge branch 'fe/cvsserver'Libravatar Junio C Hamano1-0/+4
* fe/cvsserver: cvsserver: change generation of CVS author names cvsserver: add option to configure commit message
2009-01-13Merge branch 'np/no-loosen-prune-expire-now'Libravatar Junio C Hamano1-1/+3
* np/no-loosen-prune-expire-now: objects to be pruned immediately don't have to be loosened
2009-01-13Merge branch 'mh/cherry-default'Libravatar Junio C Hamano1-1/+2
* mh/cherry-default: Documentation: clarify which parameters are optional to git-cherry git-cherry: make <upstream> parameter optional
2009-01-13Fix Documentation typos surrounding the word 'handful'.Libravatar Jon Loeliger8-11/+11
Some instances replaced by "handful of", others use the word "few", a couple get a slight rewording. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-11Merge branch 'maint'Libravatar Junio C Hamano1-3/+1
* maint: Documentation/git-push.txt: minor: compress one option
2009-01-11Merge branch 'mh/maint-sendmail-cc-doc' into maintLibravatar Junio C Hamano1-0/+1
* mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable
2009-01-11Documentation/git-push.txt: minor: compress one optionLibravatar jidanni@jidanni.org1-3/+1
Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-10filter-branch: add git_commit_non_empty_tree and --prune-empty.Libravatar Pierre Habouzit1-0/+14
git_commit_non_empty_tree is added to the functions that can be run from commit filters. Its effect is to commit only commits actually touching the tree and that are not merge points either. The option --prune-empty is added. It defaults the commit-filter to 'git_commit_non_empty_tree "$@"', and can be used with any other combination of filters, except --commit-hook that must used 'git_commit_non_empty_tree "$@"' where one puts 'git commit-tree "$@"' usually to achieve the same result. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-07Merge branch 'mh/maint-sendmail-cc-doc'Libravatar Junio C Hamano1-0/+1
* mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable
2009-01-07Merge branch 'rs/diff-ihc'Libravatar Junio C Hamano1-0/+4
* rs/diff-ihc: diff: add option to show context between close hunks Conflicts: Documentation/diff-options.txt
2009-01-07Merge branch 'mv/um-pdf'Libravatar Junio C Hamano1-0/+13
* mv/um-pdf: Add support for a pdf version of the user manual
2009-01-06strbuf: instate cleanup rule in case of non-memory errorsLibravatar René Scharfe1-2/+9
Make all strbuf functions that can fail free() their memory on error if they have allocated it. They don't shrink buffers that have been grown, though. This allows for easier error handling, as callers only need to call strbuf_release() if A) the command succeeded or B) if they would have had to do so anyway because they added something to the strbuf themselves. Bonus hunk: document strbuf_readlink. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-05Merge branch 'maint'Libravatar Junio C Hamano2-5/+5
* maint: Be consistent in switch usage for tar Use capitalized names where appropriate fast-export: print usage when no options specified
2009-01-05Be consistent in switch usage for tarLibravatar Henrik Austad1-1/+1
tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-05Use capitalized names where appropriateLibravatar Henrik Austad2-4/+4
The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-05Documentation: clarify which parameters are optional to git-cherryLibravatar Markus Heidelberg1-1/+1
An earlier parameter is only optional when all of the later parameters are omitted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-03cvsserver: add option to configure commit messageLibravatar Fabian Emmes1-0/+4
cvsserver annotates each commit message by "via git-CVS emulator". This is made configurable via gitcvs.commitmsgannotation. Signed-off-by: Fabian Emmes <fabian.emmes@rwth-aachen.de> Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-01Merge branch 'cb/mergetool'Libravatar Junio C Hamano2-1/+20
* cb/mergetool: mergetool: Don't keep temporary merge files unless told to mergetool: Add prompt to continue after failing to merge a file Add -y/--no-prompt option to mergetool Fix some tab/space inconsistencies in git-mergetool.sh
2009-01-01Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
* maint: Documentation/git-tag.txt: minor typo and grammar fix
2009-01-01Documentation/git-tag.txt: minor typo and grammar fixLibravatar jidanni@jidanni.org1-2/+2
Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-01objects to be pruned immediately don't have to be loosenedLibravatar Nicolas Pitre1-1/+3
When there is no grace period before pruning unreferenced objects, it is pointless to push those objects in their loose form just to delete them right away. Also be more explicit about the possibility of using "now" in the gc.pruneexpire config variable (needed for the above behavior to happen). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-01Document git-ls-tree --full-treeLibravatar Nanako Shiraishi1-1/+7
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-01git-cherry: make <upstream> parameter optionalLibravatar Markus Heidelberg1-1/+2
The upstream branch <upstream> now defaults to the first tracked remote branch, which is set by the configuration variables branch.<name>.remote and branch.<name>.merge of the current branch. Without such a remote branch, the command "git cherry [-v]" fails with usage output as before and an additional message. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29Merge branch 'lt/reset-merge'Libravatar Junio C Hamano1-1/+28
* lt/reset-merge: Document "git-reset --merge" Add 'merge' mode to 'git reset'
2008-12-29Merge branch 'maint'Libravatar Junio C Hamano2-14/+27
* maint: Prepare for v1.6.1.1 maintenance release Documentation/diff-options.txt: unify options gitweb: Fix export check in git_get_projects_list Conflicts: RelNotes
2008-12-29Prepare for v1.6.1.1 maintenance releaseLibravatar Junio C Hamano1-0/+23
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29Documentation/diff-options.txt: unify optionsLibravatar jidanni@jidanni.org1-14/+4
Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29doc/git-send-email: mention sendemail.cc config variableLibravatar Markus Heidelberg1-0/+1
This variable was added in 5f8b9fc (git-send-email: add a new sendemail.cc configuration variable, 2008-04-27), but is not yet refered to by the documentation. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29diff: add option to show context between close hunksLibravatar René Scharfe1-0/+4
Merge two hunks if there is only the specified number of otherwise unshown context between them. For --inter-hunk-context=1, the resulting patch has the same number of lines but shows uninterrupted context instead of a context header line in between. Patches generated with this option are easier to read but are also more likely to conflict if the file to be patched contains other changes. This patch keeps the default for this option at 0. It is intended to just make the feature available in order to see its advantages and downsides. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29Fix the building of gitman.info documentLibravatar Teemu Likonen2-3/+7
"makeinfo" failed to generate gitman.info from gitman.texi input file because the combined manual page file contains several nodes with the same name (DESCRIPTION, OPTIONS, SEE ALSO etc.). An Info document should contain unique node names. This patch creates a simple (read: ugly) work-around by suppressing the validation of the final Info file. Jumping to nodes in the Info document still works but they are not very useful. Common man-page headings like DESCRIPTION and OPTIONS appear in the Info node list and they point to the man page where they appear first (that is git-add currently). Also, this patch adds directory-entry information for Info document to make the document appear in the top-level Info directory. Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29Fix the building of user-manual.texi and gitman.texi documentsLibravatar Teemu Likonen1-3/+4
Previously "docbook2x-texi" failed to generate user-manual.texi and gitman.texi files from .xml input files because "iconv" stopped at "illegal input sequence" error. This was due to some UTF-8 octets in the input .xml files. This patch adds option --encoding=UTF-8 for "docbook2x-texi" to allow the building of .texi files complete. Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-27Merge branch 'maint'Libravatar Junio C Hamano2-13/+39
* maint: git-send-email.txt: move --format-patch paragraph to a proper location git-shortlog.txt: improve documentation about .mailmap files pretty: support multiline subjects with format: pretty: factor out format_subject() pretty: factor out skip_empty_lines() merge-file: handle freopen() failure daemon: cleanup: factor out xstrdup_tolower() daemon: cleanup: replace loop with if daemon: handle freopen() failure describe: Avoid unnecessary warning when using --all
2008-12-27Start 1.6.2 cycleLibravatar Junio C Hamano1-0/+28
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-27git-send-email.txt: move --format-patch paragraph to a proper locationLibravatar Adeodato Simó1-6/+6
When introducing --format-patch, its documentation was accidentally inserted in the middle of documentation for --validate. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-27git-shortlog.txt: improve documentation about .mailmap filesLibravatar Adeodato Simó1-7/+33
The description on .mailmap made it seem like they are only useful for commits with a wrong address for an author, but they are about fixing the real name. Explain this better in the text, and replace the existing example with a new one that hopefully makes things clearer. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-24GIT 1.6.1Libravatar Junio C Hamano2-0/+9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21GIT 1.6.1-rc4Libravatar Junio C Hamano1-1/+18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21Make help entries alphabeticalLibravatar Richard Hartmann1-4/+4
Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
* maint: doc/git-fsck: change the way for getting heads' SHA1s
2008-12-21git-revert documentation: refer to new HOWTO on reverting faulty mergesLibravatar Boyd Stephen Smith Jr1-0/+8
Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21doc/git-fsck: change the way for getting heads' SHA1sLibravatar Markus Heidelberg1-1/+2
The straightforward way with using 'cat .git/refs/heads/*' doesn't work with packed refs as well as branches of the form topic/topic1. So let's use git-for-each-ref for getting the heads' SHA1s in this example. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21Documentation/git-show-branch: work around "single quote" typesetting glitchLibravatar Markus Heidelberg1-1/+1
The displayed example is typeset with acute accents around the string that should be surrounded by a pair of single quotes in manpage. Replace them with double quotes (the semantics of the example does not change). Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-21Add a documentat on how to revert a faulty mergeLibravatar Nanako Shiraishi1-0/+179
Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxLibravatar Markus Heidelberg1-1/+1
[jc: the original patch was against master but 99% of it applied to maint; this commit splits out the part that applies only to master.] Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-19Merge branch 'maint' to sync with GIT 1.6.0.6Libravatar Junio C Hamano20-29/+107
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-19GIT 1.6.0.6Libravatar Junio C Hamano4-0/+63
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 09:29:36 +0000