summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2010-12-12Merge branch 'jk/asciidoc-update'Libravatar Junio C Hamano2-15/+12
* jk/asciidoc-update: docs: default to more modern toolset
2010-12-10Relnotes: remove items fixed on 'maint'Libravatar Junio C Hamano1-13/+0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Merge branch 'maint'Libravatar Junio C Hamano2-0/+35
2010-12-10Prepare for 1.7.3.4Libravatar Junio C Hamano1-0/+32
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Add --force to git-send-email documentationLibravatar Alejandro R. Sedeño1-0/+3
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-09Documentation/git.txt: update list of maintenance releasesLibravatar Junio C Hamano1-4/+8
Recently we have made 1.7.3.3, 1.7.2.4, 1.7.1.3 and 1.7.0.8. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-09Merge branch 'jn/ignore-doc' into maintLibravatar Junio C Hamano1-7/+23
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
2010-12-08Merge branch 'il/remote-fd-ext'Libravatar Junio C Hamano2-0/+184
* il/remote-fd-ext: remote-fd/ext: finishing touches after code review git-remote-ext git-remote-fd Add bidirectional_transfer_loop() Conflicts: compat/mingw.h
2010-12-08Merge branch 'jk/pager-per-command'Libravatar Junio C Hamano1-5/+7
* jk/pager-per-command: allow command-specific pagers in pager.<cmd>
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano2-4/+108
* jh/notes-merge: (23 commits) Provide 'git merge --abort' as a synonym to 'git reset --merge' cmd_merge(): Parse options before checking MERGE_HEAD Provide 'git notes get-ref' to easily retrieve current notes ref git notes merge: Add testcases for merging notes trees at different fanouts git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" git notes merge: --commit should fail if underlying notes ref has moved git notes merge: List conflicting notes in notes merge commit message git notes merge: Manual conflict resolution, part 2/2 git notes merge: Manual conflict resolution, part 1/2 Documentation: Preliminary docs on 'git notes merge' git notes merge: Add automatic conflict resolvers (ours, theirs, union) git notes merge: Handle real, non-conflicting notes merges builtin/notes.c: Refactor creation of notes commits. git notes merge: Initial implementation handling trivial merges only builtin/notes.c: Split notes ref DWIMmery into a separate function notes.c: Use two newlines (instead of one) when concatenating notes (trivial) t3303: Indent with tabs instead of spaces for consistency notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond notes.h/c: Allow combine_notes functions to remove notes notes.c: Reorder functions in preparation for next commit ... Conflicts: builtin.h
2010-12-07Merge branch 'maint'Libravatar Junio C Hamano1-6/+6
* maint: git-rm.txt: Fix quoting
2010-12-07git-rm.txt: Fix quotingLibravatar Michael J Gruber1-6/+6
Literal " produces typographically incorrect quotations, but "works" in most circumstances. In the subheadings of git-rm.txt, it "works" for the html backend but not for the docbook conversion to nroff: double "" and spurious double spaces appear in the output. Replace "incorrect" quotations by ``correct'' ones, and fix other "quotations" which are really `code fragments`. This should make git-rm.txt "-clean. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03Merge branch 'jn/ignore-doc'Libravatar Junio C Hamano1-7/+23
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
2010-12-03Merge branch 'pn/commit-autosquash'Libravatar Junio C Hamano1-4/+17
* pn/commit-autosquash: add tests of commit --squash commit: --squash option for use with rebase --autosquash add tests of commit --fixup commit: --fixup option for use with rebase --autosquash pretty.c: teach format_commit_message() to reencode the output commit: helper methods to reduce redundant blocks of code Conflicts: Documentation/git-commit.txt t/t3415-rebase-autosquash.sh
2010-12-03Merge branch 'sn/diff-doc'Libravatar Junio C Hamano3-5/+63
* sn/diff-doc: docs: clarify git diff modes of operation diff,difftool: Don't use the {0,2} notation in usage strings CodingGuidelines: Add a section on writing documentation
2010-12-03Merge branch 'jc/abbrev-guard'Libravatar Junio C Hamano1-0/+9
* jc/abbrev-guard: core.abbrevguard: Ensure short object names stay unique a bit longer
2010-12-03Merge branch 'maint' to sync with Git 1.7.3.3Libravatar Junio C Hamano3-4/+16
* maint: Git 1.7.3.3 CodingGuidelines: mention whitespace preferences for shell scripts Documentation: do not misinterpret pull refspec as bold text Conflicts: Documentation/git-pull.txt RelNotes
2010-12-03Git 1.7.3.3Libravatar Junio C Hamano1-2/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03CodingGuidelines: mention whitespace preferences for shell scriptsLibravatar Giuseppe Bilotta1-0/+4
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03Documentation: do not misinterpret pull refspec as bold textLibravatar Jonathan Nieder1-2/+2
Use the {asterisk} entity to avoid mistreating the asterisks in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters for bold text. From a quick search with 'git grep -e "\*.*\*"', this seems to be the last example of this particular formatting problem. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Update draft release notes to 1.7.4Libravatar Junio C Hamano1-10/+37
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Merge branch 'maint'Libravatar Junio C Hamano6-2/+78
* maint: Git 1.7.0.8 Documentation: Fix mark-up of lines with more than one tilde Conflicts: GIT-VERSION-GEN
2010-12-02Prepare for 1.7.3.3Libravatar Junio C Hamano4-0/+76
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.2.4Libravatar Junio C Hamano3-0/+30
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.1.3Libravatar Junio C Hamano2-0/+20
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.0.8Libravatar Junio C Hamano1-0/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Documentation: Fix mark-up of lines with more than one tildeLibravatar Junio C Hamano2-2/+2
The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: Sylvain Rabot <sylvain.rabot@f-secure.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Merge branch 'jk/add-e-doc' into maintLibravatar Junio C Hamano1-3/+77
* jk/add-e-doc: docs: give more hints about how "add -e" works docs: give more hints about how "add -e" works
2010-12-02Merge branch 'bc/fortran-userdiff' into maintLibravatar Junio C Hamano1-0/+2
* bc/fortran-userdiff: userdiff.c: add builtin fortran regex patterns
2010-12-01Merge branch 'maint'Libravatar Junio C Hamano2-3/+7
* maint: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
2010-12-01Merge branch 'maint-1.7.2' into maintLibravatar Junio C Hamano2-3/+7
* maint-1.7.2: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
2010-12-01Merge branch 'maint-1.7.1' into maint-1.7.2Libravatar Junio C Hamano1-1/+5
* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
2010-12-01Merge branch 'maint-1.7.0' into maint-1.7.1Libravatar Junio C Hamano1-1/+5
* maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
2010-12-01add: introduce add.ignoreerrors synonym for add.ignore-errorsLibravatar Jonathan Nieder1-1/+5
The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-01git-commit.txt: (synopsis): move -i and -o before "--"Libravatar Jari Aalto1-2/+2
All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-29Merge branch 'jl/clone-recurse-sm-synonym'Libravatar Junio C Hamano1-1/+3
* jl/clone-recurse-sm-synonym: clone: Add the --recurse-submodules option as alias for --recursive
2010-11-29Merge branch 'kb/blame-author-email'Libravatar Junio C Hamano1-1/+5
* kb/blame-author-email: blame: Add option to show author email instead of name Conflicts: t/annotate-tests.sh
2010-11-24Merge branch 'ao/send-email-irt'Libravatar Junio C Hamano1-5/+20
* ao/send-email-irt: git-send-email.perl: make initial In-Reply-To apply only to first email t9001: send-email interation with --in-reply-to and --chain-reply-to
2010-11-24Merge branch 'jk/add-e-doc'Libravatar Junio C Hamano1-3/+77
* jk/add-e-doc: docs: give more hints about how "add -e" works docs: give more hints about how "add -e" works
2010-11-24Merge branch 'rs/opt-help-text'Libravatar Junio C Hamano2-3/+10
* rs/opt-help-text: verify-tag: document --verbose branch: improve --verbose description archive: improve --verbose description Describe various forms of "be quiet" using OPT__QUIET add OPT__FORCE add description parameter to OPT__QUIET add description parameter to OPT__DRY_RUN add description parameter to OPT__VERBOSE
2010-11-24Merge branch 'mm/phrase-remote-tracking'Libravatar Junio C Hamano18-59/+79
* mm/phrase-remote-tracking: git-branch.txt: mention --set-upstream as a way to change upstream configuration user-manual: remote-tracking can be checked out, with detached HEAD user-manual.txt: explain better the remote(-tracking) branch terms Change incorrect "remote branch" to "remote tracking branch" in C code Change incorrect uses of "remote branch" meaning "remote-tracking" Change "tracking branch" to "remote-tracking branch" everyday.txt: change "tracking branch" to "remote-tracking branch" Change remote tracking to remote-tracking in non-trivial places Replace "remote tracking" with "remote-tracking" Better "Changed but not updated" message in git-status
2010-11-24docs: default to more modern toolsetLibravatar Jeff King2-15/+12
When the ASCIIDOC8 and ASCIIDOC_NO_ROFF knobs were built, many people were still on asciidoc 7 and using older versions of docbook-xsl. These days, even the almost 2-year-old Debian stable needs these knobs turned. So let's turn them by default. The new knobs ASCIIDOC7 and ASCIIDOC_ROFF can be used to get the old behavior if people are on older systems. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-24Merge branch 'jl/maint-pull-tags-doc' into maintLibravatar Junio C Hamano1-0/+2
* jl/maint-pull-tags-doc: pull: Remove --tags option from manpage
2010-11-24Merge branch 'jk/repack-reuse-object' into maintLibravatar Junio C Hamano2-1/+9
* jk/repack-reuse-object: Documentation: pack.compression: explain how to recompress repack: add -F flag to let user choose between --no-reuse-delta/object Conflicts: Documentation/git-repack.txt
2010-11-24Merge branch 'mg/reset-doc' into maintLibravatar Junio C Hamano1-29/+47
* mg/reset-doc: git-reset.txt: make modes description more consistent git-reset.txt: point to git-checkout git-reset.txt: use "working tree" consistently git-reset.txt: reset --soft is not a no-op git-reset.txt: reset does not change files in target git-reset.txt: clarify branch vs. branch head
2010-11-23Merge branch 'ef/mingw-daemon'Libravatar Junio C Hamano1-1/+2
* ef/mingw-daemon: daemon: opt-out on features that require posix daemon: make --inetd and --detach incompatible daemon: use socklen_t mingw: use poll-emulation from gnulib mingw: import poll-emulation from gnulib daemon: get remote host address from root-process Improve the mingw getaddrinfo stub to handle more use cases daemon: use full buffered mode for stderr daemon: use run-command api for async serving mingw: add kill emulation mingw: support waitpid with pid > 0 and WNOHANG mingw: use real pid inet_ntop: fix a couple of old-style decls compat: add inet_pton and inet_ntop prototypes mingw: implement syslog mingw: add network-wrappers for daemon
2010-11-19remote-fd/ext: finishing touches after code reviewLibravatar Ilari Liusvaara2-10/+10
When compiling with pthread support, transport-helper.c needs to include necessary header files. Also fix a few error messages in remote-ext and remote-fd programs, and a potential buffer underrun in remote-fd. In the documentation, clarify how %G and %V are used; the old description looked as if they take repository/vhost parameters, which was wrong. Also fix AsciiDoc markup for the page title of remote-fd/remote-ext manpages, and tweak the way how section headers are shown. Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-17Update draft release notes to 1.7.4Libravatar Junio C Hamano1-2/+53
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-17Merge branch 'jl/maint-pull-tags-doc'Libravatar Junio C Hamano1-0/+2
* jl/maint-pull-tags-doc: pull: Remove --tags option from manpage
2010-11-17Merge branch 'maint'Libravatar Junio C Hamano4-20/+63
* maint: clean: remove redundant variable baselen Documentation/git-pull: clarify configuration Document that rev-list --graph triggers parent rewriting. clean: avoid quoting twice document sigchain api Keep together options controlling the behaviour of diffcore-rename. t3402: test "rebase -s<strategy> -X<opt>"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 03:42:48 +0000