+1 -1

Documentation/howto/new-command.txt

··· 94 94 6. There is a file command-list.txt in the distribution main directory 95 95 that categorizes commands by type, so they can be listed in appropriate 96 96 subsections in the documentation's summary command list. Add an entry 97 97 - for yours. To understand the categories, look at git-cmmands.txt 97 97 + for yours. To understand the categories, look at git-commands.txt 98 98 in the main directory. 99 99 100 100 7. Give the maintainer one paragraph to include in the RelNotes file

+1 -1

Documentation/technical/api-revision-walking.txt

··· 59 59 `reset_revision_walk`:: 60 60 61 61 Reset the flags used by the revision walking api. You can use 62 62 - this to do multiple sequencial revision walks. 62 62 + this to do multiple sequential revision walks. 63 63 64 64 Data structures 65 65 ---------------

+1 -1

builtin/fast-export.c

··· 379 379 int tagged_mark; 380 380 struct commit *p; 381 381 382 382 - /* Trees have no identifer in fast-export output, thus we have no way 382 382 + /* Trees have no identifier in fast-export output, thus we have no way 383 383 * to output tags of trees, tags of tags of trees, etc. Simply omit 384 384 * such tags. 385 385 */

+1 -1

builtin/push.c

··· 92 92 if (!short_upstream) 93 93 short_upstream = branch->merge[0]->src; 94 94 /* 95 95 - * Don't show advice for people who explicitely set 95 95 + * Don't show advice for people who explicitly set 96 96 * push.default. 97 97 */ 98 98 if (push_default == PUSH_DEFAULT_UNSPECIFIED)

+1 -1

cache.h

··· 491 491 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int); 492 492 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int); 493 493 494 494 - #define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */ 494 494 + #define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */ 495 495 496 496 struct pathspec { 497 497 const char **raw; /* get_pathspec() result, not freed by free_pathspec() */

+1 -1

combine-diff.c

··· 165 165 166 166 /* 167 167 * Coalesce new lines into base by finding the LCS 168 168 - * - Create the table to run dynamic programing 168 168 + * - Create the table to run dynamic programming 169 169 * - Compute the LCS 170 170 * - Then reverse read the direction structure: 171 171 * - If we have MATCH, assign parent to base flag, and consume

+1 -1

contrib/ciabot/ciabot.py

··· 70 70 71 71 # The template used to generate the XML messages to CIA. You can make 72 72 # visible changes to the IRC-bot notification lines by hacking this. 73 73 - # The default will produce a notfication line that looks like this: 73 73 + # The default will produce a notification line that looks like this: 74 74 # 75 75 # ${project}: ${author} ${repo}:${branch} * ${rev} ${files}: ${logmsg} ${url} 76 76 #

+2 -2

contrib/ciabot/ciabot.sh

··· 39 39 # done 40 40 # 41 41 # The reason for the tac call is that git rev-list emits commits from 42 42 - # most recent to least - better to ship notifactions from oldest to newest. 42 42 + # most recent to least - better to ship notifications from oldest to newest. 43 43 # 44 44 # Configuration variables affecting this script: 45 45 # ··· 64 64 # down. It is unknown whether this is still an issue in 2010, but 65 65 # XML-RPC would be annoying to do from sh in any case. (XML-RPC does 66 66 # have the advantage that it guarantees notification of multiple commits 67 67 - # shpped from an update in their actual order.) 67 67 + # shipped from an update in their actual order.) 68 68 # 69 69 70 70 # The project as known to CIA. You can set this with a -p option,

+1 -1

contrib/subtree/git-subtree.txt

··· 270 270 name 271 271 272 272 You can omit the --squash flag, but doing so will increase the number 273 273 - of commits that are incldued in your local repository. 273 273 + of commits that are included in your local repository. 274 274 275 275 We now have a ~/git-extensions/git-subtree directory containing code 276 276 from the master branch of git://github.com/apenwarr/git-subtree.git

+1 -1

git-mergetool--lib.sh

··· 144 144 setup_tool () { 145 145 tool="$1" 146 146 147 147 - # Fallback definitions, to be overriden by tools. 147 147 + # Fallback definitions, to be overridden by tools. 148 148 can_merge () { 149 149 return 0 150 150 }

+1 -1

git-p4.py

··· 1786 1786 missingGitTags = gitTags - p4Labels 1787 1787 self.exportGitTags(missingGitTags) 1788 1788 1789 1789 - # exit with error unless everything applied perfecly 1789 1789 + # exit with error unless everything applied perfectly 1790 1790 if len(commits) != len(applied): 1791 1791 sys.exit(1) 1792 1792

+1 -1

notes.h

··· 77 77 * variable is used, and if that is missing, the default notes ref is used 78 78 * ("refs/notes/commits"). 79 79 * 80 80 - * If you need to re-intialize a notes_tree structure (e.g. when switching from 80 80 + * If you need to re-initialize a notes_tree structure (e.g. when switching from 81 81 * one notes ref to another), you must first de-initialize the notes_tree 82 82 * structure by calling free_notes(struct notes_tree *). 83 83 *

+2 -2

read-cache.c

··· 489 489 } 490 490 491 491 /* 492 492 - * Remove all cache ententries marked for removal, that is where 492 492 + * Remove all cache entries marked for removal, that is where 493 493 * CE_REMOVE is set in ce_flags. This is much more effective than 494 494 * calling remove_index_entry_at() for each entry to be removed. 495 495 */ ··· 1760 1760 } 1761 1761 1762 1762 /* 1763 1763 - * Opportunisticly update the index but do not complain if we can't 1763 1763 + * Opportunistically update the index but do not complain if we can't 1764 1764 */ 1765 1765 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile) 1766 1766 {

+1 -1

t/gitweb-lib.sh

··· 36 36 37 37 # You can set the GITWEB_TEST_INSTALLED environment variable to 38 38 # the gitwebdir (the directory where gitweb is installed / deployed to) 39 39 - # of an existing gitweb instalation to test that installation, 39 39 + # of an existing gitweb installation to test that installation, 40 40 # or simply to pathname of installed gitweb script. 41 41 if test -n "$GITWEB_TEST_INSTALLED" ; then 42 42 if test -d $GITWEB_TEST_INSTALLED; then

+1 -1

t/lib-t6000.sh

··· 34 34 mv sed.script.tmp sed.script 35 35 } 36 36 37 37 - # Replace unhelpful sha1 hashses with their symbolic equivalents 37 37 + # Replace unhelpful sha1 hashes with their symbolic equivalents 38 38 entag () { 39 39 sed -f sed.script 40 40 }

