On 23.03.2012 15:16, Alex Wilson wrote:
On Fri, Mar 23, 2012 at 2:11 PM, Stefano Ceccherini <stefano.ceccherini@xxxxxxxxx> wrote:2012/3/23 Rene Gollent <anevilyak@xxxxxxxxx>:FYI, using git pull --rebase (or configuring git to do so by default) would avoid these appearing in your pushes. Regards, ReneArgh! Completely forgot about these other changes, since I made them eons ago. I thought I only had the OptionalBuildFeatures change in the commit queue. Sorry!Before pushing, I like to do a `git log origin/master..master` to see exactly what changes I'm sending upstream.
"git status" should show how many commits you are ahead of origin/master :)I personally like the git railroad. My default system setup script runs the following:
git config --global alias.rr "log --color --graph --pretty=format:'%Cred%h%Creset - %Cgreen<%ae>%Creset - %Cblue(%cr)%Creset -%C(yellow)%d%Creset %s' --abbrev-commit --date=relative"
That will make "git rr" give you a nice pretty (color!) history showing branches.
-- Alex