Updating the currently checked out branch this may cause confusion

But this rebase requires the commits on the source branch to be [An aside: merging in Git can sometimes result in a special case: the ‘fast forward merge’.

In contrast, rebasing unifies the lines of development by re-writing changes from the source branch so that they appear as children of the destination branch – effectively pretending that those commits were written on top of the destination branch all along.

Here’s a visual comparison between merging and rebasing a branch ‘feature/awesomestuff’ back to the master branch (click for full size): So merging keeps the separate lines of development explicitly, while rebasing always ends up with a single linear path of development for both branches.

..." to include in what will be committed) # # next-actions.nothing added to commit but untracked files present (use "git add" to track) $ git add next-actions.$ git commit -m 'getting started' [master (root-commit)]: created e98f811: "getting started" 1 files changed, 4 insertions( ), 0 deletions(-) create mode 100644 next-actions.$ git log commit e98f811b6b67ffd354ff33ef5df3da872a8e7059 Author: William Denton $ cd york $ git clone picketfence:york/gtd/ Initialized empty Git repository in /home/buff/york/gtd/.git/ remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Receiving objects: 100% (3/3), 268 bytes, done.

$ git commit -m 'update' next-actions.[master]: created 15f2969: "update" 1 files changed, 1 insertions( ), 0 deletions(-) $ git status # On branch master # Your branch is ahead of 'origin/master' by 1 commit. Total 3 (delta 0), reused 0 (delta 0) warning: updating the currently checked out branch; this may cause confusion, as the index and working tree do not reflect changes that are now in HEAD.

IMPORTANT NOTE: although this page has a "gitolite.com" URL, this is not about gitolite.

That's just an artifact of "sitaramc.github.com" being translated to "gitolite.com" and so ALL my git related stuff gets carried over.The copy below might be better edited and nicer to read, but is likely to contain some advices and commands that may not match the current best practices anymore.In those small tables, at the left we always list the Git commands for the task, while at the right the corresponding Subversion commands you would use for the job are listed.# nothing to commit (working directory clean) $ git push Counting objects: 5, done. To picketfence:york/gtd e98f811..15f2969 master - The next day at work I did the same thing and made a local copy of the repository there.I made my lists and so on, and at the end of the day I committed all of the files. Now I have an easy way of keeping my GTD files in synch across various machines.To manage the GTD files I settled on outline mode, which is built into Emacs. Here's an example of mine: * E-mail ** Catherine: accurate collection stats for Wikipedia entry ** LCC: will be away for next meeting ** Peter R: is Joomla in use anywhere at York?

Tags: , ,