Evergreen DokuWiki

User Tools

Site Tools

You are here: start » newdevs » git » commands
newdevs:git:commands

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
newdevs:git:commands [2024/03/25 16:29] – [Squash Commits] tmccannanewdevs:git:commands [2024/03/25 16:35] (current) – tmccanna
Line 35: Line 35:
   * ''git fetch working'' --> fetches all new branches in the working directory   * ''git fetch working'' --> fetches all new branches in the working directory
   * ''git help'' --> access the built-in Git help documentation   * ''git help'' --> access the built-in Git help documentation
-  * ''git log <nowiki>--oneline</nowiki>'' --> list previous commits with their unique ids+  * ''git log'' --> lists most recent commits with details 
 +  * ''git log <nowiki>--name-only</nowiki'' --> lists first line only of most recent commits 
 +  * ''git log <nowiki>--oneline</nowiki>'' --> lists id plus first line only of most recent commits
   * ''git pull'' --> imports all updates from your default remote repo to your default local repo (usually, this is equivalent to 'git pull origin main'); pull is equivalent to doing a fetch followed by a merge   * ''git pull'' --> imports all updates from your default remote repo to your default local repo (usually, this is equivalent to 'git pull origin main'); pull is equivalent to doing a fetch followed by a merge
   * ''git pull origin main'' --> import all updates from remote origin repo to local main repo   * ''git pull origin main'' --> import all updates from remote origin repo to local main repo
Line 84: Line 86:
     * fixup --> merges commits like squash does, but discards previous commit message     * fixup --> merges commits like squash does, but discards previous commit message
   - Use "git commit --amend" if you need to edit the final commit message   - Use "git commit --amend" if you need to edit the final commit message
 +  - Push the changes up to your remote working directory as normal
 +    * ''git push working user/jdoe/lp1839359_login_select''
  
 If you've already pushed multiple commits up to your remote working git repository, you can still combine them: If you've already pushed multiple commits up to your remote working git repository, you can still combine them:
  
-  - Verify that you are in your local branch. +  - Follow the steps above, but when pushing, use "--force" 
-  - Type: ''git rebase -i origin/main'' +    * ''git push <nowiki>--force</nowiki> working user/jdoe/lp1839359_login_select''
-    * Alternatively if your branch is already built on current main, you can use: ''git rebase -i HEAD~4''   (where 4 is the number of commits you wish to combine)     +
-  - Your text editor will open and should show the list of commits +
-  - Change the word "pick" in the second line to either "fixup" or "squash" then save and close the file +
-  - Push the commit again, and force it to overwrite the previous commits: +
-    * ''git push <nowiki>--force</nowiki> working lp1839359_login_select:user/jdoe/lp1839359_login_select''+
  
  
newdevs/git/commands.1711398585.txt.gz · Last modified: 2024/03/25 16:29 by tmccanna
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
CC Attribution-Share Alike 4.0 International Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki

© 2008-2022 GPLS and others. Evergreen is open source software, freely licensed under GNU GPLv2 or later.
The Evergreen Project is a U.S. 501(c)3 non-profit organization.