Joey Hess 0040d2c129 sync: Avoid an ugly error message when nothing has been committed to master yet and there is a synced master branch to merge from ... Now the warning gets displayed, which is better than an arcane git error. The warning is still kind of ugly, especially when the pull later in the sync will clear up what it warns about. But, this is an unusual situation not likely to happen, and if there is no remote to pull from, the warning message is needed or the sync will seem to succeed despite not merging the synced master branch. Would still be better if it could merge the synced master branch in this situation, making an empty commit to master to do it seems wrong, and otherwise it would need a whole separate code path, and would bypass using git merge in favor of say, setting master to the syned branch. Which would bypass git configs like arguably merge.ff and certianly merge.verifySignatures. So don't want to do that.		2020-05-05 14:31:37 -04:00
..
Android
android
assistant	response	2019-09-16 13:52:36 -04:00
automatic_conflict_resolution
backends
bare_repositories
bugs	sync: Avoid an ugly error message when nothing has been committed to master yet and there is a synced master branch to merge from	2020-05-05 14:31:37 -04:00
chunking
coding_style
contribute
copies
design	Fix typo remotes.log -> remote.log	2020-03-28 13:36:45 +00:00
devblog	devblog	2020-03-25 13:26:25 -04:00
direct_mode
download
encryption
footer
forum	response	2020-05-05 12:29:25 -04:00
future_proofing	Added a comment: Regarding accessing files in a time capsule...	2014-08-25 15:51:00 +00:00
git-annex-addurl
git-annex-adjust
git-annex-checkpresentkey
git-annex-config
git-annex-copy
git-annex-direct
git-annex-drop	Added a comment: re: drop everything but subdirectory	2018-09-07 20:13:03 +00:00
git-annex-enableremote
git-annex-find	Added a comment: "dry run" option	2020-04-21 19:04:07 +00:00
git-annex-importfeed
git-annex-lookupkey
git-annex-metadata
git-annex-move
git-annex-p2p
git-annex-preferred-content
git-annex-reinject
git-annex-rmurl
git-annex-setpresentkey	Added a comment	2018-10-08 21:43:17 +00:00
git-annex-sync	response	2020-02-20 15:31:42 -04:00
git-annex-test
git-annex-unannex
git-annex-undo
git-annex-uninit
git-annex-unlock
git-annex-unused
git-annex-whereis
how_it_works
install	remove misplaced comments	2020-05-05 13:02:47 -04:00
internals	response	2020-02-20 16:26:52 -04:00
license
links
metadata
news	add news item for git-annex 8.20200501	2020-05-01 17:42:32 -04:00
not
polls
preferred_content	improve documentation	2020-04-13 12:33:35 -04:00
profiling
projects
required_content
scalability
security	Added a comment	2020-02-21 00:07:56 +00:00
special_remotes		2020-04-27 18:53:17 +00:00
stickers
sync
templates
testimonials
thanks	update	2020-05-05 11:13:10 -04:00
tips	Added a comment: Delete duplicates and specify preferred locations	2020-04-26 11:18:39 +00:00
todo	comment	2020-05-05 12:33:28 -04:00
trust
tuning
upgrades
use_case
users		2020-03-31 06:43:39 +00:00
videos
walkthrough
workflow
Android.mdwn
assistant.mdwn
automatic_conflict_resolution.mdwn
backends.mdwn
bare_repositories.mdwn
bugs.mdwn	add priority tags	2020-03-25 13:05:09 -04:00
builds.mdwn	make the git-annex-snapshot a link to the log	2020-04-28 15:54:34 -04:00
chunking.mdwn	Various typo fixes in doc/*.mdwn	2015-04-02 01:50:17 +02:00
coding_style.mdwn
comments.mdwn
contact.mdwn
contribute.mdwn
copies.mdwn
design.mdwn
devblog.mdwn
direct_mode.mdwn	Automatically convert direct mode repositories to v7 with adjusted unlocked branches	2019-08-26 15:05:25 -04:00
distributed_version_control.mdwn
download.mdwn
encryption.mdwn
favicon.ico
forum.mdwn	bad edit	2020-04-13 09:16:39 +00:00
future_proofing.mdwn
git-annex-add.mdwn	remove confusing sentence	2020-03-09 19:27:05 -04:00
git-annex-addunused.mdwn
git-annex-addurl.mdwn
git-annex-adjust.mdwn	adjust --lock: This enters an adjusted branch where files are locked.	2019-09-27 14:23:25 -04:00
git-annex-assistant.mdwn
git-annex-benchmark.mdwn
git-annex-calckey.mdwn
git-annex-checkpresentkey.mdwn
git-annex-config.mdwn
git-annex-contentlocation.mdwn	Automatically convert direct mode repositories to v7 with adjusted unlocked branches	2019-08-26 15:05:25 -04:00
git-annex-copy.mdwn	--auto doc wording	2020-04-13 16:12:48 -04:00
git-annex-dead.mdwn
git-annex-describe.mdwn
git-annex-diffdriver.mdwn
git-annex-direct.mdwn
git-annex-drop.mdwn	--auto doc wording	2020-04-13 16:12:48 -04:00
git-annex-dropkey.mdwn
git-annex-dropunused.mdwn
git-annex-edit.mdwn
git-annex-enable-tor.mdwn
git-annex-enableremote.mdwn
git-annex-examinekey.mdwn
git-annex-expire.mdwn
git-annex-export.mdwn
git-annex-find.mdwn
git-annex-findref.mdwn
git-annex-fix.mdwn
git-annex-forget.mdwn
git-annex-fromkey.mdwn
git-annex-fsck.mdwn	close not really a bug, and improve fsck man page	2020-04-27 12:13:35 -04:00
git-annex-fuzztest.mdwn
git-annex-get.mdwn	--auto doc wording	2020-04-13 16:12:48 -04:00
git-annex-group.mdwn
git-annex-groupwanted.mdwn
git-annex-import.mdwn
git-annex-importfeed.mdwn
git-annex-indirect.mdwn
git-annex-info.mdwn
git-annex-init.mdwn	jump right to v8, don't stop part way	2020-02-24 13:21:00 -04:00
git-annex-initremote.mdwn
git-annex-inprogress.mdwn
git-annex-list.mdwn
git-annex-lock.mdwn
git-annex-log.mdwn
git-annex-lookupkey.mdwn
git-annex-map.mdwn
git-annex-matchexpression.mdwn
git-annex-matching-expression.mdwn
git-annex-matching-options.mdwn
git-annex-merge.mdwn
git-annex-metadata.mdwn
git-annex-migrate.mdwn
git-annex-mirror.mdwn
git-annex-move.mdwn	improve documentation	2020-04-13 12:33:35 -04:00
git-annex-multicast.mdwn
git-annex-numcopies.mdwn
git-annex-p2p.mdwn	improve docs	2020-05-05 12:39:38 -04:00
git-annex-post-receive.mdwn
git-annex-pre-commit.mdwn
git-annex-preferred-content.mdwn	improve documentation	2020-04-13 12:33:35 -04:00
git-annex-proxy.mdwn
git-annex-readpresentkey.mdwn
git-annex-registerurl.mdwn
git-annex-reinit.mdwn
git-annex-reinject.mdwn
git-annex-rekey.mdwn
git-annex-remotedaemon.mdwn
git-annex-renameremote.mdwn
git-annex-repair.mdwn
git-annex-required.mdwn
git-annex-resolvemerge.mdwn
git-annex-rmurl.mdwn
git-annex-schedule.mdwn
git-annex-semitrust.mdwn
git-annex-setkey.mdwn
git-annex-setpresentkey.mdwn
git-annex-shell.mdwn
git-annex-smudge.mdwn
git-annex-status.mdwn
git-annex-sync.mdwn	sync: When some remotes to sync with are specified, and --fast is too, pick the lowest cost of the specified remotes	2020-04-23 16:08:45 -04:00
git-annex-test.mdwn
git-annex-testremote.mdwn
git-annex-transferkey.mdwn
git-annex-transferkeys.mdwn
git-annex-trust.mdwn
git-annex-unannex.mdwn
git-annex-undo.mdwn
git-annex-ungroup.mdwn
git-annex-uninit.mdwn
git-annex-unlock.mdwn
git-annex-untrust.mdwn
git-annex-unused.mdwn
git-annex-upgrade.mdwn	fix problems with upgrade of local remotes	2020-03-09 16:49:28 -04:00
git-annex-vadd.mdwn
git-annex-vcycle.mdwn	expand manpages cross-references significantly	2015-05-29 12:12:55 -04:00
git-annex-version.mdwn
git-annex-vfilter.mdwn
git-annex-vicfg.mdwn
git-annex-view.mdwn
git-annex-vpop.mdwn
git-annex-wanted.mdwn
git-annex-watch.mdwn
git-annex-webapp.mdwn
git-annex-whereis.mdwn
git-annex.mdwn	stop using remote.name.annex-readonly for two distinct things	2020-04-23 14:56:03 -04:00
git-remote-tor-annex.mdwn
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn	added a note about historical builds	2020-03-09 16:50:13 +00:00
internals.mdwn
license.mdwn
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo.mdwn
logo.svg
logo_16x16.png
logo_32x32.png
logo_small.png
meta.mdwn
metadata.mdwn
news.mdwn
not.mdwn
polls.mdwn
preferred_content.mdwn
privacy.mdwn
profiling.mdwn
projects.mdwn
publicrepos.mdwn
related_software.mdwn	fix markup	2020-02-24 14:25:13 +00:00
repomap.png
required_content.mdwn
scalability.mdwn
security.mdwn
shortcuts.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn		2020-03-31 23:40:12 +00:00
stickers.mdwn
submodules.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn
tips.mdwn
todo.mdwn	add priority tags	2020-03-25 13:05:09 -04:00
transferring_data.mdwn
trust.mdwn
tuning.mdwn
upgrades.mdwn	remove instructions for v0 upgrade	2020-02-19 15:10:58 -04:00
users.mdwn
videos.mdwn
Void.mdwn
walkthrough.mdwn
workflow.mdwn