diff --git a/fake_home/.zshrc b/fake_home/.zshrc index 362449d..82a905c 100644 --- a/fake_home/.zshrc +++ b/fake_home/.zshrc @@ -163,15 +163,13 @@ function sync-history { tscp "$local_history" "$remote_file" return fi + echo "Merging history files..." fc -W # Write to history file merge-hist "$local_history" "$copy_of_remote" > "$merged" - if ! (($(cat "$merged" | wc -l) > $(cat "$copy_of_remote" | wc -l))); then - echo "Merged histfile '$merged' somehow smaller than current histfile" - return - fi mv "$merged" "$local_history" fc -R # Read from new history file + echo "Uploading new shared history..." tscp "$local_history" "$remote_file" }