Ben Kurtovic
31a94772ff
Rework branch updating code to be safer and support bare repos ( #14 )
* Only update _fast-forwardable_ branches to their upstreams. This uses
`git merge --no-ff` for the active branch and `git branch --force`
for others. Checks for clean working directories and ancestry are
performed as expected.
* Added --fetch-only / -f to disable branch updating entirely, if
desired.
* Deprecated --merge and --rebase. These have no effect now and instead
give a warning.
pirms 9 gadiem
Ben Kurtovic
8439805e38
Wording tweaks; update brew instructions ( fixes #13 )
pirms 9 gadiem
Ben Kurtovic
4e8dab5aab
Copyright update for 2015; dev version up for 0.2.5.
pirms 9 gadiem
Ben Kurtovic
2be8edfa9f
Update README; --preserve-merges as promised.
pirms 10 gadiem
Ben Kurtovic
b247d90f00
Remove mostly useless verbose option; clean up output.
pirms 10 gadiem
Ben Kurtovic
8b07934369
More work on GitPython integration.
pirms 10 gadiem
Ben Kurtovic
48ebdf0264
Add some new arguments.
pirms 10 gadiem
Ben Kurtovic
25127f4e94
Finish conversion from output.py to colorama.
pirms 10 gadiem
Ben Kurtovic
910b53aeba
Split code into multiple files.
pirms 10 gadiem
Ben Kurtovic
e74944165a
Starting work on the new package structure.
pirms 10 gadiem
Ben Kurtovic
91344c10a7
Quick fix for #4 until I implement GitPython.
pirms 10 gadiem
Ben Kurtovic
290d091e90
Version bump, doc updates, gitignore update.
pirms 10 gadiem
Ben Kurtovic
2d8872dbcd
Email address update.
pirms 11 gadiem
Ben Kurtovic
ce50561a81
Update copyright for 2012.
pirms 12 gadiem
Ben Kurtovic
faf9627491
made per-style functions (bold(), red(), blue()...) and (tried to) clean up styling more
pirms 13 gadiem
Ben Kurtovic
96078165a1
whitespace paranoia
pirms 13 gadiem
Ben Kurtovic
1e8695bcee
converting old formatting to style(), hopefully this makes things neater
pirms 13 gadiem
Ben Kurtovic
235e790cbd
adding style(text, effect) function
pirms 13 gadiem
Ben Kurtovic
80d9bd8e37
alphabetically sort each repo when doing a directory of repos
pirms 13 gadiem
Ben Kurtovic
41354a1569
removed unnecessary get_tail_name() function and replaced with os.path.split()[1]
pirms 13 gadiem
Ben Kurtovic
67e3188d43
'project' -> 'repo' in some places
pirms 13 gadiem
Ben Kurtovic
887890baf3
initial commit of script files
pirms 13 gadiem