diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 01:09:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 01:09:55 +0300 |
| commit | 8183b63ff6a9c7eec5555e51e127e712efb64704 (patch) | |
| tree | 0021e183d84e4359b66485a9d74c951a93ab9264 /contrib | |
| parent | 2e8e77cbac8ac17f94eee2087187fa1718e38b14 (diff) | |
| parent | f0a39ba5047151a1bac5e79afcaa877afa0143b3 (diff) | |
Merge branch 'sn/typo-grammo-phraso-fixes'
Many typos, ungrammatical sentences and wrong phrasing have been
fixed.
* sn/typo-grammo-phraso-fixes:
t/README: fix multi-prerequisite example
doc/gitk: s/sticked/stuck/
git-jump: admit to passing merge mode args to ls-files
doc/diff-options: improve wording of the log.diffMerges mention
doc: fix some typos, grammar and wording issues
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/README | 4 | ||||
| -rwxr-xr-x | contrib/git-jump/git-jump | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/README b/contrib/README index 05f291c1f1..21d3d0e7de 100644 --- a/contrib/README +++ b/contrib/README @@ -23,7 +23,7 @@ This is the same way as how I have been treating gitk, and to a lesser degree various foreign SCM interfaces, so you know the drill. -I expect that things that start their life in the contrib/ area +I expect things that start their life in the contrib/ area to graduate out of contrib/ once they mature, either by becoming projects on their own, or moving to the toplevel directory. On the other hand, I expect I'll be proposing removal of disused @@ -31,7 +31,7 @@ and inactive ones from time to time. If you have new things to add to this area, please first propose it on the git mailing list, and after a list discussion proves -there are some general interests (it does not have to be a +there is general interest (it does not have to be a list-wide consensus for a tool targeted to a relatively narrow audience -- for example I do not work with projects whose upstream is svn, so I have no use for git-svn myself, but it is diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 40c4b0d111..47e0c557e6 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -9,7 +9,7 @@ The <mode> parameter is one of: diff: elements are diff hunks. Arguments are given to diff. -merge: elements are merge conflicts. Arguments are ignored. +merge: elements are merge conflicts. Arguments are given to ls-files -u. grep: elements are grep hits. Arguments are given to git grep or, if configured, to the command in `jump.grepCmd`. |