git-up

git-up copied to clipboard

pull --rebase --autostash does NOT the same thing

5

What I used git up for: - See if every branch is in a valid state. - Valid means: - Nothing to stash - Remote / tracking branch is set...

ScreamingDev

Whitespace changing

1

If I commit some code, then someone else commits and pushes, then I run `git up` so it rebases, sometimes the whitespace changes from `4 spaces` to a `tab`. Any...

s10wen

Please explain how git solves the current problem?

16

Please update README with a section explaining how recent git versions solved this problem

maximveksler

update git alias to cover edge case

2

from https://github.com/aanand/git-up/issues/118#issuecomment-222141333

harlantwood

When we merge changes and remove the remote branch, we need to manually remove the local branch. But if it is someone else that ships your code, you probably will...

jadercorrea

Updated rebase functionality to use "git pull --rebase"

4

milosm

I was just graced with a Ruby 1.8 project and learned the hard way that while git-up installs just fine under Ruby 1.8.7, posix-spawn 0.3.9 (itself a grit dependency) blows...

chastell

I haven't used RVM for ages; it normally just sits there quietly overriding the OS X default ruby install for me. So, when I hit these instructions, it took me...

nanoamp

Shell output: ``` Failed to rebase w&b onto origin/w&b Here's what Git said: /bin/sh: b: command not found ```

lieuwex

.git of Submodule not followed

10

So, I have a repo with some submodules. I wanted to use git-up in one of the submodules, but rather than a .git folder, it had a .git FILE containing...

Erhannis