1. create a new topic branch.2. revert your botched changes in curses/ux_audio_oss.c.3. you need to tell Git if you added a new file; removal and modification will be caught if you do git commit -a later.4. to see what changes you are committing.5. commit everything, as you have tested, with your sign-off.6. look at all your changes including the previous commit.7. amend the previous commit, adding all your new changes, using your original message.8. switch to the master branch.9. merge a topic branch into your master branch.10. review commit logs; other forms to limit output can be combined and include -10 (to show up to 10 commits), --until=2005-12-10, etc.11. view only the changes that touch what’s in curses/ directory, since v2.43 tag.

1. checkout a new branch mine from master.2. repeat as needed.3. extract patches from your branch, relative to master,4. and email them.5. return to master, ready to see what’s new6. git pull fetches from origin by default and merges into the current branch.7. immediately after pulling, look at the changes done upstream since last time we checked, only in the area we are interested in.8. check the branch names in an external repository (if not known).9. fetch from a specific branch ALL from a specific repository and merge it.10. revert the pull.11. garbage collect leftover objects from reverted pull.

1. mothership machine has a frotz repository under your home directory; clone from it to start a repository on the satellite machine.2. clone sets these configuration variables by default. It arranges git pull to fetch and store the branches of mothership machine to local remotes/origin/* remote-tracking branches.3. arrange git push to push all local branches to their corresponding branch of the mothership machine.4. push will stash all our work away on remotes/satellite/* remote-tracking branches on the mothership machine. You could use this as a back-up method. Likewise, you can pretend that mothership "fetched" from you (useful when access is one sided).5. on mothership machine, merge the work done on the satellite machine into the master branch.

A fairly central person acting as the integrator in a group project receives changes made by others, reviews and integrates them and publishes the result for others to use, using these commands in addition to the ones needed by participants.

This section can also be used by those who respond to git request-pull or pull-request on GitHub (www.github.com) to integrate the work of others into their history. An sub-area lieutenant for a repository will act both as a participant and as an integrator.

1. see what you were in the middle of doing, if anything.2. see which branches haven’t been merged into master yet. Likewise for any other integration branches e.g. maint, next and pu (potential updates).3. read mails, save ones that are applicable, and save others that are not quite ready (other mail readers are available).4. apply them, interactively, with your sign-offs.5. create topic branch as needed and apply, again with sign-offs.6. rebase internal topic branch that has not been merged to the master or exposed as a part of a stable branch.7. restart pu every time from the next.8. and bundle topic branches still cooking.9. backport a critical fix.10. create a signed tag.11. make sure master was not accidentally rewound beyond that already pushed out.12. In the output from git show-branch, master should have everything ko/master has, and next should have everything ko/next has, etc.13. push out the bleeding edge, together with new tags that point into the pushed history.

In this example, the ko shorthand points at the Git maintainer’s repository at kernel.org, and looks like this:

1. log-in shell is set to /usr/bin/git-shell, which does not allow anything but git push and git pull. The users require ssh access to the machine.2. in many distributions /etc/shells needs to list what is used as the login shell.

1. place the developers into the same git group.2. and make the shared repository writable by the group.3. use update-hook example by Carl from Documentation/howto/ for branch policy control.4. alice and cindy can push into master, only bob can push into doc-update. david is the release manager and is the only person who can create and push version tags.