summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2011-11-22revert: rename --reset option to --quitJonathan Nieder
The option to "git cherry-pick" and "git revert" to discard the sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce --reset to remove sequencer state, 2011-08-04) has a confusing name. Change it now, while we still have the time. The new name for "cherry-pick, please get out of my way, since I've long forgotten about the sequence of commits I was cherry-picking when you wrote that old .git/sequencer directory" is --quit. Mnemonic: this is analagous to quiting a program the user is no longer using --- we just want to get out of the multiple-command cherry-pick procedure and not to reset HEAD or rewind any other old state. The "--reset" option is kept as a synonym to minimize the impact. We might consider dropping it for simplicity in a separate patch, though. Adjust documentation and tests to use the newly preferred name (--quit) instead of --reset. While at it, let's clarify the short descriptions of these operations in "-h" output. Before: --reset forget the current operation --continue continue the current operation After: --quit end revert or cherry-pick sequence --continue resume revert or cherry-pick sequence Noticed-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-18Hopefully final update of release notes before 1.7.8 finalJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-18Sync with 1.7.7.4Junio C Hamano
2011-11-18Git 1.7.7.4v1.7.7.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-17Git 1.7.8-rc3v1.7.8-rc3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-13Git 1.7.8-rc2v1.7.8-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-09Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-09Sync with 1.7.7.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-09Git 1.7.7.3v1.7.7.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-08docs: Update install-doc-quickJunio C Hamano
The preformatted documentation pages live in their own repositories these days. Adjust the installation procedure to the updated layout. Tested-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King
These are diff-options, but they don't actually make sense in the context of log. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-08Git 1.7.8-rc1v1.7.8-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-01Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-01Sync with 1.7.7.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-01Git 1.7.7.2v1.7.7.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-31Git 1.7.8-rc0v1.7.8-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-27Update draft release notes to 1.7.8Junio C Hamano
Getting very close to -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-26Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-26Merge branch 'lh/gitweb-site-html-head'Junio C Hamano
* lh/gitweb-site-html-head: gitweb: provide a way to customize html headers
2011-10-26Merge branch 'jk/argv-array' into maintJunio C Hamano
* jk/argv-array: run_hook: use argv_array API checkout: use argv_array API bisect: use argv_array API quote: provide sq_dequote_to_argv_array refactor argv_array into generic code quote.h: fix bogus comment add sha1_array API docs
2011-10-26Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano
* cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano
* maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote'
2011-10-26Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano
* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano
* maint-1.7.6: make the sample pre-commit hook script reject names with newlines, too git-read-tree.txt: update sparse checkout examples git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr Documentation/git-update-index: refer to 'ls-files' Documentation: basic configuration of notes.rewriteRef
2011-10-26Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano
* tr/doc-note-rewrite: Documentation: basic configuration of notes.rewriteRef
2011-10-26Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano
* nd/sparse-doc: git-read-tree.txt: update sparse checkout examples
2011-10-26Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano
* mg/maint-doc-sparse-checkout: git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr
2011-10-26Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano
* maint-1.7.5: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files'
2011-10-26Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano
* maint-1.7.4: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files'
2011-10-26Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano
* maint-1.7.3: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files'
2011-10-26Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano
* sn/doc-update-index-assume-unchanged: Documentation/git-update-index: refer to 'ls-files'
2011-10-24Merge branch 'maint'Junio C Hamano
* maint: Git 1.7.7.1 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting Conflicts: GIT-VERSION-GEN
2011-10-24Git 1.7.7.1v1.7.7.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-24RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile ↵Jonathan Nieder
setting The change was actually about "git init -s" which sets the setgid bit on SysV-style systems to allow shared access to a repository, and can provoke errors on BSD-style systems, depending on how permissive the filesystem in use wants to be. More to the point, the patch was just taking a fix that arrived for FreeBSD in v1.5.5 days and making it also apply to machines using an (obscure) GNU userland/FreeBSD kernel mixture. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-21Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-21Merge branch 'po/insn-editor'Junio C Hamano
* po/insn-editor: "rebase -i": support special-purpose editor to edit insn sheet
2011-10-21Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano
* cn/doc-config-bare-subsection: Documentation: update [section.subsection] to reflect what git does
2011-10-21Merge branch 'jk/daemon-msgs'Junio C Hamano
* jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c
2011-10-21Sync with maintJunio C Hamano
2011-10-21Almost ready for 1.7.7.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano
* rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01
2011-10-21gitweb: provide a way to customize html headersLénaïc Huard
This allows web sites to add some specific html headers to the pages generated by gitweb. The new variable $site_html_head_string can be set to an html snippet that will be inserted at the end of the <head> section of each page generated by gitweb. Signed-off-by: Lénaïc Huard <lenaic@lhuard.fr.eu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-19Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-19Merge branch 'js/merge-edit-option'Junio C Hamano
* js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano
* rs/diff-whole-function: diff: add option to show whole functions as context xdiff: factor out get_func_line()
2011-10-19Merge branch 'jn/gitweb-manpages'Junio C Hamano
* jn/gitweb-manpages: gitweb: Add gitweb manpages to 'gitweb' package in git.spec Documentation: Add gitweb config variables to git-config(1) Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages gitweb: Add gitweb(1) manpage for gitweb itself gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
2011-10-18Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer
The insn sheet used by "rebase -i" is designed to be easily editable by any text editor, but an editor that is specifically meant for it (but is otherwise unsuitable for editing regular text files) could be useful by allowing drag & drop reordering in a GUI environment, for example. The GIT_SEQUENCE_EDITOR environment variable and/or the sequence.editor configuration variable can be used to specify such an editor, while allowing the usual editor to be used to edit commit log messages. As usual, the environment variable takes precedence over the configuration variable. It is envisioned that other "sequencer" based tools will use the same mechanism. Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-16Documentation: Add gitweb config variables to git-config(1)Jakub Narebski
Add a list of gitweb config variables to git-config(1) manpage, just linking to gitweb(1) or gitweb.conf(5). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-16Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpagesJakub Narebski
Add link to gitweb(1) in "SEE ALSO" section of git-instaweb(1) manpage, and "Ancillary Commands" section of git(1) manpage (the latter by the way of command-list.txt file). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v0.10.2-6-g49f6 at 2024-04-25 09:30:24 (GMT)