Skip to content
This repository was archived by the owner on Apr 12, 2019. It is now read-only.

Add Rebase option to Pull#2

Merged
tboerger merged 1 commit into
go-gitea:masterfrom
vvekic:master
Nov 7, 2016
Merged

Add Rebase option to Pull#2
tboerger merged 1 commit into
go-gitea:masterfrom
vvekic:master

Conversation

@vvekic

@vvekic vvekic commented Nov 6, 2016

Copy link
Copy Markdown

Just a simple addition of the --rebase flag for git pull.

@lunny

lunny commented Nov 6, 2016

Copy link
Copy Markdown
Member

The real problem is how to test it. But it seems it's a long plan to work. Currently LGTM.

@vvekic

vvekic commented Nov 6, 2016

Copy link
Copy Markdown
Author

It is tested no worse than the rest of the package, basically.
I might delve into making tests that create local repos, commits and so on, but as the implementation relies entirely on the system "git" command, I see no point in doing so. The command can be expected to work flawlessly, and so can the extra "--rebase" flag.

@tboerger

tboerger commented Nov 7, 2016

Copy link
Copy Markdown
Member

LGTM

@tboerger
tboerger merged commit 93f55fc into go-gitea:master Nov 7, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants