diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-01 22:22:03 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-01 22:22:03 +0200 |
| commit | 30d53f88beb52e2682fa9814bad25f803a856c54 (patch) | |
| tree | 3c04e8d5dada0cfb96f87864cddfc6360cef74b6 /README.git | |
| parent | 79796c4b5882e559a6a5f5453e47f8936df6a397 (diff) | |
| download | egawk-30d53f88beb52e2682fa9814bad25f803a856c54.tar.gz egawk-30d53f88beb52e2682fa9814bad25f803a856c54.tar.bz2 egawk-30d53f88beb52e2682fa9814bad25f803a856c54.zip | |
Doc updates.
Diffstat (limited to 'README.git')
| -rw-r--r-- | README.git | 25 |
1 files changed, 24 insertions, 1 deletions
@@ -1,4 +1,4 @@ -Sun Aug 5 16:25:58 IDT 2012 +Sat Dec 1 21:53:02 IST 2012 ============================ If you are reading this, you have retrieved the gawk code base via @@ -327,3 +327,26 @@ turn, followed by "bzr pull" to sync the branch. It depends upon if you have pushed the commit or not. Lots of good info is at http://stackoverflow.com/questions/927358/git-undo-last-commit . + +- What is the difference between using `git rebase' and `git merge' ? + +Both of these can be used to bring one branch up to date with respect +to another. For example, if you are working on a feature branch based +off master, and master has since progressed, you can use + + git checkout feature + git merge master + +or + + git checkout feature + git rebase master + +In the end, you will have your changes on top of the current version of +master in the feature branch. + +So which to use? The answer depends on whether your feature branch +has been pushed up to the Savannah repo or not. + +If your branch is completely local to your machine, use `git rebase'. +Otherwise, use `git merge'. |