summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06e75d9)
raw | patch | inline | side by side (parent: 06e75d9)
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | |
Fri, 12 Sep 2008 19:10:26 +0000 (21:10 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 12 Sep 2008 20:19:56 +0000 (13:19 -0700) |
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-web--browse.txt | patch | blob | history | |
Documentation/gitattributes.txt | patch | blob | history | |
Documentation/merge-config.txt | patch | blob | history |
index 36afad8d4e0d67a8d9dd33d3bc590789e9f6604d..7f7a45b2eaa3997cbf5a250fb78387e2a0959a11 100644 (file)
Note about konqueror
--------------------
-When 'konqueror' is specified by the a command line option or a
+When 'konqueror' is specified by a command line option or a
configuration variable, we launch 'kfmclient' to try to open the HTML
man page on an already opened konqueror in a new tab if possible.
index 49a167f241f0832e62fb905390715e45ef5be3c4..94e6752aa2e78e4bcf69334ca92bc41439b33028 100644 (file)
- `bibtex` suitable for files with BibTeX coded references.
-- `java` suitable for source code in the Java lanugage.
+- `java` suitable for source code in the Java language.
- `pascal` suitable for source code in the Pascal/Delphi language.
index 00277e061313974a4f8fdb9333608902c7ef653f..c735788b0f1c8efb0b250d4810be420be6c62f89 100644 (file)
merge.stat::
- Whether to print the diffstat between ORIG_HEAD and merge result
+ Whether to print the diffstat between ORIG_HEAD and the merge result
at the end of the merge. True by default.
merge.log::