git rebase for keeping most recent commit -



git rebase for keeping most recent commit -

i have commits a, b, c , d , need maintain recent 1 d. see 1 way using git rebase -i --root can pick , crush commits.

although don't understand difference between pick , crush much, made wondering since commits incremental commit d includes changes in between, why have go through git rebase keeping recent commit , not delete rest of commits?

or missing fundamental git? can have commits unrelated between each other? i.e someday utilize commit b , in situation utilize recent commit d?

git commits aren't incremental, each commit contains entire tree. user interface presents commit in terms of differences parent. in sense, don't have go through git rebase maintain recent commit , discard rest, can utilize git commit-tree plumbing command create commit. total equivalent of rebase line this:

git reset --hard $(git commit-tree head: -m message)

that dense line following:

head: refers tree object contained in current head commit.

git commit-tree tree -m message creates new parentless commit contains specified tree, in our case tree of head. output sha1 of newly created commit.

git reset --hard commit resets current branch , working tree specified commit, in case newly created root commit.

creating commits without history discouraged git because such commits create hard git operate on data. commands git annotate , git merge rely heavily on history beingness available, , without git much less useful tool.

git git-rebase

Comments

Post a Comment

Popular posts from this blog

Delphi change the assembly code of a running process -

Delphi change the assembly code of a running process - i'm trying alter address 00741fa5 has push test.009e721c . alter push test.009e71c8 . procedure callback; asm force $9e71c8 end; procedure tform2.btn1click(sender: tobject); var ppid :dword; pprocess : cardinal; begin getwindowthreadprocessid(findwindow(nil,pchar('test')), @ppid); pprocess := openprocess(process_all_access, false, ppid); injectasm(pprocess, $741fa5, 10, integer(@callback), 0); end; here injectasm function (with error checking) function injectasm(process: longword; injectaddress, injectsize, codeaddress, codesize : integer): pointer; var csize, rsize : integer; replaced : array of byte; jmp : array [0..4] of byte; jmpaddress : integer; nopv : byte; : integer; nbr: ulong_ptr; begin //injectsize must equal or greater 5, because need space our //(far) jmp wwxxyyzz instruction //if there's no space, inject in place of few instructions if injectsize ...
Read more

json - Hibernate and Jackson (java.lang.IllegalStateException: Cannot call sendError() after the response has been committed) -

json - Hibernate and Jackson (java.lang.IllegalStateException: Cannot call sendError() after the response has been committed) - hello have problem hibernate , jackson. have 2 pojos @entity @table(name = "users") public class user implements serializable { static final long serialversionuid = 4235637833262722256l; @id @generatedvalue private int id; @column(name = "creation_date") private date creationdate; @column(name = "first_name") private string firstname; @column(name = "last_name") private string lastname; @version @column(name = "version") private int version; @column(name = "e_mail") private string email; @column(name = "enabled") private boolean enabled; @column(name = "login") private string login; @column(name = "password") private string password; @jsonmanagedreference("role") @onetomany(mappedby = "user", cascade = cascadetype.all,fetch = fetchtyp...
Read more

C++ 11 "class" keyword -

C++ 11 "class" keyword - i've started using c++ 11 little bit more , have few questions on special uses of class keyword. know it's used declare class, there's 2 instances have seen don't understand: method<class t>(); and class class_name *var; why precede typename keyword class in first example, , keyword pointer in sec example? that known elaborated type specifier , necessary when class name "shadowed" or "hidden" , need explicit. class t { }; // love of god don't t t; t t2; if compiler smart, give these warnings: main.cpp:15:5: error: must utilize 'class' tag refer type 't' in scope t t2; ^ class main.cpp:14:7: note: class 't' hidden non-type declaration of 't' here t t; ^ if class not defined, deed forwards declaration. for example: template <typename t> void method() { using type = typename t::value_type; } method...
Read more