git-annex/Assistant/WebApp/Configurators
Joey Hess 7c20bf6e7a
make sync aware of adjusted branches
So, it will pull and push the original branch, not the adjusted one.

And, for merging, it will use updateAdjustedBranch (not implemented yet).

Note that remaining uses of Git.Branch.current need to be checked too;
for things that should act on the original branch, and not the adjusted
branch.
2016-02-29 15:23:08 -04:00
..
AWS.hs fix various build warnings, mostly on Windows 2015-10-13 13:24:44 -04:00
Delete.hs webapp: Fix deletion of current repository directory. 2016-01-29 14:04:39 -04:00
Edit.hs fix various build warnings, mostly on Windows 2015-10-13 13:24:44 -04:00
Fsck.hs import Data.Default in Common 2015-01-28 16:11:28 -04:00
IA.hs fix various build warnings, mostly on Windows 2015-10-13 13:24:44 -04:00
Local.hs make sync aware of adjusted branches 2016-02-29 15:23:08 -04:00
Pairing.hs assistant: Fix local pairing to not include newline in ssh pubkey, which is rejected on the other end for security reasons. 2015-07-02 14:50:20 -04:00
Preferences.hs webapp: Fix bugs that could result in a relative path such as "." being written to ~/.config/git-annex/autostart 2015-12-02 15:57:30 -04:00
Ssh.hs Merge branch 'winprocfix' 2015-10-04 15:46:25 -04:00
Unused.hs import Data.Default in Common 2015-01-28 16:11:28 -04:00
Upgrade.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
WebDAV.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
XMPP.hs import Data.Default in Common 2015-01-28 16:11:28 -04:00