Although, again, before someone gets angry, some groups choose to merge in this case as well instead. There are lots of legit choices. Projects tend to come to consensus on how they operate with these things. There is no 'correct' choice, just opinions and what the project coalesces around.
- Mark On Mon, Jan 25, 2016 at 12:45 PM Mark Miller <[email protected]> wrote: > >> The next step is merging to branch_5x > >> How do you recommend I do it? > > Generally, people use 'cherry-pick' for this. > > - Mark > > On Mon, Jan 25, 2016 at 12:39 PM Noble Paul <[email protected]> wrote: > >> The most common usecase is >> Do development on trunk(master) >> >> git commit to master >> git push >> >> >> The next step is merging to branch_5x >> How do you recommend I do it? >> >> Another chore we do is on adding new files is >> svn propset svn:eol-style native <file-name> >> >> do we have an equivalent for that in git? >> >> >> On Mon, Jan 25, 2016 at 10:20 PM, Yonik Seeley <[email protected]> wrote: >> >> git push origin HEAD:master (this is the equivalent of svn commit) >> >> (b) Is there a less verbose way to do it, >> > >> > I'm no git expert either, but it seems like the simplest example of >> > applying and committing a patch could be much simpler by having good >> > defaults and not using a separate branch. >> > >> > 1) update your repo (note my .gitconfig makes this use rebasing) >> > $ git pull >> > >> > 2) apply patch / changes, run tests, etc >> > >> > 3) commit locally >> > $ git add # add the changed files.. use "git add -u" for adding all >> > modified files >> > $ git commit -m "my commit message" >> > >> > 4) push to remote >> > $ git push >> > >> > -Yonik >> > >> > ------------ my .gitconfig ---------- >> > [user] >> > name = yonik >> > email = [email protected] >> > >> > [color] >> > diff = auto >> > status = auto >> > branch = auto >> > >> > [alias] >> > br = branch >> > co = checkout >> > l = log --pretty=oneline >> > hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph >> --date=short >> > >> > [branch] >> > autosetuprebase = always >> > >> > [push] >> > default = tracking >> > >> > --------------------------------------------------------------------- >> > To unsubscribe, e-mail: [email protected] >> > For additional commands, e-mail: [email protected] >> > >> >> >> >> -- >> ----------------------------------------------------- >> Noble Paul >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> >> -- > - Mark > about.me/markrmiller > -- - Mark about.me/markrmiller
