[IIAB] fundraising; git rebase; email for iiab

[Braddock]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

It is _cleaner_ to rebase, particularly if you have only touched one
small thing and are pretty sure there aren't any real conflicts.

It is _safer_ to merge.  It is kind of easier to manage conflicts, so
if I have diverged a lot I will merge instead of rebase.  But the repo
history gets uglier.

However I am not a git expert.

- -braddock

On 08/04/2013 12:11 PM, yoshio wrote:
> I found an article at http://lwn.net about fundraising: 
> http://lwn.net/Articles/560381/
> 
> http://lwn.net/ is a great resource.
> 
> ---
> 
> I was wondering what the following messages mean: Merge
> remote-tracking branch 'origin/master' Merge branch 'master' of
> https://github.com/braddockcg/internet-in-a-box
> 
> I was told to do: git fetch git pull
> 
> In http://wiki.winehq.org/GitWine it says to do: git fetch git
> rebase origin
> 
> So I typed the following into https://duckduckgo.com/ : difference
> "git rebase origin" "git pull"
> 
> One of the search results was: 
> http://mislav.uniqpath.com/2013/02/merge-vs-rebase/ and it
> recommends to do a "git pull --rebase" because: When you want to
> push your changes to a branch, but someone else already pushed
> before you, you have to pull in their changes first. Normally, git
> does a merge commit in that situation.
> 
> Such merge commits can be numerous, especially between a team of
> people who push their changes often. Those merges convey no useful
> information to others, and litter the project’s history.
> 
> You should always pull with git pull --rebase.
> 
> I've been using "git rebase origin", and have not gotten the merge 
> messages in the git history (with me as a committer of those
> merges). Is everyone else using "git pull"?
> 
> ---
> 
> The messages.pot has the line: Report-Msgid-Bugs-To:
> internet-in-a-box at noreply.github.com Is this email address ok for
> translation bugs?
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJR/x1jAAoJEHWLR/DQzlZuGtwH/0LzUDT9ux4T06vIrZt6Fpju
VQWIzI0VVb1BAWmHxcH3iY6BazZH4sWCp96zSqJNCseezVcq2vKZhcAaeqB5t6/c
lYRZ0vK2cJfC0fKh8T+r7XQVvUZ17X15yQZqAPR+2IPkIG/pvxPljCR/V6LXsgry
4HnowK1tSw6JXIv7EbQ3dwqVe62yC01FkuRpgmWaVwPwd0HLlN+C2pZRPb7q6IB3
SDjMc+zjT6q1QMxdsmAIds6GQw1iNZI/PtoxcJOTgSKCiygq7vadDym1Lv7tzGuX
GtN1IDmVnZoHE+O5GrBJMVBDnBEGkWkVtIlFDtKhxYzxw34rK77LZOU96vYQ3Rc=
=0jJj
-----END PGP SIGNATURE-----