This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
software:git [2018/07/25 17:06] dave |
software:git [2018/09/24 14:19] (current) dave |
||
---|---|---|---|
Line 62: | Line 62: | ||
</code> | </code> | ||
- | Applies ''<other_branch>>'' into the current branch as a single set of //staged// changes which are not committed. Afterward, use ''git commit'' as per usual. | + | Applies all of the changes made to ''<other_branch>'' to the working copy as a single set of //staged// changes which is ready to be committed. Use ''git commit'' as per usual. |
+ | |||
+ | ==== List Remote Branches == | ||
+ | |||
+ | After initially cloning a repository, git is only aware of the the default branch, which is usually ''master''. | ||
+ | |||
+ | <code> | ||
+ | $git branch | ||
+ | * master | ||
+ | </code> | ||
+ | |||
+ | Use ''-a'' to list remote branches: | ||
+ | |||
+ | <code> | ||
+ | $git branch -a | ||
+ | * master | ||
+ | remotes/origin/HEAD -> origin/master | ||
+ | remotes/origin/release | ||
+ | </code> | ||
+ | |||
+ | ===== Misc Tasks == | ||
+ | |||
+ | ==== Show only the files that are modified as a commit == | ||
+ | |||
+ | This removes the diff lines from the ''show'' command (''+''/''-'' lines): | ||
+ | |||
+ | <code> | ||
+ | $git show <hash> --name-only | ||
+ | </code> | ||
//*Compared to other version control systems.// | //*Compared to other version control systems.// | ||