Ben Kurtovic
d442b26782
Update copyright for 2016.
pirms 9 gadiem
Ben Kurtovic
b71e6f4f2a
Revert 42675a8 on Python 2 ( #20 )
pirms 9 gadiem
Ben Kurtovic
42675a82ef
Merge pull request #20 from m-s-/develop
specify config file delimiter so it doesn't barf on windows paths
pirms 9 gadiem
88cddb1d4a
specify config file delimiter so it doesn't barf on windows paths
pirms 9 gadiem
Ben Kurtovic
fa3bb4d9a1
Add '--bookmark-file' option to support multiple bookmark config files.
pirms 9 gadiem
Ben Kurtovic
ae8e441d39
Added --prune to remove deleted remote-tracking branches ( closes #18 )
pirms 9 gadiem
Ben Kurtovic
51cac24562
Properly save config files on Python 3 ( closes #17 ); version bump
pirms 9 gadiem
Ben Kurtovic
45d8e6c4cc
Merge branch 'develop'
pirms 9 gadiem
Ben Kurtovic
10494e677b
release/0.3
pirms 9 gadiem
Ben Kurtovic
3e238f1ad3
Bugfix from previous commit.
pirms 9 gadiem
Ben Kurtovic
9255ffa215
Wording cleanup.
pirms 9 gadiem
Ben Kurtovic
8990580cd0
Added a changelog.
pirms 9 gadiem
Ben Kurtovic
f6cd164400
Add Python 3 support ( closes #16 )
pirms 9 gadiem
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
fddc0cb465
Better error message when mixing --current-only with a detached HEAD.
pirms 9 gadiem
Ben Kurtovic
5a4e49ea56
Don't update branches for bare repos ( #14 )
pirms 9 gadiem
Ben Kurtovic
2791418b9f
Better solution to previous commit.
pirms 9 gadiem
Ben Kurtovic
a9e2a1fe8d
Don't try to fetch remotes without configured refspecs.
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
2fea39f929
Merge branch 'develop'
pirms 9 gadiem
Ben Kurtovic
79c1651489
release/0.2.4
pirms 9 gadiem
Ben Kurtovic
6e6db21533
Migrate old config files ( #12 )
pirms 9 gadiem
Ben Kurtovic
07c6e68b33
XDG Base Directory compliance ( fixes #12 )
pirms 9 gadiem
Ben Kurtovic
bc80ab6a3c
Tweak README installation instructions.
pirms 9 gadiem
Ben Kurtovic
e2c637774d
GitPython requirement to 1.0.1.
pirms 9 gadiem
Ben Kurtovic
63b73de9e2
Merge pull request #10 from pr0d1r2/homebrew-installation
Add installation instructions for homebrew.
pirms 9 gadiem
cbb84c82e1
Add installation instructions for homebrew.
pirms 9 gadiem
Ben Kurtovic
946dc3219c
Merge branch 'develop'
pirms 9 gadiem
Ben Kurtovic
51a482d7a2
release/0.2.3
pirms 9 gadiem
Ben Kurtovic
5efe130f75
Fix an error with GitPython 0.3.6.
pirms 9 gadiem
Ben Kurtovic
2806155a9d
Merge branch 'develop'
pirms 10 gadiem
Ben Kurtovic
c92da5b91b
release/0.2.2
pirms 10 gadiem
Ben Kurtovic
07c35f2ce5
Don't throw an error when HEAD is detached ( closes #6 ).
pirms 10 gadiem
Ben Kurtovic
96860af2c3
Merge branch 'develop'
pirms 10 gadiem
Ben Kurtovic
99be34e556
release/0.2.1
pirms 10 gadiem
Ben Kurtovic
e3c6cdf54b
Fix a bug when handling errors during a fetch.
pirms 10 gadiem
Ben Kurtovic
fa847d4fbf
Merge branch 'develop'
pirms 10 gadiem
Ben Kurtovic
845156c4a2
release/0.2
pirms 10 gadiem
Ben Kurtovic
0ad8d2cb71
Merge branch 'feature/gitpython' into develop
pirms 10 gadiem
Ben Kurtovic
2be8edfa9f
Update README; --preserve-merges as promised.
pirms 10 gadiem
Ben Kurtovic
6c8e1be0fb
Some fixes; go back to one-line-per-branch system.
pirms 10 gadiem
Ben Kurtovic
2fa50a416c
Handle some GitPython exceptions.
pirms 10 gadiem
Ben Kurtovic
9a1473ef8b
Colorize and merge branch update lines into one.
pirms 10 gadiem
Ben Kurtovic
168856be56
Refactor out _update_branches(); remove COUNTING from fetch progress.
pirms 10 gadiem
Ben Kurtovic
b247d90f00
Remove mostly useless verbose option; clean up output.
pirms 10 gadiem
Ben Kurtovic
976c7ccbc3
Mostly finish new remote fetching.
pirms 10 gadiem
Ben Kurtovic
fbf29b4688
Proper up-to-date-check; fix when branches are empty.
pirms 10 gadiem
Ben Kurtovic
7953684627
Flesh out error handling for merge/rebase.
pirms 10 gadiem
Ben Kurtovic
134c4451fc
More work on some pending issues.
pirms 10 gadiem
Marco
Marcin Nowicki