Plans for git (was: Please check the current beta git conversions)

[Mark Millard]

Warner Losh imp at bsdimp.com wrote on
Sat Sep 5 16:57:41 UTC 2020 :

> On Fri, Sep 04, 2020 at 10:59:18PM -0600, Warner Losh wrote:
> >
> > I have this out for review.
> >
> > https://hackmd.io/hJgnfzd5TMK-VHgUzshA2g
> >


Note 0:

The part about using 'git stash' and 'git stash apply'
does not present anything to drop the top of the
stash. I suffered this recently and ended up with
a much latter accidental reapply of an older,
already applied stash. I had a long list of
stashes to clean out of things that already had
been applied earlier. (It was not a FreeBSD repository.)

'git stash pop' does the apply then a drop (success
case). Otherwise a separate 'git stash drop' gets
rid of the top stash when you no longer need it.


Note 1:

QUOTE
You saw them above in the conflict when it said it couldn’t apply “646e0f9cda11”
END QUOTE

The 646e0f9cda11 material/conflict is actually later/below in the document.


Note 2:

QUOTE
This method is suitable when you have tiny tweaks to the tree. When you have anything non trivial, you’ll likely be better off keeping a local branch and rebasing. It is also integreated with the ‘git pull’ command: just add ‘–autostash’ to the command line.
END QUOTE

The "It is" from the 3rd sentence of the paragraph does not refer
to material from the 2nd sentence but to material from the 1st
sentence. I'd expect that sentences 2 and 3 should be swapped.

"integreated" has a typo.


===
Mark Millard
marklmi at yahoo.com
( dsl-only.net went
away in early 2018-Mar)