Differences between revisions 4 and 5
Revision 4 as of 2011-10-14 23:59:08
Size: 1149
Editor: SamatJain
Comment:
Revision 5 as of 2011-12-15 09:54:44
Size: 1323
Editor: SamatJain
Comment: Comment about git soft reset
Deletions are marked like this. Additions are marked like this.
Line 34: Line 34:
git reset --soft HEAD^
}}}

just changes the repository without changing the files you've edited on disk. However:

{{{
Line 36: Line 42:

will reset both repository and revert files.

Workflow for gitorious and github

Initial checkout:

   1 # Fork repo on gitorious/github
   2 # Pull repo from gitorious/github
   3 # Add remote for upstream, e.g.
   4 cd Spoon-Knife
   5 git remote add upstream git://github.com/octocat/Spoon-Knife.git
   6 git fetch upstream

When needing to merge upstream changes back into master:

   1 git fetch upstream
   2 git merge upstream/master

Cookbook

Reverting changes

Amend the previous commit that has not been propogated (i.e. undo it, then start a new one with the pending changes in the index):

git commit --amend -a -m "New commit message"

Undo a commit that has not been propagated:

git reset --soft HEAD^

just changes the repository without changing the files you've edited on disk. However:

git reset --hard HEAD^

will reset both repository and revert files.

Once a commit that has been propagated, there is no way to undo. However, the following will create a new commit undoing the previous commit's changes:

git revert HEAD

Pull with rebase instead of merge

git pull --rebase

Configure a branch to always do a rebase instead of a merge:

git config branch.master.rebase true


CategoryCheatSheet

SamatsWiki: CheatSheet/Git (last edited 2023-03-01 08:30:42 by SamatJain)