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.
9 vuotta sitten
Ben Kurtovic
fddc0cb465
Better error message when mixing --current-only with a detached HEAD.
9 vuotta sitten
Ben Kurtovic
5a4e49ea56
Don't update branches for bare repos ( #14 )
9 vuotta sitten
Ben Kurtovic
2791418b9f
Better solution to previous commit.
9 vuotta sitten
Ben Kurtovic
a9e2a1fe8d
Don't try to fetch remotes without configured refspecs.
9 vuotta sitten
Ben Kurtovic
8439805e38
Wording tweaks; update brew instructions ( fixes #13 )
9 vuotta sitten
Ben Kurtovic
4e8dab5aab
Copyright update for 2015; dev version up for 0.2.5.
9 vuotta sitten
Ben Kurtovic
2fea39f929
Merge branch 'develop'
9 vuotta sitten
Ben Kurtovic
79c1651489
release/0.2.4
9 vuotta sitten
Ben Kurtovic
6e6db21533
Migrate old config files ( #12 )
9 vuotta sitten
Ben Kurtovic
07c6e68b33
XDG Base Directory compliance ( fixes #12 )
9 vuotta sitten
Ben Kurtovic
bc80ab6a3c
Tweak README installation instructions.
9 vuotta sitten
Ben Kurtovic
e2c637774d
GitPython requirement to 1.0.1.
9 vuotta sitten
Ben Kurtovic
63b73de9e2
Merge pull request #10 from pr0d1r2/homebrew-installation
Add installation instructions for homebrew.
9 vuotta sitten
cbb84c82e1
Add installation instructions for homebrew.
9 vuotta sitten
Ben Kurtovic
946dc3219c
Merge branch 'develop'
9 vuotta sitten
Ben Kurtovic
51a482d7a2
release/0.2.3
9 vuotta sitten
Ben Kurtovic
5efe130f75
Fix an error with GitPython 0.3.6.
9 vuotta sitten
Ben Kurtovic
2806155a9d
Merge branch 'develop'
10 vuotta sitten
Ben Kurtovic
c92da5b91b
release/0.2.2
10 vuotta sitten
Ben Kurtovic
07c35f2ce5
Don't throw an error when HEAD is detached ( closes #6 ).
10 vuotta sitten
Ben Kurtovic
96860af2c3
Merge branch 'develop'
10 vuotta sitten
Ben Kurtovic
99be34e556
release/0.2.1
10 vuotta sitten
Ben Kurtovic
e3c6cdf54b
Fix a bug when handling errors during a fetch.
10 vuotta sitten
Ben Kurtovic
fa847d4fbf
Merge branch 'develop'
10 vuotta sitten
Ben Kurtovic
845156c4a2
release/0.2
10 vuotta sitten
Ben Kurtovic
0ad8d2cb71
Merge branch 'feature/gitpython' into develop
10 vuotta sitten
Ben Kurtovic
2be8edfa9f
Update README; --preserve-merges as promised.
10 vuotta sitten
Ben Kurtovic
6c8e1be0fb
Some fixes; go back to one-line-per-branch system.
10 vuotta sitten
Ben Kurtovic
2fa50a416c
Handle some GitPython exceptions.
10 vuotta sitten
Ben Kurtovic
9a1473ef8b
Colorize and merge branch update lines into one.
10 vuotta sitten
Ben Kurtovic
168856be56
Refactor out _update_branches(); remove COUNTING from fetch progress.
10 vuotta sitten
Ben Kurtovic
b247d90f00
Remove mostly useless verbose option; clean up output.
10 vuotta sitten
Ben Kurtovic
976c7ccbc3
Mostly finish new remote fetching.
10 vuotta sitten
Ben Kurtovic
fbf29b4688
Proper up-to-date-check; fix when branches are empty.
10 vuotta sitten
Ben Kurtovic
7953684627
Flesh out error handling for merge/rebase.
10 vuotta sitten
Ben Kurtovic
134c4451fc
More work on some pending issues.
10 vuotta sitten
Ben Kurtovic
5468be61e3
More work on rebasing/merging.
10 vuotta sitten
Ben Kurtovic
9bbe6a32b7
More stuff.
10 vuotta sitten
Ben Kurtovic
8b07934369
More work on GitPython integration.
10 vuotta sitten
Ben Kurtovic
48ebdf0264
Add some new arguments.
10 vuotta sitten
Ben Kurtovic
af992c6948
Commit some temp code.
10 vuotta sitten
Ben Kurtovic
4c878c2a63
More cleanup.
10 vuotta sitten
Ben Kurtovic
48e82888f5
Some work on GitPython integration.
10 vuotta sitten
Ben Kurtovic
9f8072c673
Merge branch 'feature/improvements' into develop
10 vuotta sitten
Ben Kurtovic
30d01fd200
Remove relative imports from __init__ so __version__ can be read without deps.
10 vuotta sitten
Ben Kurtovic
25127f4e94
Finish conversion from output.py to colorama.
10 vuotta sitten
Ben Kurtovic
beac864d29
Clean up output.py.
10 vuotta sitten
Ben Kurtovic
910b53aeba
Split code into multiple files.
10 vuotta sitten
Ben Kurtovic
e9e2adec63
Update gitignore, README.
10 vuotta sitten
Marcin Nowicki