Lines Matching refs:and
11 https://git-scm.com/ and build from source.
26 dating back to 1991. The repository (the part you download, and which
35 If you *have* made changes and mistakenly committed them to "master",
36 do the following to put your changes on a private branch, "br", and
53 it if needed, and put your name and email address in place of these
61 Your first commit: the quick and dirty way
70 include a one-line summary, a blank line, and ChangeLog-style entries
74 a log message and authorship information as well as any permissions
80 (remember, it's only local) on the "master" branch, and that's where new
87 However, if your cloned directory is for a one-shot patch submission and
89 Otherwise, for a more sustainable (and more generally useful, IMHO)
99 Now, cd into the coreutils/ directory and run:
103 That creates the my-topic branch and puts you on it.
129 Now, modify some file and commit it:
137 a step further, and no longer maintain an explicit ChangeLog file in
144 and only on your "my-topic" branch. Let's say you wait a day, and
145 then see that someone else changed something and pushed it to the
146 public repository. Now, you want to update your trunk and "rebase"
157 Now, return to your branch, and "rebase" relative to trunk (master):
164 follow my advice and modified it anyway.
165 git rebase will tell you there was a conflict and in which
166 file, and instruct you to resolve it and then resume with
190 branch, and then realize that something about it is not right.
208 and the commit log. Now we put that information only in the commit log,
209 and generate the top-level ChangeLog file from logs at "make dist" time.
217 line should be blank, and the remaining lines are usually ChangeLog-style
220 and ChangeLog entries don't give enough of the big picture. Omit the
239 like "Introduced by commit v8.12-103-g54cbe6e." and add something like
310 brace-less block is an "else" block, and the corresponding "then" block
312 block, or negate the "if"-condition and swap the bodies, putting the
313 one-line block first and making the longer, multi-line block be the
325 few lines long, because it is easier to read and grasp the semantics of
353 If you use Emacs and your coreutils working directory name matches,
357 ;; Exceptions: Makefile and ChangeLog modes.
359 (if (and buffer-file-name
365 If you use vim (7+ compiled with autocommands), and coreutils working
383 [*] Makefile and ChangeLog files are exempt, of course.
398 (i.e., in the usage function that generates the --help output) and in
416 mathematics background and perhaps a streak of something odd in their
418 In writing arithmetic comparisons, use "<" and "<=" rather than
419 ">" and ">=". For some justification, read this:
431 strings), extract and create new strings, rather than extracting
432 and moving into existing blocks. This avoids making unnecessary
465 and someone else will massage that into a test (writing portable tests
473 Since that involves first an email exchange between you and the FSF,
474 and then the exchange (FSF to you, then back) of an actual sheet of paper
475 with your signature on it, and finally, some administrative processing
484 If you would like to assign past and future contributions to a project,
498 Making either of those targets runs many integrity and
500 ensures that you add no trailing blanks and no uses of certain deprecated
501 functions. The latter performs all "syntax-check" tests, and also
505 versions of gcc and the linux kernel, and modern GNU tools.
539 for trailing whitespace and spaces before tabs; enable it by moving it
540 to the right place and making sure it is executable:
569 change set, in a format suitable to be submitted and/or applied via
573 * git rebase -i master: run this from on a branch, and it gives
574 you an interface with which you can reorder and modify arbitrary
579 its SHA1 and then tag it or cherry-pick it onto an existing branch.
600 uncover when you improve test coverage, and even if you don't find
604 and root only tests, is to follow these steps (requires lcov to be installed):
621 Permission is granted to copy, distribute and/or modify this document
624 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover