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 år sedan
Ben Kurtovic
fddc0cb465
Better error message when mixing --current-only with a detached HEAD.
9 år sedan
Ben Kurtovic
5a4e49ea56
Don't update branches for bare repos ( #14 )
9 år sedan
Ben Kurtovic
2791418b9f
Better solution to previous commit.
9 år sedan
Ben Kurtovic
a9e2a1fe8d
Don't try to fetch remotes without configured refspecs.
9 år sedan
Ben Kurtovic
8439805e38
Wording tweaks; update brew instructions ( fixes #13 )
9 år sedan
Ben Kurtovic
4e8dab5aab
Copyright update for 2015; dev version up for 0.2.5.
9 år sedan
Ben Kurtovic
5efe130f75
Fix an error with GitPython 0.3.6.
9 år sedan
Ben Kurtovic
07c35f2ce5
Don't throw an error when HEAD is detached ( closes #6 ).
10 år sedan
Ben Kurtovic
e3c6cdf54b
Fix a bug when handling errors during a fetch.
10 år sedan
Ben Kurtovic
2be8edfa9f
Update README; --preserve-merges as promised.
10 år sedan
Ben Kurtovic
6c8e1be0fb
Some fixes; go back to one-line-per-branch system.
10 år sedan
Ben Kurtovic
2fa50a416c
Handle some GitPython exceptions.
10 år sedan
Ben Kurtovic
9a1473ef8b
Colorize and merge branch update lines into one.
10 år sedan
Ben Kurtovic
168856be56
Refactor out _update_branches(); remove COUNTING from fetch progress.
10 år sedan
Ben Kurtovic
b247d90f00
Remove mostly useless verbose option; clean up output.
10 år sedan
Ben Kurtovic
976c7ccbc3
Mostly finish new remote fetching.
10 år sedan
Ben Kurtovic
fbf29b4688
Proper up-to-date-check; fix when branches are empty.
10 år sedan
Ben Kurtovic
7953684627
Flesh out error handling for merge/rebase.
10 år sedan
Ben Kurtovic
134c4451fc
More work on some pending issues.
10 år sedan
Ben Kurtovic
5468be61e3
More work on rebasing/merging.
10 år sedan
Ben Kurtovic
9bbe6a32b7
More stuff.
10 år sedan
Ben Kurtovic
8b07934369
More work on GitPython integration.
10 år sedan
Ben Kurtovic
48ebdf0264
Add some new arguments.
10 år sedan
Ben Kurtovic
af992c6948
Commit some temp code.
10 år sedan
Ben Kurtovic
4c878c2a63
More cleanup.
10 år sedan
Ben Kurtovic
48e82888f5
Some work on GitPython integration.
10 år sedan
Ben Kurtovic
25127f4e94
Finish conversion from output.py to colorama.
10 år sedan
Ben Kurtovic
beac864d29
Clean up output.py.
10 år sedan
Ben Kurtovic
910b53aeba
Split code into multiple files.
10 år sedan
