start > git > Squashing multiple commits into one
Squashing multiple commits into one
(2017-09-14)Squashing multiple commits into one:git log shows you the history:git reset brings the repository pointers back to a given version:Now you can just commit the changes in one go:...and observe the changes:
[dave@store02 ansible]$ git log commit 777574670a1c5dccc91f12320a811759163e4ff9 Author: David Mackintosh <dave@gridway.net> Date: Thu Sep 14 12:20:31 2017 -0400 davem.sh handles centos and fedora nowcommit 22a613ea808bd00ab86b1c432968a5207c814f38 Author: David Mackintosh <dave@gridway.net> Date: Thu Sep 14 11:36:51 2017 -0400 fix fedora version checkcommit e5d4c928c8bdfed6afdfd35b9c5f50883326f99a Author: David Mackintosh <dave@store02.gridwayit.local> Date: Thu Sep 14 11:23:46 2017 -0400 back to post-fedora version of davem.shcommit 241e3d9efc0842dfb91553691790d4c487e9c072 Author: David Mackintosh <dave@store02.gridwayit.local> Date: Thu Sep 14 11:23:10 2017 -0400 pre-fedora version of davem.shcommit 4995a0fe82ba1491a55e8f7af3ad67d305533148 Author: David Mackintosh <dave@store02.gridwayit.local> Date: Thu Sep 14 11:14:32 2017 -0400 Initial commit
[dave@store02 ansible]$ git reset 241e3d9efc0842dfb91553691790d4c487e9c072 Unstaged changes after reset: M roles/environment/davem.sh
[dave@store02 ansible]$ git commit -m "Change centos/redhat/fedora and version detection" roles/environment/davem.sh [master 2c0d620] Change centos/redhat/fedora and version detection 1 files changed, 36 insertions(+), 16 deletions(-)
[dave@store02 ansible]$ git log commit 2c0d620f012d2c931e287a779fb4892a876aa7d6 Author: David Mackintosh <dave@gridway.net> Date: Thu Sep 14 12:28:18 2017 -0400 Change centos/redhat/fedora and version detectioncommit 241e3d9efc0842dfb91553691790d4c487e9c072 Author: David Mackintosh <dave@store02.gridwayit.local> Date: Thu Sep 14 11:23:10 2017 -0400 pre-fedora version of davem.shcommit 4995a0fe82ba1491a55e8f7af3ad67d305533148 Author: David Mackintosh <dave@store02.gridwayit.local> Date: Thu Sep 14 11:14:32 2017 -0400 Initial commit
no comments |
post comment
Virtual Dave Megaplex:
Home Page- This wiki's start page
- Send Feedback To Dave
Logged in Users: (0)
Recently Changed
Check Internet Service Database Match- Device-Local Certificate Expired
- CLI Policy Lookup
- DH Selection For IPsec VPNs
- Scan For Newly Added Disk
- nmap
- Seconds Since Epoch to Local Time
- Link Monitor
- DH group to OAKLEY_GROUP table
- Fire Eater
- start
- FortiClient Error Codes
- dhparams Generation
- SSL Certificate Bundles
- ufw
- Grow A LVM Partition
- Creating Users
- whoami
- list databases
- 2023
- 2022
- 2019
- 2018
- 2017
- 2011
- 2010
- 2008
- 2001
- 2000
- 1999
Editing: snipsnap-help, Image Macro(Et auditum est, et idcirco ego nunc simulare)
This is a collection of techical information, much of it learned the hard way. Consider it a lab book or a /info directory. I doubt much of it will be of use to anyone else.