How to tell git which private key to use?

Git, 程式設計 No Responses »

3 月 032023

Source: How to tell git which private key to use?

How to git-cherry-pick only changes to certain files?

Git No Responses »

4 月 012021

Source: How to git-cherry-pick only changes to certain files?

I’d do it with cherry-pick -n (--no-commit) which lets you inspect (and modify) the result before committing:

git cherry-pick -n <commit>

# unstage modifications you don't want to keep, and remove the
# modifications from the work tree as well.
# this does work recursively!
git checkout HEAD <path>

# commit; the message will have been stored for you by cherry-pick
git commit

If the vast majority of modifications are things you don’t want, instead of checking out individual paths (the middle step), you could reset everything back, then add in what you want:

# unstage everything
git reset HEAD

# stage the modifications you do want
git add <path>

# make the work tree match the index
# (do this from the top level of the repo)
git checkout .

How to keep a git branch in sync with master

Git No Responses »

6 月 292020

Source: How to keep a git branch in sync with master

git checkout master
git pull origin master
git checkout mobiledevicesupport
git merge master

to keep mobiledevicesupport in sync with master

then when you’re ready to put mobiledevicesupport into master, first merge in master like above, then …

git checkout master
git merge mobiledevicesupport
git push origin master

the assumption here is that mobilexxx is a topic branch with work that isn’t ready to go into your main branch yet. So only merge into master when mobiledevicesupport is in a good place