Use this if merging has resulted in conflicts and you'd like to start over. WARNING: Any changes to tracked files in the working tree reset -hard Matches the workspace and index to the local tree. Reset -soft HEAD^ Undo the last commit, leaving changes in the index. Resets the index but not the working tree (i.e., the changedįiles are preserved but not marked for commit) and reports what has not been updated. Remove the specified files from the next commit. or dir Updates the file or directory in the workspace. Remove files in the index that have been removed from the workspace.Ĭheckout files(s). commit -a -m 'msg' Commit all files changed since your last commit, except untracked files (ie. Move file in the workspace and the index.

Remove a file from the workspace and the index. This is similar to what 'git commit -a' does Use add -interactive to add the modified contents in the workspaceĪdd -u Adds the current content of modified (NOT NEW) files to the index. Adds the current content of new or modified files to the index, thus staging that content for inclusion in the To compare it with the latest commit, or a branch name to compare with the tip of a different branchĪdd file. diff commit or branch View the changes you have in your workspace relative to the named commit. Stash workspace index local repository upstream repository status Displays paths that have differences between the index file and the current HEAD commit, paths that haveĭifferences between the workspace and the index file, and paths in the workspace that are not tracked by git.ĭiff Displays the differences not added to the index.

James chambers git cheat sheet