Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: Lump commit HOWTO?

From: martin f krafft <hidden>
Date: 2016-06-15 22:43:21

also sprach Josh Boyer [off-list ref] [2007.07.13.0321 +0200]:
8) take all local commits (A - D) and create a single commit without
any of the upstream changes in it
This is entirely untested and since I am a newbie, it might well not
work, but shouldn't the following do what you want?

git log origin..master --> gives you the local commits not in origin
git checkout -b merger
git merge --squash <sha> <sha> <sha> ...
git commit ...

-- 
martin;              (greetings from the heart of the sun.)
  \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
 
spamtraps: madduck.bogus@madduck.net
 
officer, arrest that man! he's whistling a copyrighted song.

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help