+1 -1

t/t7601-merge-pull-config.sh

··· 109 109 ' 110 110 111 111 # First do the merge with resolve and recursive then verify that 112 112 - # recusive is chosen. 112 112 + # recursive is chosen. 113 113 114 114 test_expect_success 'merge picks up the best result' ' 115 115 git config --unset-all pull.twohead &&

+1 -1

t/t9020-remote-svn.sh

··· 24 24 rm -fr .git && 25 25 git init && 26 26 #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump 27 27 - # let's reuse an exisiting dump file!? 27 27 + # let's reuse an existing dump file!? 28 28 git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump 29 29 git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump 30 30 }

+1 -1

t/t9112-git-svn-md5less-file.sh

··· 7 7 # Loading a node from a svn dumpfile without a Text-Content-Length 8 8 # field causes svn to neglect to store or report an md5sum. (it will 9 9 # calculate one if you had put Text-Content-Length: 0). This showed 10 10 - # up in a repository creted with cvs2svn. 10 10 + # up in a repository created with cvs2svn. 11 11 12 12 cat > dumpfile.svn <<EOF 13 13 SVN-fs-dump-format-version: 1

+1 -1

t/t9802-git-p4-filetype.sh

··· 28 28 test_cmp f-unix-orig f-unix && 29 29 30 30 # make sure stored in repo as unix newlines 31 31 - # use sed to eat python-appened newline 31 31 + # use sed to eat python-appended newline 32 32 p4 -G print //depot/f-unix | marshal_dump data 2 |\ 33 33 sed \$d >f-unix-p4-print && 34 34 test_cmp f-unix-orig f-unix-p4-print &&

+2 -2

transport-helper.c

··· 1132 1132 #ifndef NO_PTHREADS 1133 1133 1134 1134 /* 1135 1135 - * Join thread, with apporiate errors on failure. Name is name for the 1135 1135 + * Join thread, with appropriate errors on failure. Name is name for the 1136 1136 * thread (for error messages). Returns 0 on success, 1 on failure. 1137 1137 */ 1138 1138 static int tloop_join(pthread_t thread, const char *name) ··· 1198 1198 } 1199 1199 1200 1200 /* 1201 1201 - * Join process, with apporiate errors on failure. Name is name for the 1201 1201 + * Join process, with appropriate errors on failure. Name is name for the 1202 1202 * process (for error messages). Returns 0 on success, 1 on failure. 1203 1203 */ 1204 1204 static int tloop_join(pid_t pid, const char *name)